diff options
Diffstat (limited to 'src/3rdparty/angle/src/compiler/translator/Compiler.h')
-rw-r--r-- | src/3rdparty/angle/src/compiler/translator/Compiler.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/src/3rdparty/angle/src/compiler/translator/Compiler.h b/src/3rdparty/angle/src/compiler/translator/Compiler.h index 5eac2d89d1..ca0c157884 100644 --- a/src/3rdparty/angle/src/compiler/translator/Compiler.h +++ b/src/3rdparty/angle/src/compiler/translator/Compiler.h @@ -71,9 +71,9 @@ class TCompiler : public TShHandleBase const std::vector<sh::Attribute> &getAttributes() const { return attributes; } const std::vector<sh::Attribute> &getOutputVariables() const { return outputVariables; } const std::vector<sh::Uniform> &getUniforms() const { return uniforms; } - const std::vector<sh::Uniform> &getExpandedUniforms() const { return expandedUniforms; } + const std::vector<sh::ShaderVariable> &getExpandedUniforms() const { return expandedUniforms; } const std::vector<sh::Varying> &getVaryings() const { return varyings; } - const std::vector<sh::Varying> &getExpandedVaryings() const { return expandedVaryings; } + const std::vector<sh::ShaderVariable> &getExpandedVaryings() const { return expandedVaryings; } const std::vector<sh::InterfaceBlock> &getInterfaceBlocks() const { return interfaceBlocks; } ShHashFunction64 getHashFunction() const { return hashFunction; } @@ -83,6 +83,9 @@ class TCompiler : public TShHandleBase ShShaderOutput getOutputType() const { return outputType; } std::string getBuiltInResourcesString() const { return builtInResourcesString; } + // Get the resources set by InitBuiltInSymbolTable + const ShBuiltInResources& getResources() const; + protected: sh::GLenum getShaderType() const { return shaderType; } // Initialize symbol-table with built-in symbols. @@ -128,8 +131,6 @@ class TCompiler : public TShHandleBase bool limitExpressionComplexity(TIntermNode* root); // Get built-in extensions with default behavior. const TExtensionBehavior& getExtensionBehavior() const; - // Get the resources set by InitBuiltInSymbolTable - const ShBuiltInResources& getResources() const; const ArrayBoundsClamper& getArrayBoundsClamper() const; ShArrayIndexClampingStrategy getArrayIndexClampingStrategy() const; @@ -138,9 +139,9 @@ class TCompiler : public TShHandleBase std::vector<sh::Attribute> attributes; std::vector<sh::Attribute> outputVariables; std::vector<sh::Uniform> uniforms; - std::vector<sh::Uniform> expandedUniforms; + std::vector<sh::ShaderVariable> expandedUniforms; std::vector<sh::Varying> varyings; - std::vector<sh::Varying> expandedVaryings; + std::vector<sh::ShaderVariable> expandedVaryings; std::vector<sh::InterfaceBlock> interfaceBlocks; private: |