diff options
| author | 2011-08-18 18:53:21 -0700 | |
|---|---|---|
| committer | 2011-08-18 18:53:21 -0700 | |
| commit | 28a5cc2b1d1db519e7799a867094cda096aa74cc (patch) | |
| tree | 180ed405b575ce7b303937dcb3bb03e77ac299b2 /opengl/libagl/texture.cpp | |
| parent | 0f4739f7d0d121e9cd07dd556d227f878f7bed0f (diff) | |
| parent | f319e2f2ebda579d5c1d94ba24f650d362aacb9c (diff) | |
Merge "implement EGL_TEXTURE_EXTERNAL_OES in libagl"
Diffstat (limited to 'opengl/libagl/texture.cpp')
| -rw-r--r-- | opengl/libagl/texture.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/opengl/libagl/texture.cpp b/opengl/libagl/texture.cpp index 8eb17c4355a8..88e865124ec7 100644 --- a/opengl/libagl/texture.cpp +++ b/opengl/libagl/texture.cpp @@ -633,7 +633,7 @@ void generateMipmap(ogles_context_t* c, GLint level) static void texParameterx( GLenum target, GLenum pname, GLfixed param, ogles_context_t* c) { - if (target != GL_TEXTURE_2D) { + if (target != GL_TEXTURE_2D && target != GL_TEXTURE_EXTERNAL_OES) { ogles_error(c, GL_INVALID_ENUM); return; } @@ -866,7 +866,7 @@ void glActiveTexture(GLenum texture) void glBindTexture(GLenum target, GLuint texture) { ogles_context_t* c = ogles_context_t::get(); - if (target != GL_TEXTURE_2D) { + if (target != GL_TEXTURE_2D && target != GL_TEXTURE_EXTERNAL_OES) { ogles_error(c, GL_INVALID_ENUM); return; } @@ -1012,7 +1012,7 @@ void glTexParameteriv( GLenum target, GLenum pname, const GLint* params) { ogles_context_t* c = ogles_context_t::get(); - if (target != GGL_TEXTURE_2D) { + if (target != GL_TEXTURE_2D && target != GL_TEXTURE_EXTERNAL_OES) { ogles_error(c, GL_INVALID_ENUM); return; } @@ -1605,7 +1605,7 @@ void glDrawTexxOES(GLfixed x, GLfixed y, GLfixed z, GLfixed w, GLfixed h) { void glEGLImageTargetTexture2DOES(GLenum target, GLeglImageOES image) { ogles_context_t* c = ogles_context_t::get(); - if (target != GL_TEXTURE_2D) { + if (target != GL_TEXTURE_2D && target != GL_TEXTURE_EXTERNAL_OES) { ogles_error(c, GL_INVALID_ENUM); return; } |