Merge vk-gl-cts/gl-subgroups-dev into vk-gl-cts/master

Change-Id: Ib69ac2a513b45fbd1c3bfd72d72ae2b3ed9da046

diff --cc external/openglcts/modules/common/CMakeLists.txt
Simple merge

diff --cc external/openglcts/modules/runner/glcTestRunner.cpp
Simple merge

diff --cc external/openglcts/scripts/build_mustpass.py
index 0ba4d04,bacad7d..f98c973
--- 1/external/openglcts/scripts/build_mustpass.py
--- 2/external/openglcts/scripts/build_mustpass.py
+++ b/external/openglcts/scripts/build_mustpass.py
@@@ -874,9 -875,19 +881,19 @@@ GLCTS_NOCTX_ES32_KHR_PKG         = Package(mod
                                        surfacewidth    = "64",
                                        surfaceheight   = "64",
                                        baseseed                = "1",
 -                                      filters                 = [include("gles32-khr-master.txt")]),
 +                                      filters                 = MASTER_GLES32_COMMON_FILTERS),
        ])
  
+ GLCTS_SINGLE_ES32_KHR_PKG             = Package(module = SINGLE_ES32_KHR_MODULE, configurations = [
+               # Master
+               Configuration(name                      = "khr-single",
+                                       surfacewidth    = "64",
+                                       surfaceheight   = "64",
+                                       baseseed                = "1",
+                                       filters                 = [include("gles32-khr-single.txt")]),
+       ])
+ 
+ 
  ES_MUSTPASS_LISTS             = [
        # 3.2.2.x
        Mustpass(project = CTS_KHR_MP_ES_PROJECT,       version = "3.2.2.x", isCurrent=False,

diff --cc framework/opengl/wrapper/glwEnums.inl
Simple merge

diff --cc framework/opengl/wrapper/glwInitExtES.inl
Simple merge

diff --cc scripts/opengl/src_util.py
Simple merge