commit 361df070323f430aa0614c6eb04fb595dec3daa9
author Jiawei Shao <jiawei.shao@intel.com> Wed Nov 22 09:33:59 2017 +0800
committer Commit Bot <commit-bot@chromium.org> Fri Dec 01 15:48:21 2017 +0000
tree 30a363f480d51d2ad09e5ed34a350dccf5b274c8
parent 94f1e89fc8bd87e3177cf130f0c99a48a7e1765f

ES31: Implement Geometry Shader resource queries on OpenGL

This patch intends to implement all geometry shader related
resource queries on OpenGL back-ends.

This patch also fixes a memory leak by releasing the geometry
shader compiler handle in the destructor of the Compiler.

BUG=angleproject:1941, angleproject:2261
TEST=angle_end2end_tests

Change-Id: Ieb69c162d2fc6c6550e145d1ec7948c3d36d4d15
Reviewed-on: https://chromium-review.googlesource.com/784552
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>

src/libANGLE/Compiler.cpp

diff --git a/src/libANGLE/Compiler.cpp b/src/libANGLE/Compiler.cpp
index 236c7e1..b524520 100644
--- a/src/libANGLE/Compiler.cpp
+++ b/src/libANGLE/Compiler.cpp
@@ -132,10 +132,20 @@
     }
 
     // Geometry Shader constants
+    // TODO(jiawei.shao@intel.com): use EXT_geometry_shader everywhere in compiler.
     mResources.OES_geometry_shader = extensions.geometryShader;
-    // TODO(jiawei.shao@intel.com): initialize all implementation dependent geometry shader limits.
-    mResources.MaxGeometryOutputVertices    = extensions.maxGeometryOutputVertices;
-    mResources.MaxGeometryShaderInvocations = extensions.maxGeometryShaderInvocations;
+    mResources.MaxGeometryUniformComponents     = caps.maxGeometryUniformComponents;
+    mResources.MaxGeometryUniformBlocks         = caps.maxGeometryUniformBlocks;
+    mResources.MaxGeometryInputComponents       = caps.maxGeometryInputComponents;
+    mResources.MaxGeometryOutputComponents      = caps.maxGeometryOutputComponents;
+    mResources.MaxGeometryOutputVertices        = caps.maxGeometryOutputVertices;
+    mResources.MaxGeometryTotalOutputComponents = caps.maxGeometryTotalOutputComponents;
+    mResources.MaxGeometryTextureImageUnits     = caps.maxGeometryTextureImageUnits;
+    mResources.MaxGeometryAtomicCounterBuffers  = caps.maxGeometryAtomicCounterBuffers;
+    mResources.MaxGeometryAtomicCounters        = caps.maxGeometryAtomicCounters;
+    mResources.MaxGeometryShaderStorageBlocks   = caps.maxGeometryShaderStorageBlocks;
+    mResources.MaxGeometryShaderInvocations     = caps.maxGeometryShaderInvocations;
+    mResources.MaxGeometryImageUniforms         = caps.maxGeometryImageUniforms;
 }
 
 Compiler::~Compiler()
@@ -167,6 +177,15 @@
         activeCompilerHandles--;
     }
 
+    if (mGeometryCompiler)
+    {
+        sh::Destruct(mGeometryCompiler);
+        mGeometryCompiler = nullptr;
+
+        ASSERT(activeCompilerHandles > 0);
+        activeCompilerHandles--;
+    }
+
     if (activeCompilerHandles == 0)
     {
         sh::Finalize();