From 561a15e11acb8931668dd3d704fe8f78a4355757 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Tue, 10 Nov 2020 11:26:24 +0000
Subject: [PATCH] Add some missing GL enums

---
 renderdoc/driver/gl/gl_common.cpp | 45 +++++++++++++++++++------------
 renderdoc/driver/gl/gl_driver.h   |  2 +-
 2 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/renderdoc/driver/gl/gl_common.cpp b/renderdoc/driver/gl/gl_common.cpp
index 0c9b2e83c..27393735a 100644
--- a/renderdoc/driver/gl/gl_common.cpp
+++ b/renderdoc/driver/gl/gl_common.cpp
@@ -1368,6 +1368,8 @@ size_t QueryIdx(GLenum query)
     case eGL_GEOMETRY_SHADER_INVOCATIONS: idx = 14; break;
     case eGL_FRAGMENT_SHADER_INVOCATIONS_ARB: idx = 15; break;
     case eGL_COMPUTE_SHADER_INVOCATIONS_ARB: idx = 16; break;
+    case eGL_TRANSFORM_FEEDBACK_OVERFLOW: idx = 17; break;
+    case eGL_TRANSFORM_FEEDBACK_STREAM_OVERFLOW: idx = 18; break;
 
     default: RDCERR("Unexpected enum as query target: %s", ToStr(query).c_str());
   }
@@ -1380,23 +1382,27 @@ size_t QueryIdx(GLenum query)
 
 GLenum QueryEnum(size_t idx)
 {
-  GLenum enums[] = {eGL_SAMPLES_PASSED,
-                    eGL_ANY_SAMPLES_PASSED,
-                    eGL_ANY_SAMPLES_PASSED_CONSERVATIVE,
-                    eGL_PRIMITIVES_GENERATED,
-                    eGL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN,
-                    eGL_TIME_ELAPSED,
-                    eGL_VERTICES_SUBMITTED_ARB,
-                    eGL_PRIMITIVES_SUBMITTED_ARB,
-                    eGL_GEOMETRY_SHADER_PRIMITIVES_EMITTED_ARB,
-                    eGL_CLIPPING_INPUT_PRIMITIVES_ARB,
-                    eGL_CLIPPING_OUTPUT_PRIMITIVES_ARB,
-                    eGL_VERTEX_SHADER_INVOCATIONS_ARB,
-                    eGL_TESS_CONTROL_SHADER_PATCHES_ARB,
-                    eGL_TESS_EVALUATION_SHADER_INVOCATIONS_ARB,
-                    eGL_GEOMETRY_SHADER_INVOCATIONS,
-                    eGL_FRAGMENT_SHADER_INVOCATIONS_ARB,
-                    eGL_COMPUTE_SHADER_INVOCATIONS_ARB};
+  GLenum enums[] = {
+      eGL_SAMPLES_PASSED,
+      eGL_ANY_SAMPLES_PASSED,
+      eGL_ANY_SAMPLES_PASSED_CONSERVATIVE,
+      eGL_PRIMITIVES_GENERATED,
+      eGL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN,
+      eGL_TIME_ELAPSED,
+      eGL_VERTICES_SUBMITTED_ARB,
+      eGL_PRIMITIVES_SUBMITTED_ARB,
+      eGL_GEOMETRY_SHADER_PRIMITIVES_EMITTED_ARB,
+      eGL_CLIPPING_INPUT_PRIMITIVES_ARB,
+      eGL_CLIPPING_OUTPUT_PRIMITIVES_ARB,
+      eGL_VERTEX_SHADER_INVOCATIONS_ARB,
+      eGL_TESS_CONTROL_SHADER_PATCHES_ARB,
+      eGL_TESS_EVALUATION_SHADER_INVOCATIONS_ARB,
+      eGL_GEOMETRY_SHADER_INVOCATIONS,
+      eGL_FRAGMENT_SHADER_INVOCATIONS_ARB,
+      eGL_COMPUTE_SHADER_INVOCATIONS_ARB,
+      eGL_TRANSFORM_FEEDBACK_OVERFLOW,
+      eGL_TRANSFORM_FEEDBACK_STREAM_OVERFLOW,
+  };
 
   if(idx < ARRAY_COUNT(enums))
     return enums[idx];
@@ -1412,6 +1418,11 @@ size_t GLTypeSize(GLenum type)
     case eGL_BYTE: return 1;
     case eGL_UNSIGNED_SHORT:
     case eGL_UNSIGNED_SHORT_5_6_5:
+    case eGL_UNSIGNED_SHORT_5_6_5_REV:
+    case eGL_UNSIGNED_SHORT_4_4_4_4:
+    case eGL_UNSIGNED_SHORT_4_4_4_4_REV:
+    case eGL_UNSIGNED_SHORT_5_5_5_1:
+    case eGL_UNSIGNED_SHORT_1_5_5_5_REV:
     case eGL_SHORT:
     case eGL_HALF_FLOAT_OES:
     case eGL_HALF_FLOAT: return 2;
diff --git a/renderdoc/driver/gl/gl_driver.h b/renderdoc/driver/gl/gl_driver.h
index 70d4e6221..c2425cbaa 100644
--- a/renderdoc/driver/gl/gl_driver.h
+++ b/renderdoc/driver/gl/gl_driver.h
@@ -190,7 +190,7 @@ private:
 public:
   enum
   {
-    MAX_QUERIES = 17,
+    MAX_QUERIES = 19,
     MAX_QUERY_INDICES = 8
   };