diff options
| author | 2009-03-18 11:33:14 -0700 | |
|---|---|---|
| committer | 2009-03-18 11:33:14 -0700 | |
| commit | 732ca39b704428b77ef305826d4e6c07190fd7ed (patch) | |
| tree | 0b575888c39771713beb00a816479b1cdf53242e /opengl/libagl/texture.cpp | |
| parent | 15c399644d0bd343ef9ed23ccb117e49a0eb7f82 (diff) | |
| parent | ebad147e654682b6f05438ca8f3685809df5d2e2 (diff) | |
Merge commit 'remotes/korg/cupcake' into merge
Conflicts:
core/java/android/view/animation/TranslateAnimation.java
core/jni/Android.mk
core/res/res/values-en-rGB/strings.xml
libs/audioflinger/AudioFlinger.cpp
libs/surfaceflinger/LayerScreenshot.cpp
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
Diffstat (limited to 'opengl/libagl/texture.cpp')
| -rw-r--r-- | opengl/libagl/texture.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/opengl/libagl/texture.cpp b/opengl/libagl/texture.cpp index 6b2640a720..b6f534b7ea 100644 --- a/opengl/libagl/texture.cpp +++ b/opengl/libagl/texture.cpp @@ -526,7 +526,7 @@ void generateMipmap(ogles_context_t* c, GLint level) static void texParameterx( GLenum target, GLenum pname, GLfixed param, ogles_context_t* c) { - if (target != GGL_TEXTURE_2D) { + if (target != GL_TEXTURE_2D) { ogles_error(c, GL_INVALID_ENUM); return; } @@ -534,8 +534,7 @@ static void texParameterx( EGLTextureObject* textureObject = c->textures.tmu[c->textures.active].texture; switch (pname) { case GL_TEXTURE_WRAP_S: - if ((param == GL_CLAMP) || - (param == GL_REPEAT) || + if ((param == GL_REPEAT) || (param == GL_CLAMP_TO_EDGE)) { textureObject->wraps = param; } else { @@ -543,9 +542,8 @@ static void texParameterx( } break; case GL_TEXTURE_WRAP_T: - if ((param == GGL_CLAMP) || - (param == GGL_REPEAT) || - (param == GGL_CLAMP_TO_EDGE)) { + if ((param == GL_REPEAT) || + (param == GL_CLAMP_TO_EDGE)) { textureObject->wrapt = param; } else { goto invalid_enum; @@ -1006,7 +1004,7 @@ void glCompressedTexImage2D( void glTexImage2D( - GLenum target, GLint level, GLenum internalformat, + GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels) { |