diff options
| author | Mathias Agopian <mathias@google.com> | 2009-10-19 14:42:00 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-19 14:42:00 -0700 |
| commit | b263450f7a5b6ff3c8be8cd4b16aa2f65978f657 (patch) | |
| tree | 6d0521f9ae8d173ad921bfa088770451e6afc4e5 | |
| parent | cf4ff74017ec6b29646022ae5cbf667483b6137b (diff) | |
| parent | 3662f9ee5be3113b57693e1495fd83a2f5c7200c (diff) | |
| download | frameworks_base-b263450f7a5b6ff3c8be8cd4b16aa2f65978f657.zip frameworks_base-b263450f7a5b6ff3c8be8cd4b16aa2f65978f657.tar.gz frameworks_base-b263450f7a5b6ff3c8be8cd4b16aa2f65978f657.tar.bz2 | |
am 3662f9ee: Merge change Ide4c8cbc into eclair
Merge commit '3662f9ee5be3113b57693e1495fd83a2f5c7200c' into eclair-mr2
* commit '3662f9ee5be3113b57693e1495fd83a2f5c7200c':
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); |