diff options
| author | Mathias Agopian <mathias@google.com> | 2009-06-24 18:31:21 -0700 |
|---|---|---|
| committer | Mathias Agopian <mathias@google.com> | 2009-06-24 18:31:21 -0700 |
| commit | 4c4b387afb2e775fcac3b81a249bb7646515dffa (patch) | |
| tree | 893af3f7521ad4aa204449dc58132b21177e41fb /opengl | |
| parent | 2e123245811a1f31c080a29728fcc1655045f011 (diff) | |
| parent | 6ebed6600464d507a651d99792baa3a23a4f0766 (diff) | |
| download | frameworks_native-4c4b387afb2e775fcac3b81a249bb7646515dffa.zip frameworks_native-4c4b387afb2e775fcac3b81a249bb7646515dffa.tar.gz frameworks_native-4c4b387afb2e775fcac3b81a249bb7646515dffa.tar.bz2 | |
merge master in master_gl
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/libagl/texture.cpp | 9 | ||||
| -rw-r--r-- | opengl/tests/angeles/Android.mk | 4 | ||||
| -rw-r--r-- | opengl/tests/filter/Android.mk | 2 | ||||
| -rw-r--r-- | opengl/tests/finish/Android.mk | 2 | ||||
| -rw-r--r-- | opengl/tests/textures/Android.mk | 2 | ||||
| -rw-r--r-- | opengl/tests/tritex/Android.mk | 2 |
6 files changed, 14 insertions, 7 deletions
diff --git a/opengl/libagl/texture.cpp b/opengl/libagl/texture.cpp index 05fd46e..d767c31 100644 --- a/opengl/libagl/texture.cpp +++ b/opengl/libagl/texture.cpp @@ -997,7 +997,7 @@ void glTexParameteriv( memcpy(textureObject->crop_rect, params, 4*sizeof(GLint)); break; default: - ogles_error(c, GL_INVALID_ENUM); + texParameterx(target, pname, GLfixed(params[0]), c); return; } } @@ -1016,6 +1016,13 @@ void glTexParameterx( texParameterx(target, pname, param, c); } +void glTexParameteri( + GLenum target, GLenum pname, GLint param) +{ + ogles_context_t* c = ogles_context_t::get(); + texParameterx(target, pname, GLfixed(param), c); +} + // ---------------------------------------------------------------------------- #if 0 #pragma mark - diff --git a/opengl/tests/angeles/Android.mk b/opengl/tests/angeles/Android.mk index 46958d3..e193483 100644 --- a/opengl/tests/angeles/Android.mk +++ b/opengl/tests/angeles/Android.mk @@ -5,7 +5,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES:= app-linux.c demo.c.arm LOCAL_SHARED_LIBRARIES := libEGL libGLESv1_CM libui LOCAL_MODULE:= angeles -LOCAL_MODULE_TAGS := tests +LOCAL_MODULE_TAGS := optional include $(BUILD_EXECUTABLE) @@ -13,5 +13,5 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES:= gpustate.c LOCAL_SHARED_LIBRARIES := libEGL libGLESv1_CM LOCAL_MODULE:= gpustate -LOCAL_MODULE_TAGS := tests +LOCAL_MODULE_TAGS := optional include $(BUILD_EXECUTABLE) diff --git a/opengl/tests/filter/Android.mk b/opengl/tests/filter/Android.mk index a448f0d..31b7d9a 100644 --- a/opengl/tests/filter/Android.mk +++ b/opengl/tests/filter/Android.mk @@ -12,6 +12,6 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE:= test-opengl-filter -LOCAL_MODULE_TAGS := tests +LOCAL_MODULE_TAGS := optional include $(BUILD_EXECUTABLE) diff --git a/opengl/tests/finish/Android.mk b/opengl/tests/finish/Android.mk index 26836c1..8b46cd7 100644 --- a/opengl/tests/finish/Android.mk +++ b/opengl/tests/finish/Android.mk @@ -12,6 +12,6 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE:= test-opengl-finish -LOCAL_MODULE_TAGS := tests +LOCAL_MODULE_TAGS := optional include $(BUILD_EXECUTABLE) diff --git a/opengl/tests/textures/Android.mk b/opengl/tests/textures/Android.mk index a8c6220..8d5f56d 100644 --- a/opengl/tests/textures/Android.mk +++ b/opengl/tests/textures/Android.mk @@ -12,6 +12,6 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE:= test-opengl-textures -LOCAL_MODULE_TAGS := tests +LOCAL_MODULE_TAGS := optional include $(BUILD_EXECUTABLE) diff --git a/opengl/tests/tritex/Android.mk b/opengl/tests/tritex/Android.mk index 5cd1f04..76fd8dd 100644 --- a/opengl/tests/tritex/Android.mk +++ b/opengl/tests/tritex/Android.mk @@ -12,6 +12,6 @@ LOCAL_SHARED_LIBRARIES := \ LOCAL_MODULE:= test-opengl-tritex -LOCAL_MODULE_TAGS := tests +LOCAL_MODULE_TAGS := optional include $(BUILD_EXECUTABLE) |