Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am b263450f: am 3662f9ee: Merge change Ide4c8cbc into eclair

Browse Source 
Merge commit 'b263450f7a5b6ff3c8be8cd4b16aa2f65978f657' into eclair-mr2-plus-aosp

* commit 'b263450f7a5b6ff3c8be8cd4b16aa2f65978f657':
  fix [2151588] glTexSubImage2D() allows pixel format conversion
This commit is contained in:
Mathias Agopian
2009-10-19 14:53:18 -07:00
committed by Android Git Automerger
parent 220f052f61 b263450f7a
commit a4aa677db3
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
opengl/libagl/texture.cpp
View File

@@ -1252,6 +1252,11 @@ void glTexSubImage2D(
ogles_error(c, GL_INVALID_OPERATION); ogles_error(c, GL_INVALID_OPERATION);
return; return;
} }
if (format != tex->internalformat) {
ogles_error(c, GL_INVALID_OPERATION);
return;
}
if ((xoffset + width > GLsizei(surface.width)) || if ((xoffset + width > GLsizei(surface.width)) ||
(yoffset + height > GLsizei(surface.height))) { (yoffset + height > GLsizei(surface.height))) {
ogles_error(c, GL_INVALID_VALUE); ogles_error(c, GL_INVALID_VALUE);