commit 52114cc56a924fc8ec9ff9ad3ebcde1d1a14ecc4
author Alexis Hetu <sugoi@google.com> Fri May 01 15:38:40 2015 -0400
committer Alexis Hétu <sugoi@google.com> Mon May 04 15:00:38 2015 +0000
tree 48cbdc8dde12b42e0daa881f90d5ac9e65ce48d3
parent 86d33ccae0aa9ecb19363c7915269f3b7a1445e1

Added missing query type

OpenGL ES 3.0 has a new type of query,
GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN,
so it was added where appropriate.

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

src/OpenGL/libGLESv2/Context.cpp

diff --git a/src/OpenGL/libGLESv2/Context.cpp b/src/OpenGL/libGLESv2/Context.cpp
index ecbf7d7..5fcd823 100644
--- a/src/OpenGL/libGLESv2/Context.cpp
+++ b/src/OpenGL/libGLESv2/Context.cpp
@@ -739,6 +739,9 @@
     case GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT:

         queryObject = mState.activeQuery[QUERY_ANY_SAMPLES_PASSED_CONSERVATIVE];

         break;

+    case GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN:

+        queryObject = mState.activeQuery[QUERY_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN];

+        break;

     default:

         ASSERT(false);

     }

@@ -1271,6 +1274,9 @@
     case GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT: 

         qType = QUERY_ANY_SAMPLES_PASSED_CONSERVATIVE; 

         break;

+    case GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN:

+        qType = QUERY_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN;

+        break;

     default: 

         ASSERT(false);

     }

@@ -1308,6 +1314,9 @@
     case GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT: 

         qType = QUERY_ANY_SAMPLES_PASSED_CONSERVATIVE; 

         break;

+    case GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN:

+        qType = QUERY_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN;

+        break;

     default: 

         ASSERT(false);

     }

src/OpenGL/libGLESv2/Context.h

diff --git a/src/OpenGL/libGLESv2/Context.h b/src/OpenGL/libGLESv2/Context.h
index 7abe86d..0c9706b 100644
--- a/src/OpenGL/libGLESv2/Context.h
+++ b/src/OpenGL/libGLESv2/Context.h
@@ -118,6 +118,7 @@
 {

     QUERY_ANY_SAMPLES_PASSED,

     QUERY_ANY_SAMPLES_PASSED_CONSERVATIVE,

+    QUERY_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN,

 

     QUERY_TYPE_COUNT

 };

src/OpenGL/libGLESv2/Query.cpp

diff --git a/src/OpenGL/libGLESv2/Query.cpp b/src/OpenGL/libGLESv2/Query.cpp
index 52e23ac..6439e27 100644
--- a/src/OpenGL/libGLESv2/Query.cpp
+++ b/src/OpenGL/libGLESv2/Query.cpp
@@ -114,6 +114,9 @@
             case GL_ANY_SAMPLES_PASSED_CONSERVATIVE_EXT:

                 mResult = (numPixels > 0) ? GL_TRUE : GL_FALSE;

                 break;

+            case GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN:

+                UNIMPLEMENTED();

+                break;

             default:

                 ASSERT(false);

             }