Roll shaderc

examples/Animometer.cpp

@@ -102,12 +102,11 @@ void init() {
 
     nxt::ShaderModule fsModule = utils::CreateShaderModule(device, nxt::ShaderStage::Fragment, R"(
         #version 450
-        out vec4 fragColor;
+        layout(location = 0) out vec4 fragColor;
         layout(location = 0) in vec4 v_color;
         void main() {
             fragColor = v_color;
-        })"
+        })");
-    );
 
     renderpass = CreateDefaultRenderPass(device);
     depthStencilView = CreateDefaultDepthStencilView(device);

examples/CHelloTriangle.cpp

@@ -52,7 +52,7 @@ void init() {
 
     const char* fs =
         "#version 450\n"
-        "out vec4 fragColor;"
+        "layout(location = 0) out vec4 fragColor;"
         "void main() {\n"
         "   fragColor = vec4(1.0, 0.0, 0.0, 1.0);\n"
         "}\n";

examples/ComputeBoids.cpp

@@ -109,7 +109,7 @@ void initRender() {
 
     nxt::ShaderModule fsModule = utils::CreateShaderModule(device, nxt::ShaderStage::Fragment, R"(
         #version 450
-        out vec4 fragColor;
+        layout(location = 0) out vec4 fragColor;
         void main() {
             fragColor = vec4(1.0);
         }

examples/HelloCompute.cpp

@@ -93,17 +93,17 @@ void init() {
             })"
         );
 
-        nxt::ShaderModule fsModule = utils::CreateShaderModule(device, nxt::ShaderStage::Fragment, R"(
+        nxt::ShaderModule fsModule =
+            utils::CreateShaderModule(device, nxt::ShaderStage::Fragment, R"(
             #version 450
             layout(set = 0, binding = 0) uniform myBlock {
                 int a;
                 float b;
             } myUbo;
-            out vec4 fragColor;
+            layout(location = 0) out vec4 fragColor;
             void main() {
                 fragColor = vec4(1.0, myUbo.a / 255.0, myUbo.b, 1.0);
-            })"
+            })");
-        );
 
         nxt::BindGroupLayout bgl = device.CreateBindGroupLayoutBuilder()
             .SetBindingsType(nxt::ShaderStageBit::Fragment, nxt::BindingType::UniformBuffer, 0, 1)

examples/HelloDepthStencil.cpp

@@ -142,20 +142,19 @@ void init() {
     nxt::ShaderModule fsModule = utils::CreateShaderModule(device, nxt::ShaderStage::Fragment, R"(
         #version 450
         layout(location = 2) in vec3 f_col;
-        out vec4 fragColor;
+        layout(location = 0) out vec4 fragColor;
         void main() {
             fragColor = vec4(f_col, 1.0);
-        })"
+        })");
-    );
 
-    nxt::ShaderModule fsReflectionModule = utils::CreateShaderModule(device, nxt::ShaderStage::Fragment, R"(
+    nxt::ShaderModule fsReflectionModule =
+        utils::CreateShaderModule(device, nxt::ShaderStage::Fragment, R"(
         #version 450
         layout(location = 2) in vec3 f_col;
-        out vec4 fragColor;
+        layout(location = 0) out vec4 fragColor;
         void main() {
             fragColor = vec4(mix(f_col, vec3(0.5, 0.5, 0.5), 0.5), 1.0);
-        })"
+        })");
-    );
 
     auto inputState = device.CreateInputStateBuilder()
         .SetAttribute(0, 0, nxt::VertexFormat::FloatR32G32B32, 0)

examples/HelloIndices.cpp

@@ -64,11 +64,10 @@ void init() {
 
     nxt::ShaderModule fsModule = utils::CreateShaderModule(device, nxt::ShaderStage::Fragment, R"(
         #version 450
-        out vec4 fragColor;
+        layout(location = 0) out vec4 fragColor;
         void main() {
             fragColor = vec4(1.0, 0.0, 0.0, 1.0);
-        })"
+        })");
-    );
 
     auto inputState = device.CreateInputStateBuilder()
         .SetAttribute(0, 0, nxt::VertexFormat::FloatR32G32B32A32, 0)

examples/HelloInstancing.cpp

@@ -68,11 +68,10 @@ void init() {
 
     nxt::ShaderModule fsModule = utils::CreateShaderModule(device, nxt::ShaderStage::Fragment, R"(
         #version 450
-        out vec4 fragColor;
+        layout(location = 0) out vec4 fragColor;
         void main() {
             fragColor = vec4(1.0, 0.0, 0.0, 1.0);
-        })"
+        })");
-    );
 
     auto inputState = device.CreateInputStateBuilder()
         .SetAttribute(0, 0, nxt::VertexFormat::FloatR32G32B32A32, 0)

examples/HelloTriangle.cpp

@@ -102,11 +102,10 @@ void init() {
         layout(set = 0, binding = 0) uniform sampler mySampler;
         layout(set = 0, binding = 1) uniform texture2D myTexture;
 
-        out vec4 fragColor;
+        layout(location = 0) out vec4 fragColor;
         void main() {
             fragColor = texture(sampler2D(myTexture, mySampler), gl_FragCoord.xy / vec2(640.0, 480.0));
-        })"
+        })");
-    );
 
     auto inputState = device.CreateInputStateBuilder()
         .SetAttribute(0, 0, nxt::VertexFormat::FloatR32G32B32A32, 0)

examples/HelloUBO.cpp

@@ -50,11 +50,10 @@ void init() {
             int a;
             float b;
         } myUbo;
-        out vec4 fragColor;
+        layout(location = 0) out vec4 fragColor;
         void main() {
             fragColor = vec4(1.0, myUbo.a / 255.0, myUbo.b, 1.0);
-        })"
+        })");
-    );
 
     nxt::BindGroupLayout bgl = device.CreateBindGroupLayoutBuilder()
         .SetBindingsType(nxt::ShaderStageBit::Fragment, nxt::BindingType::UniformBuffer, 0, 1)

src/tests/end2end/PrimitiveTopologyTests.cpp

@@ -180,11 +180,10 @@ class PrimitiveTopologyTest : public NXTTest {
 
             fsModule = utils::CreateShaderModule(device, nxt::ShaderStage::Fragment, R"(
                 #version 450
-                out vec4 fragColor;
+                layout(location = 0) out vec4 fragColor;
                 void main() {
                     fragColor = vec4(0.0, 1.0, 0.0, 1.0);
-                })"
+                })");
-            );
 
             inputState = device.CreateInputStateBuilder()
                 .SetAttribute(0, 0, nxt::VertexFormat::FloatR32G32B32A32, 0)

src/tests/end2end/RenderPassLoadOpTests.cpp

@@ -88,7 +88,7 @@ class RenderPassLoadOpTests : public NXTTest {
                 )";
             const char* fsSource = R"(
                 #version 450
-                out vec4 color;
+                layout(location = 0) out vec4 color;
                 void main() {
                     color = vec4(0.f, 0.f, 1.f, 1.f);
                 }

src/tests/unittests/validation/InputStateValidationTests.cpp

@@ -32,7 +32,7 @@ class InputStateTest : public ValidationTest {
             nxt::ShaderModuleBuilder fsModuleBuilder = AssertWillBeSuccess(device.CreateShaderModuleBuilder());
             utils::FillShaderModuleBuilder(fsModuleBuilder, nxt::ShaderStage::Fragment, R"(
                 #version 450
-                out vec4 fragColor;
+                layout(location = 0) out vec4 fragColor;
                 void main() {
                     fragColor = vec4(1.0, 0.0, 0.0, 1.0);
                 }

src/tests/unittests/validation/RenderPipelineValidationTests.cpp

@@ -38,11 +38,10 @@ class RenderPipelineValidationTest : public ValidationTest {
 
             fsModule = utils::CreateShaderModule(device, nxt::ShaderStage::Fragment, R"(
                 #version 450
-                out vec4 fragColor;
+                layout(location = 0) out vec4 fragColor;
                 void main() {
                     fragColor = vec4(0.0, 1.0, 0.0, 1.0);
-                })"
+                })");
-            );
         }
 
         nxt::RenderPipelineBuilder& AddDefaultStates(nxt::RenderPipelineBuilder&& builder) {

src/tests/unittests/validation/VertexBufferValidationTests.cpp

@@ -25,11 +25,10 @@ class VertexBufferValidationTest : public ValidationTest {
 
             fsModule = utils::CreateShaderModule(device, nxt::ShaderStage::Fragment, R"(
                 #version 450
-                out vec4 fragColor;
+                layout(location = 0) out vec4 fragColor;
                 void main() {
                     fragColor = vec4(0.0, 1.0, 0.0, 1.0);
-                })"
+                })");
-            );
         }
 
         void MakeRenderPassAndFrameBuffer(uint32_t subpassCount) {