Vulkan: Assert that attributes in shader info map are active

Attributes that are not active shouldn't have made it to the ShaderInterfaceVariableInfoMap of gl::ShaderType::Vertex. This change turns a few ifs to ASSERT in SpirvVertexAttributeAliasingTransformer. Bug: angleproject:4249 Change-Id: I3da4ea773eae20fe2f126b82f7790e9f2cab0bc1 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2491929Reviewed-by: Charlie Lao <cclao@google.com> Reviewed-by: Tim Van Patten <timvp@google.com> Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>

Vulkan: Assert that attributes in shader info map are active
62d010f9 · Shahbaz Youssefi · Commit Bot · e99b8bc0 · 62d010f9
Commit 62d010f9 authored Oct 22, 2020 by Shahbaz Youssefi Committed by Commit Bot Oct 24, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 5 deletions

glslang_wrapper_utils.cpp src/libANGLE/renderer/glslang_wrapper_utils.cpp +6 -5

No files found.
--- a/src/libANGLE/renderer/glslang_wrapper_utils.cpp
+++ b/src/libANGLE/renderer/glslang_wrapper_utils.cpp
@@ -2227,13 +2227,13 @@ void SpirvVertexAttributeAliasingTransformer::preprocessAliasingAttributes()
    {
        const ShaderInterfaceVariableInfo *info = mVariableInfoById[id];
-        // Ignore non attribute or inactive ids.
+        // Ignore non attribute ids.
-        if (info == nullptr || info->attributeComponentCount == 0 ||
+        if (info == nullptr || info->attributeComponentCount == 0)
-            !info->activeStages[gl::ShaderType::Vertex])
        {
            continue;
        }
+        ASSERT(info->activeStages[gl::ShaderType::Vertex]);
        ASSERT(info->location != ShaderInterfaceVariableInfo::kInvalid);
        const bool isMatrixAttribute = info->attributeLocationCount > 1;
@@ -3250,12 +3250,13 @@ bool HasAliasingAttributes(const ShaderInterfaceVariableInfoMap &variableInfoMap
    {
        const ShaderInterfaceVariableInfo &info = infoIter.second;
-        // Ignore non attribute or inactive ids.
+        // Ignore non attribute ids.
-        if (info.attributeComponentCount == 0 || !info.activeStages[gl::ShaderType::Vertex])
+        if (info.attributeComponentCount == 0)
        {
            continue;
        }
+        ASSERT(info.activeStages[gl::ShaderType::Vertex]);
        ASSERT(info.location != ShaderInterfaceVariableInfo::kInvalid);
        ASSERT(info.attributeLocationCount > 0);