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/3032Tested-by: Alexis Hétu <sugoi@google.com> Reviewed-by: Nicolas Capens <capn@google.com>

Added missing query type
52114cc5 · Alexis Hetu · Alexis Hétu · 86d33cca · 52114cc5 · 52114cc5
Commit 52114cc5 authored May 01, 2015 by Alexis Hetu Committed by Alexis Hétu May 04, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 0 deletions

Context.cpp src/OpenGL/libGLESv2/Context.cpp +9 -0

Context.h src/OpenGL/libGLESv2/Context.h +1 -0

Query.cpp src/OpenGL/libGLESv2/Query.cpp +3 -0

No files found.
--- a/src/OpenGL/libGLESv2/Context.cpp
+++ b/src/OpenGL/libGLESv2/Context.cpp
@@ -739,6 +739,9 @@ GLuint Context::getActiveQuery(GLenum target) const
    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 @@ void Context::beginQuery(GLenum target, GLuint query)
    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 @@ void Context::endQuery(GLenum target)
    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);
    }

--- a/src/OpenGL/libGLESv2/Context.h
+++ b/src/OpenGL/libGLESv2/Context.h
@@ -118,6 +118,7 @@ enum QueryType
 {
    QUERY_ANY_SAMPLES_PASSED,
    QUERY_ANY_SAMPLES_PASSED_CONSERVATIVE,
+    QUERY_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN,

    QUERY_TYPE_COUNT
 };

--- a/src/OpenGL/libGLESv2/Query.cpp
+++ b/src/OpenGL/libGLESv2/Query.cpp
@@ -114,6 +114,9 @@ GLboolean Query::testQuery()
            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);
            }