am 5062fd0d: am 3209e85a: Merge "glDrawTex- GL_INVALID_VALUE if width/height <= 0"

* commit '5062fd0dea78eaac56fcccaccb4882b4708b6350': glDrawTex- GL_INVALID_VALUE if width/height <= 0
2011-07-06 07:43:41 -07:00
parent 727031e782 5062fd0dea
commit 6484fe1c35
1 changed files with 3 additions and 0 deletions
--- a/tools/emulator/opengl/host/libs/Translator/GLES_CM/GLEScmImp.cpp
+++ b/tools/emulator/opengl/host/libs/Translator/GLES_CM/GLEScmImp.cpp
@@ -1833,6 +1833,9 @@ GL_API void GL_APIENTRY glGetTexGenxvOES (GLenum coord, GLenum pname, GLfixed *p
 template <class T, GLenum TypeName>
 void glDrawTexOES (T x, T y, T z, T width, T height) {
    GET_CTX()
+
+    SET_ERROR_IF((width<=0 || height<=0),GL_INVALID_VALUE);
+
    int numClipPlanes;

    GLint viewport[4];