diff options
| author | Mathias Agopian <mathias@google.com> | 2009-10-19 15:04:54 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-19 15:04:54 -0700 |
| commit | 5cfaaac5f55dee148b421ed2a201e65e020b11fb (patch) | |
| tree | 327b7763a15b18f8f9f6c7ef0630b3680ddbcc89 | |
| parent | 1f15a12a2e98c5cca6b7aa5e8b9eb890dcfa4d8f (diff) | |
| parent | a4aa677db36651e806f38e8aa7e8532da4f06b0d (diff) | |
| download | frameworks_base-5cfaaac5f55dee148b421ed2a201e65e020b11fb.zip frameworks_base-5cfaaac5f55dee148b421ed2a201e65e020b11fb.tar.gz frameworks_base-5cfaaac5f55dee148b421ed2a201e65e020b11fb.tar.bz2 | |
am a4aa677d: am b263450f: am 3662f9ee: Merge change Ide4c8cbc into eclair
Merge commit 'a4aa677db36651e806f38e8aa7e8532da4f06b0d'
* commit 'a4aa677db36651e806f38e8aa7e8532da4f06b0d':
fix [2151588] glTexSubImage2D() allows pixel format conversion
| -rw-r--r-- | opengl/libagl/texture.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/opengl/libagl/texture.cpp b/opengl/libagl/texture.cpp index 90e6d29..13d078e 100644 --- a/opengl/libagl/texture.cpp +++ b/opengl/libagl/texture.cpp @@ -1252,6 +1252,11 @@ void glTexSubImage2D( ogles_error(c, GL_INVALID_OPERATION); return; } + + if (format != tex->internalformat) { + ogles_error(c, GL_INVALID_OPERATION); + return; + } if ((xoffset + width > GLsizei(surface.width)) || (yoffset + height > GLsizei(surface.height))) { ogles_error(c, GL_INVALID_VALUE); |