diff options
| author | Mathias Agopian <mathias@google.com> | 2009-10-19 14:41:53 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-10-19 14:41:53 -0700 |
| commit | e9c394a5972b338129adccdc2b493cb731225f5b (patch) | |
| tree | 0ef651d34b568a4bef3890fdbde9c6ebedee6ac4 /opengl | |
| parent | 283cf1ce56ff3b32169988b884cc265dbc664ed2 (diff) | |
| parent | 3662f9ee5be3113b57693e1495fd83a2f5c7200c (diff) | |
| download | frameworks_base-e9c394a5972b338129adccdc2b493cb731225f5b.zip frameworks_base-e9c394a5972b338129adccdc2b493cb731225f5b.tar.gz frameworks_base-e9c394a5972b338129adccdc2b493cb731225f5b.tar.bz2 | |
am 3662f9ee: Merge change Ide4c8cbc into eclair
Merge commit '3662f9ee5be3113b57693e1495fd83a2f5c7200c' into eclair-plus-aosp
* commit '3662f9ee5be3113b57693e1495fd83a2f5c7200c':
fix [2151588] glTexSubImage2D() allows pixel format conversion
Diffstat (limited to 'opengl')
| -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); |