Clean up link validations on interface blocks
This patch intends to clean up the link validations on interface
blocks for better implementing program linking with geoemtry shader.
1. Move three interface block validation functions to the anonymous
namespace of Program.cpp instead of the member function of class
Program.
2. Use IsActiveInterfaceBlock everywhere we need to know if an
interface block is active or not.
BUG=angleproject:1941
Change-Id: Ic868d015e45f04d57ba382a2b447be00952fa4fc
Reviewed-on: https://chromium-review.googlesource.com/965395
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Jiajia Qin <jiajia.qin@intel.com>
Reviewed-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
diff --git a/src/libANGLE/Program.cpp b/src/libANGLE/Program.cpp
index ac4e892..2bbcfce 100644
--- a/src/libANGLE/Program.cpp
+++ b/src/libANGLE/Program.cpp
@@ -396,6 +396,142 @@
}
}
+LinkMismatchError LinkValidateInterfaceBlockFields(const sh::InterfaceBlockField &blockField1,
+ const sh::InterfaceBlockField &blockField2,
+ bool webglCompatibility,
+ std::string *mismatchedBlockFieldName)
+{
+ if (blockField1.name != blockField2.name)
+ {
+ return LinkMismatchError::FIELD_NAME_MISMATCH;
+ }
+
+ // If webgl, validate precision of UBO fields, otherwise don't. See Khronos bug 10287.
+ LinkMismatchError linkError = Program::LinkValidateVariablesBase(
+ blockField1, blockField2, webglCompatibility, true, mismatchedBlockFieldName);
+ if (linkError != LinkMismatchError::NO_MISMATCH)
+ {
+ AddParentPrefix(blockField1.name, mismatchedBlockFieldName);
+ return linkError;
+ }
+
+ if (blockField1.isRowMajorLayout != blockField2.isRowMajorLayout)
+ {
+ AddParentPrefix(blockField1.name, mismatchedBlockFieldName);
+ return LinkMismatchError::MATRIX_PACKING_MISMATCH;
+ }
+
+ return LinkMismatchError::NO_MISMATCH;
+}
+
+LinkMismatchError AreMatchingInterfaceBlocks(const sh::InterfaceBlock &interfaceBlock1,
+ const sh::InterfaceBlock &interfaceBlock2,
+ bool webglCompatibility,
+ std::string *mismatchedBlockFieldName)
+{
+ // validate blocks for the same member types
+ if (interfaceBlock1.fields.size() != interfaceBlock2.fields.size())
+ {
+ return LinkMismatchError::FIELD_NUMBER_MISMATCH;
+ }
+ if (interfaceBlock1.arraySize != interfaceBlock2.arraySize)
+ {
+ return LinkMismatchError::ARRAY_SIZE_MISMATCH;
+ }
+ if (interfaceBlock1.layout != interfaceBlock2.layout ||
+ interfaceBlock1.binding != interfaceBlock2.binding)
+ {
+ return LinkMismatchError::LAYOUT_QUALIFIER_MISMATCH;
+ }
+ const unsigned int numBlockMembers = static_cast<unsigned int>(interfaceBlock1.fields.size());
+ for (unsigned int blockMemberIndex = 0; blockMemberIndex < numBlockMembers; blockMemberIndex++)
+ {
+ const sh::InterfaceBlockField &member1 = interfaceBlock1.fields[blockMemberIndex];
+ const sh::InterfaceBlockField &member2 = interfaceBlock2.fields[blockMemberIndex];
+
+ LinkMismatchError linkError = LinkValidateInterfaceBlockFields(
+ member1, member2, webglCompatibility, mismatchedBlockFieldName);
+ if (linkError != LinkMismatchError::NO_MISMATCH)
+ {
+ return linkError;
+ }
+ }
+ return LinkMismatchError::NO_MISMATCH;
+}
+
+bool ValidateGraphicsInterfaceBlocks(const std::vector<sh::InterfaceBlock> &vertexInterfaceBlocks,
+ const std::vector<sh::InterfaceBlock> &fragmentInterfaceBlocks,
+ InfoLog &infoLog,
+ bool webglCompatibility,
+ sh::BlockType blockType,
+ GLuint maxCombinedInterfaceBlocks)
+{
+ // Check that interface blocks defined in the vertex and fragment shaders are identical
+ typedef std::map<std::string, const sh::InterfaceBlock *> InterfaceBlockMap;
+ InterfaceBlockMap linkedInterfaceBlocks;
+ GLuint blockCount = 0;
+
+ for (const sh::InterfaceBlock &vertexInterfaceBlock : vertexInterfaceBlocks)
+ {
+ linkedInterfaceBlocks[vertexInterfaceBlock.name] = &vertexInterfaceBlock;
+ if (IsActiveInterfaceBlock(vertexInterfaceBlock))
+ {
+ blockCount += std::max(vertexInterfaceBlock.arraySize, 1u);
+ }
+ }
+
+ for (const sh::InterfaceBlock &fragmentInterfaceBlock : fragmentInterfaceBlocks)
+ {
+ auto entry = linkedInterfaceBlocks.find(fragmentInterfaceBlock.name);
+ if (entry != linkedInterfaceBlocks.end())
+ {
+ const sh::InterfaceBlock &vertexInterfaceBlock = *(entry->second);
+ std::string mismatchedBlockFieldName;
+ LinkMismatchError linkError =
+ AreMatchingInterfaceBlocks(vertexInterfaceBlock, fragmentInterfaceBlock,
+ webglCompatibility, &mismatchedBlockFieldName);
+ if (linkError != LinkMismatchError::NO_MISMATCH)
+ {
+ LogLinkMismatch(infoLog, fragmentInterfaceBlock.name, "interface block", linkError,
+ mismatchedBlockFieldName, GL_VERTEX_SHADER, GL_FRAGMENT_SHADER);
+ return false;
+ }
+ }
+
+ // [OpenGL ES 3.1] Chapter 7.6.2 Page 105:
+ // If a uniform block is used by multiple shader stages, each such use counts separately
+ // against this combined limit.
+ // [OpenGL ES 3.1] Chapter 7.8 Page 111:
+ // If a shader storage block in a program is referenced by multiple shaders, each such
+ // reference counts separately against this combined limit.
+ if (IsActiveInterfaceBlock(fragmentInterfaceBlock))
+ {
+ blockCount += std::max(fragmentInterfaceBlock.arraySize, 1u);
+ }
+ }
+
+ if (blockCount > maxCombinedInterfaceBlocks)
+ {
+ switch (blockType)
+ {
+ case sh::BlockType::BLOCK_UNIFORM:
+ infoLog << "The sum of the number of active uniform blocks exceeds "
+ "MAX_COMBINED_UNIFORM_BLOCKS ("
+ << maxCombinedInterfaceBlocks << ").";
+ break;
+ case sh::BlockType::BLOCK_BUFFER:
+ infoLog << "The sum of the number of active shader storage blocks exceeds "
+ "MAX_COMBINED_SHADER_STORAGE_BLOCKS ("
+ << maxCombinedInterfaceBlocks << ").";
+ break;
+ default:
+ UNREACHABLE();
+ }
+ return false;
+ }
+ return true;
+}
+
} // anonymous namespace
const char *const g_fakepath = "C:\\fakepath";
@@ -507,6 +643,12 @@
infoLog << stream.str();
}
+bool IsActiveInterfaceBlock(const sh::InterfaceBlock &interfaceBlock)
+{
+ // Only 'packed' blocks are allowed to be considered inactive.
+ return interfaceBlock.staticUse || interfaceBlock.layout != sh::BLOCKLAYOUT_PACKED;
+}
+
// VariableLocation implementation.
VariableLocation::VariableLocation() : arrayIndex(0), index(kUnused), ignored(false)
{
@@ -2473,35 +2615,6 @@
return true;
}
-LinkMismatchError Program::LinkValidateInterfaceBlockFields(
- const sh::InterfaceBlockField &blockField1,
- const sh::InterfaceBlockField &blockField2,
- bool webglCompatibility,
- std::string *mismatchedBlockFieldName)
-{
- if (blockField1.name != blockField2.name)
- {
- return LinkMismatchError::FIELD_NAME_MISMATCH;
- }
-
- // If webgl, validate precision of UBO fields, otherwise don't. See Khronos bug 10287.
- LinkMismatchError linkError = LinkValidateVariablesBase(
- blockField1, blockField2, webglCompatibility, true, mismatchedBlockFieldName);
- if (linkError != LinkMismatchError::NO_MISMATCH)
- {
- AddParentPrefix(blockField1.name, mismatchedBlockFieldName);
- return linkError;
- }
-
- if (blockField1.isRowMajorLayout != blockField2.isRowMajorLayout)
- {
- AddParentPrefix(blockField1.name, mismatchedBlockFieldName);
- return LinkMismatchError::MATRIX_PACKING_MISMATCH;
- }
-
- return LinkMismatchError::NO_MISMATCH;
-}
-
// Assigns locations to all attributes from the bindings and program locations.
bool Program::linkAttributes(const Context *context, InfoLog &infoLog)
{
@@ -2622,81 +2735,6 @@
return true;
}
-bool Program::ValidateGraphicsInterfaceBlocks(
- const std::vector<sh::InterfaceBlock> &vertexInterfaceBlocks,
- const std::vector<sh::InterfaceBlock> &fragmentInterfaceBlocks,
- InfoLog &infoLog,
- bool webglCompatibility,
- sh::BlockType blockType,
- GLuint maxCombinedInterfaceBlocks)
-{
- // Check that interface blocks defined in the vertex and fragment shaders are identical
- typedef std::map<std::string, const sh::InterfaceBlock *> InterfaceBlockMap;
- InterfaceBlockMap linkedInterfaceBlocks;
- GLuint blockCount = 0;
-
- for (const sh::InterfaceBlock &vertexInterfaceBlock : vertexInterfaceBlocks)
- {
- linkedInterfaceBlocks[vertexInterfaceBlock.name] = &vertexInterfaceBlock;
- if (vertexInterfaceBlock.staticUse || vertexInterfaceBlock.layout != sh::BLOCKLAYOUT_PACKED)
- {
- blockCount += std::max(vertexInterfaceBlock.arraySize, 1u);
- }
- }
-
- for (const sh::InterfaceBlock &fragmentInterfaceBlock : fragmentInterfaceBlocks)
- {
- auto entry = linkedInterfaceBlocks.find(fragmentInterfaceBlock.name);
- if (entry != linkedInterfaceBlocks.end())
- {
- const sh::InterfaceBlock &vertexInterfaceBlock = *(entry->second);
- std::string mismatchedBlockFieldName;
- LinkMismatchError linkError =
- AreMatchingInterfaceBlocks(vertexInterfaceBlock, fragmentInterfaceBlock,
- webglCompatibility, &mismatchedBlockFieldName);
- if (linkError != LinkMismatchError::NO_MISMATCH)
- {
- LogLinkMismatch(infoLog, fragmentInterfaceBlock.name, "interface block", linkError,
- mismatchedBlockFieldName, GL_VERTEX_SHADER, GL_FRAGMENT_SHADER);
- return false;
- }
- }
-
- // [OpenGL ES 3.1] Chapter 7.6.2 Page 105:
- // If a uniform block is used by multiple shader stages, each such use counts separately
- // against this combined limit.
- // [OpenGL ES 3.1] Chapter 7.8 Page 111:
- // If a shader storage block in a program is referenced by multiple shaders, each such
- // reference counts separately against this combined limit.
- if (fragmentInterfaceBlock.staticUse ||
- fragmentInterfaceBlock.layout != sh::BLOCKLAYOUT_PACKED)
- {
- blockCount += std::max(fragmentInterfaceBlock.arraySize, 1u);
- }
- }
-
- if (blockCount > maxCombinedInterfaceBlocks)
- {
- switch (blockType)
- {
- case sh::BlockType::BLOCK_UNIFORM:
- infoLog << "The sum of the number of active uniform blocks exceeds "
- "MAX_COMBINED_UNIFORM_BLOCKS ("
- << maxCombinedInterfaceBlocks << ").";
- break;
- case sh::BlockType::BLOCK_BUFFER:
- infoLog << "The sum of the number of active shader storage blocks exceeds "
- "MAX_COMBINED_SHADER_STORAGE_BLOCKS ("
- << maxCombinedInterfaceBlocks << ").";
- break;
- default:
- UNREACHABLE();
- }
- return false;
- }
- return true;
-}
-
bool Program::linkInterfaceBlocks(const Context *context, InfoLog &infoLog)
{
const auto &caps = context->getCaps();
@@ -2788,41 +2826,6 @@
return true;
}
-LinkMismatchError Program::AreMatchingInterfaceBlocks(const sh::InterfaceBlock &interfaceBlock1,
- const sh::InterfaceBlock &interfaceBlock2,
- bool webglCompatibility,
- std::string *mismatchedBlockFieldName)
-{
- // validate blocks for the same member types
- if (interfaceBlock1.fields.size() != interfaceBlock2.fields.size())
- {
- return LinkMismatchError::FIELD_NUMBER_MISMATCH;
- }
- if (interfaceBlock1.arraySize != interfaceBlock2.arraySize)
- {
- return LinkMismatchError::ARRAY_SIZE_MISMATCH;
- }
- if (interfaceBlock1.layout != interfaceBlock2.layout ||
- interfaceBlock1.binding != interfaceBlock2.binding)
- {
- return LinkMismatchError::LAYOUT_QUALIFIER_MISMATCH;
- }
- const unsigned int numBlockMembers = static_cast<unsigned int>(interfaceBlock1.fields.size());
- for (unsigned int blockMemberIndex = 0; blockMemberIndex < numBlockMembers; blockMemberIndex++)
- {
- const sh::InterfaceBlockField &member1 = interfaceBlock1.fields[blockMemberIndex];
- const sh::InterfaceBlockField &member2 = interfaceBlock2.fields[blockMemberIndex];
-
- LinkMismatchError linkError = LinkValidateInterfaceBlockFields(
- member1, member2, webglCompatibility, mismatchedBlockFieldName);
- if (linkError != LinkMismatchError::NO_MISMATCH)
- {
- return linkError;
- }
- }
- return LinkMismatchError::NO_MISMATCH;
-}
-
LinkMismatchError Program::LinkValidateVariablesBase(const sh::ShaderVariable &variable1,
const sh::ShaderVariable &variable2,
bool validatePrecision,
diff --git a/src/libANGLE/Program.h b/src/libANGLE/Program.h
index ab2f4aa..eddb654 100644
--- a/src/libANGLE/Program.h
+++ b/src/libANGLE/Program.h
@@ -166,6 +166,8 @@
GLenum shaderType1,
GLenum shaderType2);
+bool IsActiveInterfaceBlock(const sh::InterfaceBlock &interfaceBlock);
+
// Struct used for correlating uniforms/elements of uniform arrays to handles
struct VariableLocation
{
@@ -627,12 +629,6 @@
GLuint getTransformFeedbackVaryingResourceIndex(const GLchar *name) const;
const TransformFeedbackVarying &getTransformFeedbackVaryingResource(GLuint index) const;
- static LinkMismatchError LinkValidateInterfaceBlockFields(
- const sh::InterfaceBlockField &blockField1,
- const sh::InterfaceBlockField &blockField2,
- bool webglCompatibility,
- std::string *mismatchedBlockFieldName);
-
void addRef();
void release(const Context *context);
unsigned int getRefCount() const;
@@ -710,13 +706,6 @@
bool linkValidateShaders(const Context *context, InfoLog &infoLog);
bool linkAttributes(const Context *context, InfoLog &infoLog);
- static bool ValidateGraphicsInterfaceBlocks(
- const std::vector<sh::InterfaceBlock> &vertexInterfaceBlocks,
- const std::vector<sh::InterfaceBlock> &fragmentInterfaceBlocks,
- InfoLog &infoLog,
- bool webglCompatibility,
- sh::BlockType blockType,
- GLuint maxCombinedInterfaceBlocks);
bool linkInterfaceBlocks(const Context *context, InfoLog &infoLog);
bool linkVaryings(const Context *context, InfoLog &infoLog) const;
@@ -728,11 +717,6 @@
void updateLinkedShaderStages();
- static LinkMismatchError AreMatchingInterfaceBlocks(const sh::InterfaceBlock &interfaceBlock1,
- const sh::InterfaceBlock &interfaceBlock2,
- bool webglCompatibility,
- std::string *mismatchedBlockFieldName);
-
static LinkMismatchError LinkValidateVaryings(const sh::Varying &outputVarying,
const sh::Varying &inputVarying,
int shaderVersion,
diff --git a/src/libANGLE/ProgramLinkedResources.cpp b/src/libANGLE/ProgramLinkedResources.cpp
index a372ff4..77940b0 100644
--- a/src/libANGLE/ProgramLinkedResources.cpp
+++ b/src/libANGLE/ProgramLinkedResources.cpp
@@ -814,8 +814,7 @@
for (const auto &block : *shaderBlocks.second)
{
- // Only 'packed' blocks are allowed to be considered inactive.
- if (!block.staticUse && block.layout == sh::BLOCKLAYOUT_PACKED)
+ if (!IsActiveInterfaceBlock(block))
continue;
if (visitedList.count(block.name) > 0)