ES31: Support queries on primitives generated by geometry shader

src/libANGLE/State.cpp

@@ -214,6 +214,7 @@ void State::initialize(const Context *context,
     mActiveQueries[GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN].set(context, nullptr);
     mActiveQueries[GL_TIME_ELAPSED_EXT].set(context, nullptr);
     mActiveQueries[GL_COMMANDS_COMPLETED_CHROMIUM].set(context, nullptr);
+    mActiveQueries[GL_PRIMITIVES_GENERATED_EXT].set(context, nullptr);
 
     mProgram = nullptr;
 

src/libANGLE/renderer/gl/QueryGL.cpp

@@ -33,6 +33,9 @@ GLuint64 MergeQueryResults(GLenum type, GLuint64 currentResult, GLuint64 newResu
         case GL_TIMESTAMP:
             return newResult;
 
+        case GL_PRIMITIVES_GENERATED_EXT:
+            return currentResult + newResult;
+
         default:
             UNREACHABLE();
             return 0;

src/libANGLE/renderer/gl/StateManagerGL.cpp

@@ -33,9 +33,12 @@
 namespace rx
 {
 
-static const GLenum QueryTypes[] = {GL_ANY_SAMPLES_PASSED, GL_ANY_SAMPLES_PASSED_CONSERVATIVE,
-                                    GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN, GL_TIME_ELAPSED,
-                                    GL_COMMANDS_COMPLETED_CHROMIUM};
+static constexpr GLenum QueryTypes[] = {GL_ANY_SAMPLES_PASSED,
+                                        GL_ANY_SAMPLES_PASSED_CONSERVATIVE,
+                                        GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN,
+                                        GL_TIME_ELAPSED,
+                                        GL_COMMANDS_COMPLETED_CHROMIUM,
+                                        GL_PRIMITIVES_GENERATED_EXT};
 
 StateManagerGL::IndexedBufferBinding::IndexedBufferBinding() : offset(0), size(0), buffer(0)
 {

src/libANGLE/validationES.cpp

@@ -983,6 +983,8 @@ bool ValidQueryType(const Context *context, GLenum queryType)
             return context->getExtensions().disjointTimerQuery;
         case GL_COMMANDS_COMPLETED_CHROMIUM:
             return context->getExtensions().syncQuery;
+        case GL_PRIMITIVES_GENERATED_EXT:
+            return context->getExtensions().geometryShader;
         default:
             return false;
     }

src/tests/deqp_support/deqp_gles31_test_expectations.txt

@@ -1643,7 +1643,6 @@
 1442 OPENGL D3D11 : dEQP-GLES31.functional.debug.negative_coverage.get_error.shader_directive.tessellation_shader = FAIL
 1442 OPENGL D3D11 : dEQP-GLES31.functional.debug.object_labels.program_pipeline = FAIL
 
-1941 OPENGL D3D11 : dEQP-GLES31.functional.geometry_shading.query.primitives_* = FAIL
 1941 OPENGL D3D11 : dEQP-GLES31.functional.geometry_shading.query.referenced_by_geometry_shader = FAIL
 
 2324 DEBUG RELEASE : dEQP-GLES31.functional.debug.negative_coverage.callbacks.compute.program_not_active = FAIL