Enable the translator to pass parsed interface blocks back to the ANGLE API via…

include/GLSLANG/ShaderLang.h

@@ -37,7 +37,7 @@ extern "C" {
 
 // Version number for shader translation API.
 // It is incremented everytime the API changes.
-#define ANGLE_SH_VERSION 111
+#define ANGLE_SH_VERSION 112
 
 //
 // The names of the following enums have been derived by replacing GL prefix
@@ -120,7 +120,8 @@ typedef enum {
   SH_HASHED_NAME_MAX_LENGTH      =  0x6002,
   SH_HASHED_NAMES_COUNT          =  0x6003,
   SH_ACTIVE_UNIFORMS_ARRAY       =  0x6004,
-  SH_SHADER_VERSION              =  0x6005
+  SH_SHADER_VERSION              =  0x6005,
+  SH_ACTIVE_INTERFACE_BLOCKS_ARRAY =  0x6006,
 } ShShaderInfo;
 
 // Compile options.

src/compiler/ShaderLang.cpp

@@ -376,6 +376,9 @@ void ShGetInfoPointer(const ShHandle handle, ShShaderInfo pname, void** params)
     case SH_ACTIVE_UNIFORMS_ARRAY:
         *params = (void*)&translator->getUniforms();
         break;
+    case SH_ACTIVE_INTERFACE_BLOCKS_ARRAY:
+        *params = (void*)&translator->getInterfaceBlocks();
+        break;
     default: UNREACHABLE();
     }
 }

src/compiler/TranslatorHLSL.cpp

@@ -21,4 +21,5 @@ void TranslatorHLSL::translate(TIntermNode *root)
 
     outputHLSL.output();
     mActiveUniforms = outputHLSL.getUniforms();
+    mActiveInterfaceBlocks = outputHLSL.getInterfaceBlocks();
 }

src/compiler/TranslatorHLSL.h

@@ -16,11 +16,13 @@ public:
 
     virtual TranslatorHLSL *getAsTranslatorHLSL() { return this; }
     const sh::ActiveUniforms &getUniforms() { return mActiveUniforms; }
+    const sh::ActiveInterfaceBlocks &getInterfaceBlocks() const { return mActiveInterfaceBlocks; }
 
 protected:
     virtual void translate(TIntermNode* root);
 
     sh::ActiveUniforms mActiveUniforms;
+    sh::ActiveInterfaceBlocks mActiveInterfaceBlocks;
     ShShaderOutput mOutputType;
 };
 

src/libGLESv2/Shader.cpp

@@ -424,6 +424,10 @@ void Shader::compileToHLSL(void *compiler)
         void *activeUniforms;
         ShGetInfoPointer(compiler, SH_ACTIVE_UNIFORMS_ARRAY, &activeUniforms);
         mActiveUniforms = *(sh::ActiveUniforms*)activeUniforms;
+
+        void *activeInterfaceBlocks;
+        ShGetInfoPointer(compiler, SH_ACTIVE_INTERFACE_BLOCKS_ARRAY, &activeInterfaceBlocks);
+        mActiveInterfaceBlocks = *(sh::ActiveInterfaceBlocks*)activeInterfaceBlocks;
     }
     else
     {