Skip to content

A
angle
Commit a0a9e12d by Jamie Madill
Options

translator: Add sh::OutputVariable type.

This replaces the dual-use of sh::Attribute, which can be a bit confusing to people expecting a literal output variable. Currently not used in Chromium, so should be safe to land. BUG=angleproject:1146 Change-Id: I436f2bc9dc4ddc3709369cb2baa344c6b13a21a2 Reviewed-on: https://chromium-review.googlesource.com/296683Reviewed-by: 's avatarKenneth Russell <kbr@chromium.org> Reviewed-by: 's avatarZhenyao Mo <zmo@chromium.org> Tested-by: 's avatarJamie Madill <jmadill@chromium.org>
parent beb81589
Showing with 159 additions and 78 deletions
include/GLSLANG/ShaderLang.h
...@@ -48,7 +48,7 @@ typedef unsigned int GLenum; ...@@ -48,7 +48,7 @@ typedef unsigned int GLenum;
// Version number for shader translation API. // Version number for shader translation API.
// It is incremented every time the API changes. // It is incremented every time the API changes.
#define ANGLE_SH_VERSION 139 #define ANGLE_SH_VERSION 140
typedef enum { typedef enum {
SH_GLES2_SPEC = 0x8B40, SH_GLES2_SPEC = 0x8B40,
...@@ -406,7 +406,7 @@ COMPILER_EXPORT const std::map<std::string, std::string> *ShGetNameHashingMap( ...@@ -406,7 +406,7 @@ COMPILER_EXPORT const std::map<std::string, std::string> *ShGetNameHashingMap(
COMPILER_EXPORT const std::vector<sh::Uniform> *ShGetUniforms(const ShHandle handle); COMPILER_EXPORT const std::vector<sh::Uniform> *ShGetUniforms(const ShHandle handle);
COMPILER_EXPORT const std::vector<sh::Varying> *ShGetVaryings(const ShHandle handle); COMPILER_EXPORT const std::vector<sh::Varying> *ShGetVaryings(const ShHandle handle);
COMPILER_EXPORT const std::vector<sh::Attribute> *ShGetAttributes(const ShHandle handle); COMPILER_EXPORT const std::vector<sh::Attribute> *ShGetAttributes(const ShHandle handle);
COMPILER_EXPORT const std::vector<sh::Attribute> *ShGetOutputVariables(const ShHandle handle); COMPILER_EXPORT const std::vector<sh::OutputVariable> *ShGetOutputVariables(const ShHandle handle);
COMPILER_EXPORT const std::vector<sh::InterfaceBlock> *ShGetInterfaceBlocks(const ShHandle handle); COMPILER_EXPORT const std::vector<sh::InterfaceBlock> *ShGetInterfaceBlocks(const ShHandle handle);
typedef struct typedef struct
......
include/GLSLANG/ShaderVars.h
...@@ -110,19 +110,39 @@ struct COMPILER_EXPORT Uniform : public ShaderVariable ...@@ -110,19 +110,39 @@ struct COMPILER_EXPORT Uniform : public ShaderVariable
bool isSameUniformAtLinkTime(const Uniform &other) const; bool isSameUniformAtLinkTime(const Uniform &other) const;
}; };
struct COMPILER_EXPORT Attribute : public ShaderVariable // An interface variable is a variable which passes data between the GL data structures and the
// shader execution: either vertex shader inputs or fragment shader outputs. These variables can
// have integer locations to pass back to the GL API.
struct COMPILER_EXPORT InterfaceVariable : public ShaderVariable
{
InterfaceVariable();
~InterfaceVariable();
InterfaceVariable(const InterfaceVariable &other);
InterfaceVariable &operator=(const InterfaceVariable &other);
bool operator==(const InterfaceVariable &other) const;
bool operator!=(const InterfaceVariable &other) const { return !operator==(other); }
int location;
};
struct COMPILER_EXPORT Attribute : public InterfaceVariable
{ {
Attribute(); Attribute();
~Attribute(); ~Attribute();
Attribute(const Attribute &other); Attribute(const Attribute &other);
Attribute &operator=(const Attribute &other); Attribute &operator=(const Attribute &other);
bool operator==(const Attribute &other) const; bool operator==(const Attribute &other) const;
bool operator!=(const Attribute &other) const bool operator!=(const Attribute &other) const { return !operator==(other); }
{ };
return !operator==(other);
}
int location; struct COMPILER_EXPORT OutputVariable : public InterfaceVariable
{
OutputVariable();
~OutputVariable();
OutputVariable(const OutputVariable &other);
OutputVariable &operator=(const OutputVariable &other);
bool operator==(const OutputVariable &other) const;
bool operator!=(const OutputVariable &other) const { return !operator==(other); }
}; };
struct COMPILER_EXPORT InterfaceBlockField : public ShaderVariable struct COMPILER_EXPORT InterfaceBlockField : public ShaderVariable
......
samples/shader_translator/shader_translator.cpp
...@@ -420,7 +420,7 @@ static void PrintActiveVariables(ShHandle compiler) ...@@ -420,7 +420,7 @@ static void PrintActiveVariables(ShHandle compiler)
const std::vector<sh::Uniform> *uniforms = ShGetUniforms(compiler); const std::vector<sh::Uniform> *uniforms = ShGetUniforms(compiler);
const std::vector<sh::Varying> *varyings = ShGetVaryings(compiler); const std::vector<sh::Varying> *varyings = ShGetVaryings(compiler);
const std::vector<sh::Attribute> *attributes = ShGetAttributes(compiler); const std::vector<sh::Attribute> *attributes = ShGetAttributes(compiler);
const std::vector<sh::Attribute> *outputs = ShGetOutputVariables(compiler); const std::vector<sh::OutputVariable> *outputs = ShGetOutputVariables(compiler);
for (size_t varCategory = 0; varCategory < 4; ++varCategory) for (size_t varCategory = 0; varCategory < 4; ++varCategory)
{ {
size_t numVars = 0; size_t numVars = 0;
......
src/compiler/translator/Compiler.h
...@@ -89,7 +89,7 @@ class TCompiler : public TShHandleBase ...@@ -89,7 +89,7 @@ class TCompiler : public TShHandleBase
void clearResults(); void clearResults();
const std::vector<sh::Attribute> &getAttributes() const { return attributes; } const std::vector<sh::Attribute> &getAttributes() const { return attributes; }
const std::vector<sh::Attribute> &getOutputVariables() const { return outputVariables; } const std::vector<sh::OutputVariable> &getOutputVariables() const { return outputVariables; }
const std::vector<sh::Uniform> &getUniforms() const { return uniforms; } const std::vector<sh::Uniform> &getUniforms() const { return uniforms; }
const std::vector<sh::Varying> &getVaryings() const { return varyings; } const std::vector<sh::Varying> &getVaryings() const { return varyings; }
const std::vector<sh::InterfaceBlock> &getInterfaceBlocks() const { return interfaceBlocks; } const std::vector<sh::InterfaceBlock> &getInterfaceBlocks() const { return interfaceBlocks; }
...@@ -158,7 +158,7 @@ class TCompiler : public TShHandleBase ...@@ -158,7 +158,7 @@ class TCompiler : public TShHandleBase
const BuiltInFunctionEmulator& getBuiltInFunctionEmulator() const; const BuiltInFunctionEmulator& getBuiltInFunctionEmulator() const;
std::vector<sh::Attribute> attributes; std::vector<sh::Attribute> attributes;
std::vector<sh::Attribute> outputVariables; std::vector<sh::OutputVariable> outputVariables;
std::vector<sh::Uniform> uniforms; std::vector<sh::Uniform> uniforms;
std::vector<sh::ShaderVariable> expandedUniforms; std::vector<sh::ShaderVariable> expandedUniforms;
std::vector<sh::Varying> varyings; std::vector<sh::Varying> varyings;
......
src/compiler/translator/ShaderLang.cpp
...@@ -23,15 +23,6 @@ ...@@ -23,15 +23,6 @@
namespace namespace
{ {
enum ShaderVariableType
{
SHADERVAR_UNIFORM,
SHADERVAR_VARYING,
SHADERVAR_ATTRIBUTE,
SHADERVAR_OUTPUTVARIABLE,
SHADERVAR_INTERFACEBLOCK
};
bool isInitialized = false; bool isInitialized = false;
// //
...@@ -40,36 +31,40 @@ bool isInitialized = false; ...@@ -40,36 +31,40 @@ bool isInitialized = false;
// //
template <typename VarT> template <typename VarT>
const std::vector<VarT> *GetVariableList(const TCompiler *compiler, ShaderVariableType variableType); const std::vector<VarT> *GetVariableList(const TCompiler *compiler);
template <> template <>
const std::vector<sh::Uniform> *GetVariableList(const TCompiler *compiler, ShaderVariableType) const std::vector<sh::Uniform> *GetVariableList(const TCompiler *compiler)
{ {
return &compiler->getUniforms(); return &compiler->getUniforms();
} }
template <> template <>
const std::vector<sh::Varying> *GetVariableList(const TCompiler *compiler, ShaderVariableType) const std::vector<sh::Varying> *GetVariableList(const TCompiler *compiler)
{ {
return &compiler->getVaryings(); return &compiler->getVaryings();
} }
template <> template <>
const std::vector<sh::Attribute> *GetVariableList(const TCompiler *compiler, ShaderVariableType variableType) const std::vector<sh::Attribute> *GetVariableList(const TCompiler *compiler)
{
return &compiler->getAttributes();
}
template <>
const std::vector<sh::OutputVariable> *GetVariableList(const TCompiler *compiler)
{ {
return (variableType == SHADERVAR_ATTRIBUTE ? return &compiler->getOutputVariables();
&compiler->getAttributes() :
&compiler->getOutputVariables());
} }
template <> template <>
const std::vector<sh::InterfaceBlock> *GetVariableList(const TCompiler *compiler, ShaderVariableType) const std::vector<sh::InterfaceBlock> *GetVariableList(const TCompiler *compiler)
{ {
return &compiler->getInterfaceBlocks(); return &compiler->getInterfaceBlocks();
} }
template <typename VarT> template <typename VarT>
const std::vector<VarT> *GetShaderVariables(const ShHandle handle, ShaderVariableType variableType) const std::vector<VarT> *GetShaderVariables(const ShHandle handle)
{ {
if (!handle) if (!handle)
{ {
...@@ -83,7 +78,7 @@ const std::vector<VarT> *GetShaderVariables(const ShHandle handle, ShaderVariabl ...@@ -83,7 +78,7 @@ const std::vector<VarT> *GetShaderVariables(const ShHandle handle, ShaderVariabl
return NULL; return NULL;
} }
return GetVariableList<VarT>(compiler, variableType); return GetVariableList<VarT>(compiler);
} }
TCompiler *GetCompilerFromHandle(ShHandle handle) TCompiler *GetCompilerFromHandle(ShHandle handle)
...@@ -104,7 +99,7 @@ TranslatorHLSL *GetTranslatorHLSLFromHandle(ShHandle handle) ...@@ -104,7 +99,7 @@ TranslatorHLSL *GetTranslatorHLSLFromHandle(ShHandle handle)
} }
#endif // ANGLE_ENABLE_HLSL #endif // ANGLE_ENABLE_HLSL
} // namespace anonymous } // anonymous namespace
// //
// Driver must call this first, once, before doing any other compiler operations. // Driver must call this first, once, before doing any other compiler operations.
...@@ -299,27 +294,27 @@ const std::map<std::string, std::string> *ShGetNameHashingMap( ...@@ -299,27 +294,27 @@ const std::map<std::string, std::string> *ShGetNameHashingMap(
const std::vector<sh::Uniform> *ShGetUniforms(const ShHandle handle) const std::vector<sh::Uniform> *ShGetUniforms(const ShHandle handle)
{ {
return GetShaderVariables<sh::Uniform>(handle, SHADERVAR_UNIFORM); return GetShaderVariables<sh::Uniform>(handle);
} }
const std::vector<sh::Varying> *ShGetVaryings(const ShHandle handle) const std::vector<sh::Varying> *ShGetVaryings(const ShHandle handle)
{ {
return GetShaderVariables<sh::Varying>(handle, SHADERVAR_VARYING); return GetShaderVariables<sh::Varying>(handle);
} }
const std::vector<sh::Attribute> *ShGetAttributes(const ShHandle handle) const std::vector<sh::Attribute> *ShGetAttributes(const ShHandle handle)
{ {
return GetShaderVariables<sh::Attribute>(handle, SHADERVAR_ATTRIBUTE); return GetShaderVariables<sh::Attribute>(handle);
} }
const std::vector<sh::Attribute> *ShGetOutputVariables(const ShHandle handle) const std::vector<sh::OutputVariable> *ShGetOutputVariables(const ShHandle handle)
{ {
return GetShaderVariables<sh::Attribute>(handle, SHADERVAR_OUTPUTVARIABLE); return GetShaderVariables<sh::OutputVariable>(handle);
} }
const std::vector<sh::InterfaceBlock> *ShGetInterfaceBlocks(const ShHandle handle) const std::vector<sh::InterfaceBlock> *ShGetInterfaceBlocks(const ShHandle handle)
{ {
return GetShaderVariables<sh::InterfaceBlock>(handle, SHADERVAR_INTERFACEBLOCK); return GetShaderVariables<sh::InterfaceBlock>(handle);
} }
bool ShCheckVariablesWithinPackingLimits( bool ShCheckVariablesWithinPackingLimits(
......
src/compiler/translator/ShaderVars.cpp
...@@ -217,31 +217,75 @@ bool Uniform::isSameUniformAtLinkTime(const Uniform &other) const ...@@ -217,31 +217,75 @@ bool Uniform::isSameUniformAtLinkTime(const Uniform &other) const
return ShaderVariable::isSameVariableAtLinkTime(other, true); return ShaderVariable::isSameVariableAtLinkTime(other, true);
} }
Attribute::Attribute() InterfaceVariable::InterfaceVariable() : location(-1)
: location(-1)
{} {}
Attribute::~Attribute() InterfaceVariable::~InterfaceVariable()
{} {}
Attribute::Attribute(const Attribute &other) InterfaceVariable::InterfaceVariable(const InterfaceVariable &other)
: ShaderVariable(other), : ShaderVariable(other), location(other.location)
location(other.location)
{} {}
Attribute &Attribute::operator=(const Attribute &other) InterfaceVariable &InterfaceVariable::operator=(const InterfaceVariable &other)
{ {
ShaderVariable::operator=(other); ShaderVariable::operator=(other);
location = other.location; location = other.location;
return *this; return *this;
} }
bool Attribute::operator==(const Attribute &other) const bool InterfaceVariable::operator==(const InterfaceVariable &other) const
{ {
return (ShaderVariable::operator==(other) && return (ShaderVariable::operator==(other) &&
location == other.location); location == other.location);
} }
Attribute::Attribute()
{
}
Attribute::~Attribute()
{
}
Attribute::Attribute(const Attribute &other) : InterfaceVariable(other)
{
}
Attribute &Attribute::operator=(const Attribute &other)
{
InterfaceVariable::operator=(other);
return *this;
}
bool Attribute::operator==(const Attribute &other) const
{
return InterfaceVariable::operator==(other);
}
OutputVariable::OutputVariable()
{
}
OutputVariable::~OutputVariable()
{
}
OutputVariable::OutputVariable(const OutputVariable &other) : InterfaceVariable(other)
{
}
OutputVariable &OutputVariable::operator=(const OutputVariable &other)
{
InterfaceVariable::operator=(other);
return *this;
}
bool OutputVariable::operator==(const OutputVariable &other) const
{
return InterfaceVariable::operator==(other);
}
InterfaceBlockField::InterfaceBlockField() InterfaceBlockField::InterfaceBlockField()
: isRowMajorLayout(false) : isRowMajorLayout(false)
{} {}
......
src/compiler/translator/VariableInfo.cpp
...@@ -129,7 +129,7 @@ VarT *FindVariable(const TString &name, ...@@ -129,7 +129,7 @@ VarT *FindVariable(const TString &name,
} }
CollectVariables::CollectVariables(std::vector<sh::Attribute> *attribs, CollectVariables::CollectVariables(std::vector<sh::Attribute> *attribs,
std::vector<sh::Attribute> *outputVariables, std::vector<sh::OutputVariable> *outputVariables,
std::vector<sh::Uniform> *uniforms, std::vector<sh::Uniform> *uniforms,
std::vector<sh::Varying> *varyings, std::vector<sh::Varying> *varyings,
std::vector<sh::InterfaceBlock> *interfaceBlocks, std::vector<sh::InterfaceBlock> *interfaceBlocks,
...@@ -375,7 +375,7 @@ void CollectVariables::visitSymbol(TIntermSymbol *symbol) ...@@ -375,7 +375,7 @@ void CollectVariables::visitSymbol(TIntermSymbol *symbol)
case EvqFragColor: case EvqFragColor:
if (!mFragColorAdded) if (!mFragColorAdded)
{ {
Attribute info; OutputVariable info;
const char kName[] = "gl_FragColor"; const char kName[] = "gl_FragColor";
info.name = kName; info.name = kName;
info.mappedName = kName; info.mappedName = kName;
...@@ -390,7 +390,7 @@ void CollectVariables::visitSymbol(TIntermSymbol *symbol) ...@@ -390,7 +390,7 @@ void CollectVariables::visitSymbol(TIntermSymbol *symbol)
case EvqFragData: case EvqFragData:
if (!mFragDataAdded) if (!mFragDataAdded)
{ {
Attribute info; OutputVariable info;
const char kName[] = "gl_FragData"; const char kName[] = "gl_FragData";
info.name = kName; info.name = kName;
info.mappedName = kName; info.mappedName = kName;
...@@ -408,7 +408,7 @@ void CollectVariables::visitSymbol(TIntermSymbol *symbol) ...@@ -408,7 +408,7 @@ void CollectVariables::visitSymbol(TIntermSymbol *symbol)
case EvqFragDepth: case EvqFragDepth:
if (!mFragDepthAdded) if (!mFragDepthAdded)
{ {
Attribute info; OutputVariable info;
const char kName[] = "gl_FragDepthEXT"; const char kName[] = "gl_FragDepthEXT";
info.name = kName; info.name = kName;
info.mappedName = kName; info.mappedName = kName;
...@@ -426,7 +426,7 @@ void CollectVariables::visitSymbol(TIntermSymbol *symbol) ...@@ -426,7 +426,7 @@ void CollectVariables::visitSymbol(TIntermSymbol *symbol)
case EvqSecondaryFragColorEXT: case EvqSecondaryFragColorEXT:
if (!mSecondaryFragColorEXTAdded) if (!mSecondaryFragColorEXTAdded)
{ {
Attribute info; OutputVariable info;
const char kName[] = "gl_SecondaryFragColorEXT"; const char kName[] = "gl_SecondaryFragColorEXT";
info.name = kName; info.name = kName;
info.mappedName = kName; info.mappedName = kName;
...@@ -441,7 +441,7 @@ void CollectVariables::visitSymbol(TIntermSymbol *symbol) ...@@ -441,7 +441,7 @@ void CollectVariables::visitSymbol(TIntermSymbol *symbol)
case EvqSecondaryFragDataEXT: case EvqSecondaryFragDataEXT:
if (!mSecondaryFragDataEXTAdded) if (!mSecondaryFragDataEXTAdded)
{ {
Attribute info; OutputVariable info;
const char kName[] = "gl_SecondaryFragDataEXT"; const char kName[] = "gl_SecondaryFragDataEXT";
info.name = kName; info.name = kName;
info.mappedName = kName; info.mappedName = kName;
...@@ -508,6 +508,26 @@ void CollectVariables::visitVariable(const TIntermSymbol *variable, ...@@ -508,6 +508,26 @@ void CollectVariables::visitVariable(const TIntermSymbol *variable,
template <> template <>
void CollectVariables::visitVariable(const TIntermSymbol *variable, void CollectVariables::visitVariable(const TIntermSymbol *variable,
std::vector<OutputVariable> *infoList) const
{
ASSERT(variable);
const TType &type = variable->getType();
ASSERT(!type.getStruct());
OutputVariable attribute;
attribute.type = GLVariableType(type);
attribute.precision = GLVariablePrecision(type);
attribute.name = variable->getSymbol().c_str();
attribute.arraySize = static_cast<unsigned int>(type.getArraySize());
attribute.mappedName = TIntermTraverser::hash(variable->getSymbol(), mHashFunction).c_str();
attribute.location = variable->getType().getLayoutQualifier().location;
infoList->push_back(attribute);
}
template <>
void CollectVariables::visitVariable(const TIntermSymbol *variable,
std::vector<InterfaceBlock> *infoList) const std::vector<InterfaceBlock> *infoList) const
{ {
InterfaceBlock interfaceBlock; InterfaceBlock interfaceBlock;
......
src/compiler/translator/VariableInfo.h
...@@ -21,7 +21,7 @@ class CollectVariables : public TIntermTraverser ...@@ -21,7 +21,7 @@ class CollectVariables : public TIntermTraverser
{ {
public: public:
CollectVariables(std::vector<Attribute> *attribs, CollectVariables(std::vector<Attribute> *attribs,
std::vector<Attribute> *outputVariables, std::vector<OutputVariable> *outputVariables,
std::vector<Uniform> *uniforms, std::vector<Uniform> *uniforms,
std::vector<Varying> *varyings, std::vector<Varying> *varyings,
std::vector<InterfaceBlock> *interfaceBlocks, std::vector<InterfaceBlock> *interfaceBlocks,
...@@ -40,7 +40,7 @@ class CollectVariables : public TIntermTraverser ...@@ -40,7 +40,7 @@ class CollectVariables : public TIntermTraverser
void visitInfoList(const TIntermSequence &sequence, std::vector<VarT> *infoList) const; void visitInfoList(const TIntermSequence &sequence, std::vector<VarT> *infoList) const;
std::vector<Attribute> *mAttribs; std::vector<Attribute> *mAttribs;
std::vector<Attribute> *mOutputVariables; std::vector<OutputVariable> *mOutputVariables;
std::vector<Uniform> *mUniforms; std::vector<Uniform> *mUniforms;
std::vector<Varying> *mVaryings; std::vector<Varying> *mVaryings;
std::vector<InterfaceBlock> *mInterfaceBlocks; std::vector<InterfaceBlock> *mInterfaceBlocks;
......
src/libANGLE/Program.cpp
...@@ -1701,14 +1701,14 @@ void Program::linkOutputVariables() ...@@ -1701,14 +1701,14 @@ void Program::linkOutputVariables()
if (fragmentShader->getShaderVersion() == 100) if (fragmentShader->getShaderVersion() == 100)
return; return;
const std::vector<sh::Attribute> &shaderOutputVars = fragmentShader->getActiveOutputVariables(); const auto &shaderOutputVars = fragmentShader->getActiveOutputVariables();
// TODO(jmadill): any caps validation here? // TODO(jmadill): any caps validation here?
for (unsigned int outputVariableIndex = 0; outputVariableIndex < shaderOutputVars.size(); for (unsigned int outputVariableIndex = 0; outputVariableIndex < shaderOutputVars.size();
outputVariableIndex++) outputVariableIndex++)
{ {
const sh::Attribute &outputVariable = shaderOutputVars[outputVariableIndex]; const sh::OutputVariable &outputVariable = shaderOutputVars[outputVariableIndex];
// Don't store outputs for gl_FragDepth, gl_FragColor, etc. // Don't store outputs for gl_FragDepth, gl_FragColor, etc.
if (outputVariable.isBuiltIn()) if (outputVariable.isBuiltIn())
......
src/libANGLE/Shader.cpp
...@@ -194,7 +194,7 @@ const std::vector<sh::Attribute> &Shader::getActiveAttributes() const ...@@ -194,7 +194,7 @@ const std::vector<sh::Attribute> &Shader::getActiveAttributes() const
return mShader->getActiveAttributes(); return mShader->getActiveAttributes();
} }
const std::vector<sh::Attribute> &Shader::getActiveOutputVariables() const const std::vector<sh::OutputVariable> &Shader::getActiveOutputVariables() const
{ {
return mShader->getActiveOutputVariables(); return mShader->getActiveOutputVariables();
} }
...@@ -219,7 +219,7 @@ std::vector<sh::Attribute> &Shader::getActiveAttributes() ...@@ -219,7 +219,7 @@ std::vector<sh::Attribute> &Shader::getActiveAttributes()
return mShader->getActiveAttributes(); return mShader->getActiveAttributes();
} }
std::vector<sh::Attribute> &Shader::getActiveOutputVariables() std::vector<sh::OutputVariable> &Shader::getActiveOutputVariables()
{ {
return mShader->getActiveOutputVariables(); return mShader->getActiveOutputVariables();
} }
......
src/libANGLE/Shader.h
...@@ -71,13 +71,13 @@ class Shader : angle::NonCopyable ...@@ -71,13 +71,13 @@ class Shader : angle::NonCopyable
const std::vector<sh::Uniform> &getUniforms() const; const std::vector<sh::Uniform> &getUniforms() const;
const std::vector<sh::InterfaceBlock> &getInterfaceBlocks() const; const std::vector<sh::InterfaceBlock> &getInterfaceBlocks() const;
const std::vector<sh::Attribute> &getActiveAttributes() const; const std::vector<sh::Attribute> &getActiveAttributes() const;
const std::vector<sh::Attribute> &getActiveOutputVariables() const; const std::vector<sh::OutputVariable> &getActiveOutputVariables() const;
std::vector<sh::Varying> &getVaryings(); std::vector<sh::Varying> &getVaryings();
std::vector<sh::Uniform> &getUniforms(); std::vector<sh::Uniform> &getUniforms();
std::vector<sh::InterfaceBlock> &getInterfaceBlocks(); std::vector<sh::InterfaceBlock> &getInterfaceBlocks();
std::vector<sh::Attribute> &getActiveAttributes(); std::vector<sh::Attribute> &getActiveAttributes();
std::vector<sh::Attribute> &getActiveOutputVariables(); std::vector<sh::OutputVariable> &getActiveOutputVariables();
int getSemanticIndex(const std::string &attributeName) const; int getSemanticIndex(const std::string &attributeName) const;
......
src/libANGLE/renderer/ShaderImpl.h
...@@ -35,13 +35,16 @@ class ShaderImpl : angle::NonCopyable ...@@ -35,13 +35,16 @@ class ShaderImpl : angle::NonCopyable
const std::vector<sh::Uniform> &getUniforms() const { return mUniforms; } const std::vector<sh::Uniform> &getUniforms() const { return mUniforms; }
const std::vector<sh::InterfaceBlock> &getInterfaceBlocks() const { return mInterfaceBlocks; } const std::vector<sh::InterfaceBlock> &getInterfaceBlocks() const { return mInterfaceBlocks; }
const std::vector<sh::Attribute> &getActiveAttributes() const { return mActiveAttributes; } const std::vector<sh::Attribute> &getActiveAttributes() const { return mActiveAttributes; }
const std::vector<sh::Attribute> &getActiveOutputVariables() const { return mActiveOutputVariables; } const std::vector<sh::OutputVariable> &getActiveOutputVariables() const
{
return mActiveOutputVariables;
}
std::vector<sh::Varying> &getVaryings() { return mVaryings; } std::vector<sh::Varying> &getVaryings() { return mVaryings; }
std::vector<sh::Uniform> &getUniforms() { return mUniforms; } std::vector<sh::Uniform> &getUniforms() { return mUniforms; }
std::vector<sh::InterfaceBlock> &getInterfaceBlocks() { return mInterfaceBlocks; } std::vector<sh::InterfaceBlock> &getInterfaceBlocks() { return mInterfaceBlocks; }
std::vector<sh::Attribute> &getActiveAttributes() { return mActiveAttributes; } std::vector<sh::Attribute> &getActiveAttributes() { return mActiveAttributes; }
std::vector<sh::Attribute> &getActiveOutputVariables() { return mActiveOutputVariables; } std::vector<sh::OutputVariable> &getActiveOutputVariables() { return mActiveOutputVariables; }
protected: protected:
std::string mInfoLog; std::string mInfoLog;
...@@ -54,7 +57,7 @@ class ShaderImpl : angle::NonCopyable ...@@ -54,7 +57,7 @@ class ShaderImpl : angle::NonCopyable
std::vector<sh::Uniform> mUniforms; std::vector<sh::Uniform> mUniforms;
std::vector<sh::InterfaceBlock> mInterfaceBlocks; std::vector<sh::InterfaceBlock> mInterfaceBlocks;
std::vector<sh::Attribute> mActiveAttributes; std::vector<sh::Attribute> mActiveAttributes;
std::vector<sh::Attribute> mActiveOutputVariables; std::vector<sh::OutputVariable> mActiveOutputVariables;
}; };
} }
......
src/libANGLE/renderer/d3d/DynamicHLSL.cpp
...@@ -953,10 +953,9 @@ bool DynamicHLSL::generateShaderLinkHLSL(const gl::Data &data, ...@@ -953,10 +953,9 @@ bool DynamicHLSL::generateShaderLinkHLSL(const gl::Data &data,
} }
else else
{ {
const auto &programOutputVars = programData.getOutputVariables(); const auto &shaderOutputVars = fragmentShader->getActiveOutputVariables();
const std::vector<sh::Attribute> &shaderOutputVars = fragmentShader->getActiveOutputVariables(); for (auto outputPair : programData.getOutputVariables())
for (auto outputPair : programOutputVars)
{ {
const VariableLocation &outputLocation = outputPair.second; const VariableLocation &outputLocation = outputPair.second;
const sh::ShaderVariable &outputVariable = shaderOutputVars[outputLocation.index]; const sh::ShaderVariable &outputVariable = shaderOutputVars[outputLocation.index];
......
src/tests/compiler_tests/CollectVariables_test.cpp
...@@ -98,15 +98,15 @@ class CollectVariablesTest : public testing::Test ...@@ -98,15 +98,15 @@ class CollectVariablesTest : public testing::Test
void validateOutputVariableForShader(const std::string &shaderString, void validateOutputVariableForShader(const std::string &shaderString,
unsigned int varIndex, unsigned int varIndex,
const char *varName, const char *varName,
const sh::Attribute **outResult) const sh::OutputVariable **outResult)
{ {
const char *shaderStrings[] = {shaderString.c_str()}; const char *shaderStrings[] = {shaderString.c_str()};
ASSERT_TRUE(mTranslator->compile(shaderStrings, 1, SH_VARIABLES)) ASSERT_TRUE(mTranslator->compile(shaderStrings, 1, SH_VARIABLES))
<< mTranslator->getInfoSink().info.str(); << mTranslator->getInfoSink().info.str();
const std::vector<sh::Attribute> &outputVariables = mTranslator->getOutputVariables(); const auto &outputVariables = mTranslator->getOutputVariables();
ASSERT_LT(varIndex, outputVariables.size()); ASSERT_LT(varIndex, outputVariables.size());
const sh::Attribute &outputVariable = outputVariables[varIndex]; const sh::OutputVariable &outputVariable = outputVariables[varIndex];
EXPECT_EQ(-1, outputVariable.location); EXPECT_EQ(-1, outputVariable.location);
EXPECT_TRUE(outputVariable.staticUse); EXPECT_TRUE(outputVariable.staticUse);
EXPECT_EQ(varName, outputVariable.name); EXPECT_EQ(varName, outputVariable.name);
...@@ -142,10 +142,10 @@ TEST_F(CollectFragmentVariablesTest, SimpleOutputVar) ...@@ -142,10 +142,10 @@ TEST_F(CollectFragmentVariablesTest, SimpleOutputVar)
const char *shaderStrings[] = { shaderString.c_str() }; const char *shaderStrings[] = { shaderString.c_str() };
ASSERT_TRUE(mTranslator->compile(shaderStrings, 1, SH_VARIABLES)); ASSERT_TRUE(mTranslator->compile(shaderStrings, 1, SH_VARIABLES));
const std::vector<sh::Attribute> &outputVariables = mTranslator->getOutputVariables(); const auto &outputVariables = mTranslator->getOutputVariables();
ASSERT_EQ(1u, outputVariables.size()); ASSERT_EQ(1u, outputVariables.size());
const sh::Attribute &outputVariable = outputVariables[0]; const sh::OutputVariable &outputVariable = outputVariables[0];
EXPECT_EQ(0u, outputVariable.arraySize); EXPECT_EQ(0u, outputVariable.arraySize);
EXPECT_EQ(-1, outputVariable.location); EXPECT_EQ(-1, outputVariable.location);
...@@ -168,10 +168,10 @@ TEST_F(CollectFragmentVariablesTest, LocationOutputVar) ...@@ -168,10 +168,10 @@ TEST_F(CollectFragmentVariablesTest, LocationOutputVar)
const char *shaderStrings[] = { shaderString.c_str() }; const char *shaderStrings[] = { shaderString.c_str() };
ASSERT_TRUE(mTranslator->compile(shaderStrings, 1, SH_VARIABLES)); ASSERT_TRUE(mTranslator->compile(shaderStrings, 1, SH_VARIABLES));
const std::vector<sh::Attribute> &outputVariables = mTranslator->getOutputVariables(); const auto &outputVariables = mTranslator->getOutputVariables();
ASSERT_EQ(1u, outputVariables.size()); ASSERT_EQ(1u, outputVariables.size());
const sh::Attribute &outputVariable = outputVariables[0]; const sh::OutputVariable &outputVariable = outputVariables[0];
EXPECT_EQ(0u, outputVariable.arraySize); EXPECT_EQ(0u, outputVariable.arraySize);
EXPECT_EQ(5, outputVariable.location); EXPECT_EQ(5, outputVariable.location);
...@@ -478,7 +478,7 @@ TEST_F(CollectFragmentVariablesTest, OutputVarESSL1FragColor) ...@@ -478,7 +478,7 @@ TEST_F(CollectFragmentVariablesTest, OutputVarESSL1FragColor)
" gl_FragColor = vec4(1.0);\n" " gl_FragColor = vec4(1.0);\n"
"}\n"; "}\n";
const sh::Attribute *outputVariable = nullptr; const sh::OutputVariable *outputVariable = nullptr;
validateOutputVariableForShader(fragColorShader, 0u, "gl_FragColor", &outputVariable); validateOutputVariableForShader(fragColorShader, 0u, "gl_FragColor", &outputVariable);
ASSERT_NE(outputVariable, nullptr); ASSERT_NE(outputVariable, nullptr);
EXPECT_EQ(0u, outputVariable->arraySize); EXPECT_EQ(0u, outputVariable->arraySize);
...@@ -504,7 +504,7 @@ TEST_F(CollectFragmentVariablesTest, OutputVarESSL1FragData) ...@@ -504,7 +504,7 @@ TEST_F(CollectFragmentVariablesTest, OutputVarESSL1FragData)
resources.MaxDrawBuffers = kMaxDrawBuffers; resources.MaxDrawBuffers = kMaxDrawBuffers;
initTranslator(resources); initTranslator(resources);
const sh::Attribute *outputVariable = nullptr; const sh::OutputVariable *outputVariable = nullptr;
validateOutputVariableForShader(fragDataShader, 0u, "gl_FragData", &outputVariable); validateOutputVariableForShader(fragDataShader, 0u, "gl_FragData", &outputVariable);
ASSERT_NE(outputVariable, nullptr); ASSERT_NE(outputVariable, nullptr);
EXPECT_EQ(kMaxDrawBuffers, outputVariable->arraySize); EXPECT_EQ(kMaxDrawBuffers, outputVariable->arraySize);
...@@ -527,7 +527,7 @@ TEST_F(CollectFragmentVariablesTest, OutputVarESSL1FragDepthMediump) ...@@ -527,7 +527,7 @@ TEST_F(CollectFragmentVariablesTest, OutputVarESSL1FragDepthMediump)
resources.EXT_frag_depth = 1; resources.EXT_frag_depth = 1;
initTranslator(resources); initTranslator(resources);
const sh::Attribute *outputVariable = nullptr; const sh::OutputVariable *outputVariable = nullptr;
validateOutputVariableForShader(fragDepthShader, 0u, "gl_FragDepthEXT", &outputVariable); validateOutputVariableForShader(fragDepthShader, 0u, "gl_FragDepthEXT", &outputVariable);
ASSERT_NE(outputVariable, nullptr); ASSERT_NE(outputVariable, nullptr);
EXPECT_EQ(0u, outputVariable->arraySize); EXPECT_EQ(0u, outputVariable->arraySize);
...@@ -550,7 +550,7 @@ TEST_F(CollectFragmentVariablesTest, OutputVarESSL1FragDepthHighp) ...@@ -550,7 +550,7 @@ TEST_F(CollectFragmentVariablesTest, OutputVarESSL1FragDepthHighp)
resources.FragmentPrecisionHigh = 1; resources.FragmentPrecisionHigh = 1;
initTranslator(resources); initTranslator(resources);
const sh::Attribute *outputVariable = nullptr; const sh::OutputVariable *outputVariable = nullptr;
validateOutputVariableForShader(fragDepthHighShader, 0u, "gl_FragDepthEXT", &outputVariable); validateOutputVariableForShader(fragDepthHighShader, 0u, "gl_FragDepthEXT", &outputVariable);
ASSERT_NE(outputVariable, nullptr); ASSERT_NE(outputVariable, nullptr);
EXPECT_EQ(0u, outputVariable->arraySize); EXPECT_EQ(0u, outputVariable->arraySize);
...@@ -577,7 +577,7 @@ TEST_F(CollectFragmentVariablesTest, OutputVarESSL1EXTBlendFuncExtendedSecondary ...@@ -577,7 +577,7 @@ TEST_F(CollectFragmentVariablesTest, OutputVarESSL1EXTBlendFuncExtendedSecondary
resources.MaxDualSourceDrawBuffers = resources.MaxDrawBuffers; resources.MaxDualSourceDrawBuffers = resources.MaxDrawBuffers;
initTranslator(resources); initTranslator(resources);
const sh::Attribute *outputVariable = nullptr; const sh::OutputVariable *outputVariable = nullptr;
validateOutputVariableForShader(secondaryFragColorShader, 0u, "gl_FragColor", &outputVariable); validateOutputVariableForShader(secondaryFragColorShader, 0u, "gl_FragColor", &outputVariable);
ASSERT_NE(outputVariable, nullptr); ASSERT_NE(outputVariable, nullptr);
EXPECT_EQ(0u, outputVariable->arraySize); EXPECT_EQ(0u, outputVariable->arraySize);
...@@ -615,7 +615,7 @@ TEST_F(CollectFragmentVariablesTest, OutputVarESSL1EXTBlendFuncExtendedSecondary ...@@ -615,7 +615,7 @@ TEST_F(CollectFragmentVariablesTest, OutputVarESSL1EXTBlendFuncExtendedSecondary
resources.MaxDualSourceDrawBuffers = resources.MaxDrawBuffers; resources.MaxDualSourceDrawBuffers = resources.MaxDrawBuffers;
initTranslator(resources); initTranslator(resources);
const sh::Attribute *outputVariable = nullptr; const sh::OutputVariable *outputVariable = nullptr;
validateOutputVariableForShader(secondaryFragDataShader, 0u, "gl_FragData", &outputVariable); validateOutputVariableForShader(secondaryFragDataShader, 0u, "gl_FragData", &outputVariable);
ASSERT_NE(outputVariable, nullptr); ASSERT_NE(outputVariable, nullptr);
EXPECT_EQ(kMaxDrawBuffers, outputVariable->arraySize); EXPECT_EQ(kMaxDrawBuffers, outputVariable->arraySize);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment