Skip to content

S
swiftshader
Commit f2607d82 by Nicolas Capens
Options

Fix checking for invalid query enums.

Change-Id: I4cca0f1cf0cc2cd95502769d9653939d6999b8e1 Reviewed-on: https://swiftshader-review.googlesource.com/4507Tested-by: 's avatarNicolas Capens <capn@google.com> Reviewed-by: 's avatarAlexis Hétu <sugoi@google.com> Reviewed-by: 's avatarNicolas Capens <capn@google.com>
parent 6302f629
Showing with 9 additions and 9 deletions
src/OpenGL/libGLES_CM/libGLES_CM.cpp
...@@ -1895,7 +1895,7 @@ void GetBooleanv(GLenum pname, GLboolean* params) ...@@ -1895,7 +1895,7 @@ void GetBooleanv(GLenum pname, GLboolean* params)
{ {
if(!(context->getBooleanv(pname, params))) if(!(context->getBooleanv(pname, params)))
{ {
unsigned int numParams = context->getQueryParameterNum(pname); int numParams = context->getQueryParameterNum(pname);
if(numParams < 0) if(numParams < 0)
{ {
...@@ -1914,7 +1914,7 @@ void GetBooleanv(GLenum pname, GLboolean* params) ...@@ -1914,7 +1914,7 @@ void GetBooleanv(GLenum pname, GLboolean* params)
context->getFloatv(pname, floatParams); context->getFloatv(pname, floatParams);
for(unsigned int i = 0; i < numParams; ++i) for(int i = 0; i < numParams; ++i)
{ {
if(floatParams[i] == 0.0f) if(floatParams[i] == 0.0f)
params[i] = GL_FALSE; params[i] = GL_FALSE;
...@@ -1931,7 +1931,7 @@ void GetBooleanv(GLenum pname, GLboolean* params) ...@@ -1931,7 +1931,7 @@ void GetBooleanv(GLenum pname, GLboolean* params)
context->getIntegerv(pname, intParams); context->getIntegerv(pname, intParams);
for(unsigned int i = 0; i < numParams; ++i) for(int i = 0; i < numParams; ++i)
{ {
if(intParams[i] == 0) if(intParams[i] == 0)
params[i] = GL_FALSE; params[i] = GL_FALSE;
...@@ -2027,7 +2027,7 @@ void GetFloatv(GLenum pname, GLfloat* params) ...@@ -2027,7 +2027,7 @@ void GetFloatv(GLenum pname, GLfloat* params)
{ {
if(!(context->getFloatv(pname, params))) if(!(context->getFloatv(pname, params)))
{ {
unsigned int numParams = context->getQueryParameterNum(pname); int numParams = context->getQueryParameterNum(pname);
if(numParams < 0) if(numParams < 0)
{ {
...@@ -2046,7 +2046,7 @@ void GetFloatv(GLenum pname, GLfloat* params) ...@@ -2046,7 +2046,7 @@ void GetFloatv(GLenum pname, GLfloat* params)
context->getBooleanv(pname, boolParams); context->getBooleanv(pname, boolParams);
for(unsigned int i = 0; i < numParams; ++i) for(int i = 0; i < numParams; ++i)
{ {
if(boolParams[i] == GL_FALSE) if(boolParams[i] == GL_FALSE)
params[i] = 0.0f; params[i] = 0.0f;
...@@ -2063,7 +2063,7 @@ void GetFloatv(GLenum pname, GLfloat* params) ...@@ -2063,7 +2063,7 @@ void GetFloatv(GLenum pname, GLfloat* params)
context->getIntegerv(pname, intParams); context->getIntegerv(pname, intParams);
for(unsigned int i = 0; i < numParams; ++i) for(int i = 0; i < numParams; ++i)
{ {
params[i] = (GLfloat)intParams[i]; params[i] = (GLfloat)intParams[i];
} }
...@@ -2168,7 +2168,7 @@ void GetIntegerv(GLenum pname, GLint* params) ...@@ -2168,7 +2168,7 @@ void GetIntegerv(GLenum pname, GLint* params)
{ {
if(!(context->getIntegerv(pname, params))) if(!(context->getIntegerv(pname, params)))
{ {
unsigned int numParams = context->getQueryParameterNum(pname); int numParams = context->getQueryParameterNum(pname);
if(numParams < 0) if(numParams < 0)
{ {
...@@ -2187,7 +2187,7 @@ void GetIntegerv(GLenum pname, GLint* params) ...@@ -2187,7 +2187,7 @@ void GetIntegerv(GLenum pname, GLint* params)
context->getBooleanv(pname, boolParams); context->getBooleanv(pname, boolParams);
for(unsigned int i = 0; i < numParams; ++i) for(int i = 0; i < numParams; ++i)
{ {
if(boolParams[i] == GL_FALSE) if(boolParams[i] == GL_FALSE)
params[i] = 0; params[i] = 0;
...@@ -2204,7 +2204,7 @@ void GetIntegerv(GLenum pname, GLint* params) ...@@ -2204,7 +2204,7 @@ void GetIntegerv(GLenum pname, GLint* params)
context->getFloatv(pname, floatParams); context->getFloatv(pname, floatParams);
for(unsigned int i = 0; i < numParams; ++i) for(int i = 0; i < numParams; ++i)
{ {
if(pname == GL_DEPTH_RANGE || pname == GL_COLOR_CLEAR_VALUE || pname == GL_DEPTH_CLEAR_VALUE) if(pname == GL_DEPTH_RANGE || pname == GL_COLOR_CLEAR_VALUE || pname == GL_DEPTH_CLEAR_VALUE)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment