Fix potentially uninitialized variable warning.

Change-Id: I29172c0c5423750db2665c350746b82fd2a34653
Reviewed-on: https://swiftshader-review.googlesource.com/5181
Tested-by: Nicolas Capens <capn@google.com>
Reviewed-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

diff --git a/src/OpenGL/libGLESv2/Query.cpp b/src/OpenGL/libGLESv2/Query.cpp
index b425cb6..223cfc3 100644 (file)
--- a/src/OpenGL/libGLESv2/Query.cpp
+++ b/src/OpenGL/libGLESv2/Query.cpp
@@ -20,8 +20,8 @@ namespace es2
 {\r
 \r
 Query::Query(GLuint name, GLenum type) : NamedObject(name)\r
-{ \r
-    mQuery = NULL;\r
+{\r
+    mQuery = nullptr;\r
     mStatus = GL_FALSE;\r
     mResult = GL_FALSE;\r
     mType = type;\r
@@ -29,7 +29,7 @@ Query::Query(GLuint name, GLenum type) : NamedObject(name)
 \r
 Query::~Query()\r
 {\r
-    if(mQuery != NULL)\r
+    if(mQuery)\r
     {\r
         delete mQuery;\r
     }\r
@@ -37,7 +37,7 @@ Query::~Query()
 \r
 void Query::begin()\r
 {\r
-    if(mQuery == NULL)\r
+    if(!mQuery)\r
     {\r
                sw::Query::Type type;\r
                switch(mType)\r
@@ -50,7 +50,8 @@ void Query::begin()
                        type = sw::Query::TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN;\r
                        break;\r
                default:\r
-                       ASSERT(false);\r
+                       UNREACHABLE(mType);\r
+                       return;\r
                }\r
 \r
                mQuery = new sw::Query(type);\r
@@ -81,7 +82,7 @@ void Query::begin()
 \r
 void Query::end()\r
 {\r
-    if(mQuery == NULL)\r
+    if(!mQuery)\r
     {\r
         return error(GL_INVALID_OPERATION);\r
        }\r
@@ -109,7 +110,7 @@ void Query::end()
 \r
 GLuint Query::getResult()\r
 {\r
-    if(mQuery != NULL)\r
+    if(mQuery)\r
     {\r
         while(!testQuery())\r
         {\r
@@ -122,11 +123,11 @@ GLuint Query::getResult()
 \r
 GLboolean Query::isResultAvailable()\r
 {\r
-    if(mQuery != NULL)\r
+    if(mQuery)\r
     {\r
         testQuery();\r
     }\r
-    \r
+\r
     return mStatus;\r
 }\r
 \r
@@ -137,7 +138,7 @@ GLenum Query::getType() const
 \r
 GLboolean Query::testQuery()\r
 {\r
-    if(mQuery != NULL && mStatus != GL_TRUE)\r
+    if(mQuery != nullptr && mStatus != GL_TRUE)\r
     {\r
         if(!mQuery->building && mQuery->reference == 0)\r
         {\r
@@ -157,10 +158,10 @@ GLboolean Query::testQuery()
                 ASSERT(false);\r
             }\r
         }\r
-        \r
+\r
         return mStatus;\r
     }\r
 \r
-    return GL_TRUE;   // Prevent blocking when query is null\r
+    return GL_TRUE;   // Prevent blocking when query is nullptr\r
 }\r
 }\r