commit bd924af17363fda7e0e76e1ab4f07c9e45893e59
author Jiawei Shao <jiawei.shao@intel.com> Thu Nov 16 15:28:04 2017 +0800
committer Commit Bot <commit-bot@chromium.org> Thu Dec 14 18:32:04 2017 +0000
tree 0fa84d8e7a7b38850b643a8ab4ccd28360820b38
parent f15f9cec318b5b0042cca7f819b1df9dbd1872ee

ES31: Remove support of GL_OES_geometry_shader in compiler

This patch intends to remove the support of GL_OES_geometry_shader
in ANGLE compiler.

To make the implementation simpler, currently we decide to only
support "GL_EXT_geometry_shader" as the extension string of geometry
shader in ANGLE.

This patch also updates all the related shaders in angle_unittests
into R"()" format.

BUG=angleproject:1941
TEST=angle_unittests

Change-Id: Ife9858abeedfb46b02c5c2fb1cda16fa27198511
Reviewed-on: https://chromium-review.googlesource.com/773451
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>

src/compiler/translator/Initialize.cpp

diff --git a/src/compiler/translator/Initialize.cpp b/src/compiler/translator/Initialize.cpp
index a5319dd..7c841f8 100644
--- a/src/compiler/translator/Initialize.cpp
+++ b/src/compiler/translator/Initialize.cpp
@@ -733,9 +733,9 @@
                                                       voidType, "groupMemoryBarrier");
     }
 
-    if (type == GL_GEOMETRY_SHADER_OES)
+    if (type == GL_GEOMETRY_SHADER_EXT)
     {
-        TExtension extension = TExtension::OES_geometry_shader;
+        TExtension extension = TExtension::EXT_geometry_shader;
         symbolTable.insertBuiltInFunctionNoParametersExt(ESSL3_1_BUILTINS, extension, EOpEmitVertex,
                                                          voidType, "EmitVertex");
         symbolTable.insertBuiltInFunctionNoParametersExt(ESSL3_1_BUILTINS, extension,
@@ -844,9 +844,9 @@
     symbolTable.insertConstInt(ESSL3_1_BUILTINS, "gl_MaxAtomicCounterBufferSize",
                                resources.MaxAtomicCounterBufferSize, EbpMedium);
 
-    if (resources.OES_geometry_shader)
+    if (resources.EXT_geometry_shader)
     {
-        TExtension ext = TExtension::OES_geometry_shader;
+        TExtension ext = TExtension::EXT_geometry_shader;
         symbolTable.insertConstIntExt(ESSL3_1_BUILTINS, ext, "gl_MaxGeometryInputComponents",
                                       resources.MaxGeometryInputComponents, EbpMedium);
         symbolTable.insertConstIntExt(ESSL3_1_BUILTINS, ext, "gl_MaxGeometryOutputComponents",
@@ -963,9 +963,9 @@
                     TType(EbtFloat, EbpMedium, EvqLastFragColor, 4));
             }
 
-            if (resources.OES_geometry_shader)
+            if (resources.EXT_geometry_shader)
             {
-                TExtension extension = TExtension::OES_geometry_shader;
+                TExtension extension = TExtension::EXT_geometry_shader;
                 symbolTable.insertVariableExt(ESSL3_1_BUILTINS, extension, "gl_PrimitiveID",
                                               TType(EbtInt, EbpHigh, EvqPrimitiveID, 1));
                 symbolTable.insertVariableExt(ESSL3_1_BUILTINS, extension, "gl_Layer",
@@ -1009,12 +1009,12 @@
             break;
         }
 
-        case GL_GEOMETRY_SHADER_OES:
+        case GL_GEOMETRY_SHADER_EXT:
         {
-            TExtension extension = TExtension::OES_geometry_shader;
+            TExtension extension = TExtension::EXT_geometry_shader;
 
             // Add built-in interface block gl_PerVertex and the built-in array gl_in.
-            // TODO(jiawei.shao@intel.com): implement GL_OES_geometry_point_size.
+            // TODO(jiawei.shao@intel.com): implement GL_EXT_geometry_point_size.
             TFieldList *glPerVertexFieldList = new TFieldList();
             TSourceLoc zeroSourceLoc = {0, 0, 0, 0};
             TField *glPositionField  = new TField(new TType(EbtFloat, EbpHigh, EvqPosition, 4),
@@ -1117,9 +1117,8 @@
     {
         extBehavior[TExtension::EXT_YUV_target] = EBhUndefined;
     }
-    if (resources.OES_geometry_shader)
+    if (resources.EXT_geometry_shader)
     {
-        extBehavior[TExtension::OES_geometry_shader] = EBhUndefined;
         extBehavior[TExtension::EXT_geometry_shader] = EBhUndefined;
     }
 }