Skip to content

A
angle
Commit 36e120ef by jchen10 Committed by Commit Bot
Options

Refactor the staticUse checks for attribute and output

Remove these needless checks as GetActiveShaderVariables in Shader.cpp has filtered them already. BUG=angleproject:1920 Change-Id: Ife85614a8f636768dd585a827bca81e2f15009c8 Reviewed-on: https://chromium-review.googlesource.com/454129 Commit-Queue: Geoff Lang <geofflang@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent ded1b5a6
Showing with 5 additions and 38 deletions
src/libANGLE/Program.cpp
...@@ -1140,7 +1140,7 @@ GLuint Program::getAttributeLocation(const std::string &name) const ...@@ -1140,7 +1140,7 @@ GLuint Program::getAttributeLocation(const std::string &name) const
{ {
for (const sh::Attribute &attribute : mState.mAttributes) for (const sh::Attribute &attribute : mState.mAttributes)
{ {
if (attribute.name == name && attribute.staticUse) if (attribute.name == name)
{ {
return attribute.location; return attribute.location;
} }
...@@ -1174,23 +1174,8 @@ void Program::getActiveAttribute(GLuint index, GLsizei bufsize, GLsizei *length, ...@@ -1174,23 +1174,8 @@ void Program::getActiveAttribute(GLuint index, GLsizei bufsize, GLsizei *length,
return; return;
} }
size_t attributeIndex = 0; ASSERT(index < mState.mAttributes.size());
const sh::Attribute &attrib = mState.mAttributes[index];
for (const sh::Attribute &attribute : mState.mAttributes)
{
// Skip over inactive attributes
if (attribute.staticUse)
{
if (static_cast<size_t>(index) == attributeIndex)
{
break;
}
attributeIndex++;
}
}
ASSERT(index == attributeIndex && attributeIndex < mState.mAttributes.size());
const sh::Attribute &attrib = mState.mAttributes[attributeIndex];
if (bufsize > 0) if (bufsize > 0)
{ {
...@@ -1217,14 +1202,7 @@ GLint Program::getActiveAttributeCount() const ...@@ -1217,14 +1202,7 @@ GLint Program::getActiveAttributeCount() const
return 0; return 0;
} }
GLint count = 0; return static_cast<GLint>(mState.mAttributes.size());
for (const sh::Attribute &attrib : mState.mAttributes)
{
count += (attrib.staticUse ? 1 : 0);
}
return count;
} }
GLint Program::getActiveAttributeMaxLength() const GLint Program::getActiveAttributeMaxLength() const
...@@ -1238,10 +1216,7 @@ GLint Program::getActiveAttributeMaxLength() const ...@@ -1238,10 +1216,7 @@ GLint Program::getActiveAttributeMaxLength() const
for (const sh::Attribute &attrib : mState.mAttributes) for (const sh::Attribute &attrib : mState.mAttributes)
{ {
if (attrib.staticUse) maxLength = std::max(attrib.name.length() + 1, maxLength);
{
maxLength = std::max(attrib.name.length() + 1, maxLength);
}
} }
return static_cast<GLint>(maxLength); return static_cast<GLint>(maxLength);
...@@ -1983,9 +1958,6 @@ bool Program::linkAttributes(const ContextState &data, InfoLog &infoLog) ...@@ -1983,9 +1958,6 @@ bool Program::linkAttributes(const ContextState &data, InfoLog &infoLog)
// Link attributes that have a binding location // Link attributes that have a binding location
for (sh::Attribute &attribute : mState.mAttributes) for (sh::Attribute &attribute : mState.mAttributes)
{ {
// TODO(jmadill): do staticUse filtering step here, or not at all
ASSERT(attribute.staticUse);
int bindingLocation = mAttributeBindings.getBinding(attribute.name); int bindingLocation = mAttributeBindings.getBinding(attribute.name);
if (attribute.location == -1 && bindingLocation != -1) if (attribute.location == -1 && bindingLocation != -1)
{ {
...@@ -2035,8 +2007,6 @@ bool Program::linkAttributes(const ContextState &data, InfoLog &infoLog) ...@@ -2035,8 +2007,6 @@ bool Program::linkAttributes(const ContextState &data, InfoLog &infoLog)
// Link attributes that don't have a binding location // Link attributes that don't have a binding location
for (sh::Attribute &attribute : mState.mAttributes) for (sh::Attribute &attribute : mState.mAttributes)
{ {
ASSERT(attribute.staticUse);
// Not set by glBindAttribLocation or by location layout qualifier // Not set by glBindAttribLocation or by location layout qualifier
if (attribute.location == -1) if (attribute.location == -1)
{ {
...@@ -2055,7 +2025,6 @@ bool Program::linkAttributes(const ContextState &data, InfoLog &infoLog) ...@@ -2055,7 +2025,6 @@ bool Program::linkAttributes(const ContextState &data, InfoLog &infoLog)
for (const sh::Attribute &attribute : mState.mAttributes) for (const sh::Attribute &attribute : mState.mAttributes)
{ {
ASSERT(attribute.staticUse);
ASSERT(attribute.location != -1); ASSERT(attribute.location != -1);
int regs = VariableRegisterCount(attribute.type); int regs = VariableRegisterCount(attribute.type);
...@@ -2552,8 +2521,6 @@ void Program::linkOutputVariables() ...@@ -2552,8 +2521,6 @@ void Program::linkOutputVariables()
// Since multiple output locations must be specified, use 0 for non-specified locations. // Since multiple output locations must be specified, use 0 for non-specified locations.
int baseLocation = (outputVariable.location == -1 ? 0 : outputVariable.location); int baseLocation = (outputVariable.location == -1 ? 0 : outputVariable.location);
ASSERT(outputVariable.staticUse);
for (unsigned int elementIndex = 0; elementIndex < outputVariable.elementCount(); for (unsigned int elementIndex = 0; elementIndex < outputVariable.elementCount();
elementIndex++) elementIndex++)
{ {
......
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