diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-22 22:04:12 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-06-22 22:04:12 -0700 |
| commit | 952663ef57ffa8a69a220856eb1679c4e9eca254 (patch) | |
| tree | 764848c2afda19c92034c660fceda79a516a0b34 /opengl | |
| parent | 8e3b0f15dfe8cf2a493cb995a42f6a72d47da806 (diff) | |
| parent | 6bca3daec9b6b3cb2676f789c0154f217b27429b (diff) | |
| download | frameworks_native-952663ef57ffa8a69a220856eb1679c4e9eca254.zip frameworks_native-952663ef57ffa8a69a220856eb1679c4e9eca254.tar.gz frameworks_native-952663ef57ffa8a69a220856eb1679c4e9eca254.tar.bz2 | |
am 5277103d: Merge change 5035 into donut
Merge commit '5277103db9033226814edc8fcba6f4ba4e846678'
* commit '5277103db9033226814edc8fcba6f4ba4e846678':
add glTexParameteri() and fix glTexParameteriv()
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/libagl/texture.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/opengl/libagl/texture.cpp b/opengl/libagl/texture.cpp index b6f534b..14a910c 100644 --- a/opengl/libagl/texture.cpp +++ b/opengl/libagl/texture.cpp @@ -900,7 +900,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; } } @@ -919,6 +919,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 - |