OSDN Git Service

Fix checking for invalid query enums.
authorNicolas Capens <capn@google.com>
Mon, 4 Jan 2016 18:13:47 +0000 (13:13 -0500)
committerNicolas Capens <capn@google.com>
Mon, 4 Jan 2016 18:22:17 +0000 (18:22 +0000)
Change-Id: I4cca0f1cf0cc2cd95502769d9653939d6999b8e1
Reviewed-on: https://swiftshader-review.googlesource.com/4507
Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>
src/OpenGL/libGLES_CM/libGLES_CM.cpp

index 98ce971..62b8962 100644 (file)
@@ -1895,7 +1895,7 @@ void GetBooleanv(GLenum pname, GLboolean* params)
        {\r
                if(!(context->getBooleanv(pname, params)))\r
                {\r
-                       unsigned int numParams = context->getQueryParameterNum(pname);\r
+                       int numParams = context->getQueryParameterNum(pname);\r
 \r
                        if(numParams < 0)\r
                        {\r
@@ -1914,7 +1914,7 @@ void GetBooleanv(GLenum pname, GLboolean* params)
 \r
                                context->getFloatv(pname, floatParams);\r
 \r
-                               for(unsigned int i = 0; i < numParams; ++i)\r
+                               for(int i = 0; i < numParams; ++i)\r
                                {\r
                                        if(floatParams[i] == 0.0f)\r
                                                params[i] = GL_FALSE;\r
@@ -1931,7 +1931,7 @@ void GetBooleanv(GLenum pname, GLboolean* params)
 \r
                                context->getIntegerv(pname, intParams);\r
 \r
-                               for(unsigned int i = 0; i < numParams; ++i)\r
+                               for(int i = 0; i < numParams; ++i)\r
                                {\r
                                        if(intParams[i] == 0)\r
                                                params[i] = GL_FALSE;\r
@@ -2027,7 +2027,7 @@ void GetFloatv(GLenum pname, GLfloat* params)
        {\r
                if(!(context->getFloatv(pname, params)))\r
                {\r
-                       unsigned int numParams = context->getQueryParameterNum(pname);\r
+                       int numParams = context->getQueryParameterNum(pname);\r
 \r
                        if(numParams < 0)\r
                        {\r
@@ -2046,7 +2046,7 @@ void GetFloatv(GLenum pname, GLfloat* params)
 \r
                                context->getBooleanv(pname, boolParams);\r
 \r
-                               for(unsigned int i = 0; i < numParams; ++i)\r
+                               for(int i = 0; i < numParams; ++i)\r
                                {\r
                                        if(boolParams[i] == GL_FALSE)\r
                                                params[i] = 0.0f;\r
@@ -2063,7 +2063,7 @@ void GetFloatv(GLenum pname, GLfloat* params)
 \r
                                context->getIntegerv(pname, intParams);\r
 \r
-                               for(unsigned int i = 0; i < numParams; ++i)\r
+                               for(int i = 0; i < numParams; ++i)\r
                                {\r
                                        params[i] = (GLfloat)intParams[i];\r
                                }\r
@@ -2168,7 +2168,7 @@ void GetIntegerv(GLenum pname, GLint* params)
        {\r
                if(!(context->getIntegerv(pname, params)))\r
                {\r
-                       unsigned int numParams = context->getQueryParameterNum(pname);\r
+                       int numParams = context->getQueryParameterNum(pname);\r
 \r
                        if(numParams < 0)\r
                        {\r
@@ -2187,7 +2187,7 @@ void GetIntegerv(GLenum pname, GLint* params)
 \r
                                context->getBooleanv(pname, boolParams);\r
 \r
-                               for(unsigned int i = 0; i < numParams; ++i)\r
+                               for(int i = 0; i < numParams; ++i)\r
                                {\r
                                        if(boolParams[i] == GL_FALSE)\r
                                                params[i] = 0;\r
@@ -2204,7 +2204,7 @@ void GetIntegerv(GLenum pname, GLint* params)
 \r
                                context->getFloatv(pname, floatParams);\r
 \r
-                               for(unsigned int i = 0; i < numParams; ++i)\r
+                               for(int i = 0; i < numParams; ++i)\r
                                {\r
                                        if(pname == GL_DEPTH_RANGE || pname == GL_COLOR_CLEAR_VALUE || pname == GL_DEPTH_CLEAR_VALUE)\r
                                        {\r