commit 74a2d2c92297a44119bbd40b475933007b4be80b
author Cody Northrop <cody@lunarg.com> Tue Jun 16 17:32:04 2015 -0600
committer Cody Northrop <cody@lunarg.com> Wed Jun 17 14:30:24 2015 -0600
tree 315a34c2e70c7bb11cf88aa7caf794d3b4cfc734
parent d6ebdb3583160c77941fc683fb012067a996bb8e

tests: Remove references to gl_FragColor

tests/layer_validation_tests.cpp

diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index a6b0d3a..f65b307 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -51,10 +51,14 @@
         "}\n";
 
 static const char bindStateFragShaderText[] =
-   "#version 130\n"
-   "void main() {\n"
-   "   gl_FragColor = vec4(0,1,0,1);\n"
-   "}\n";
+        "#version 140\n"
+        "#extension GL_ARB_separate_shader_objects: require\n"
+        "#extension GL_ARB_shading_language_420pack: require\n"
+        "\n"
+        "layout(location = 0) out vec4 uFragColor;\n"
+        "void main(){\n"
+        "   uFragColor = vec4(0,1,0,1);\n"
+        "}\n";
 
 void VKAPI myDbgFunc(
     VK_DBG_MSG_TYPE     msgType,
@@ -2197,58 +2201,6 @@
         FAIL() << "Incorrect error: " << msgString;
     }
 }
-TEST_F(VkLayerTest, CreatePipelineFragmentBroadcastWithInteger)
-{
-    VK_DBG_MSG_TYPE msgType;
-    std::string msgString;
-    ASSERT_NO_FATAL_FAILURE(InitState());
-    ScopedUseGlsl useGlsl(false);
-
-    char const *vsSource =
-        "#version 140\n"
-        "#extension GL_ARB_separate_shader_objects: require\n"
-        "#extension GL_ARB_shading_language_420pack: require\n"
-        "\n"
-        "void main(){\n"
-        "   gl_Position = vec4(1);\n"
-        "}\n";
-    char const *fsSource =
-        "#version 140\n"
-        "#extension GL_ARB_separate_shader_objects: require\n"
-        "#extension GL_ARB_shading_language_420pack: require\n"
-        "\n"
-        "void main(){\n"
-        "   gl_FragColor = vec4(1);\n"  /* broadcast */
-        "}\n";
-
-    VkShaderObj vs(m_device, vsSource, VK_SHADER_STAGE_VERTEX, this);
-    VkShaderObj fs(m_device, fsSource, VK_SHADER_STAGE_FRAGMENT, this);
-
-    VkPipelineObj pipe(m_device);
-    pipe.AddShader(&vs);
-    pipe.AddShader(&fs);
-
-    VkPipelineCbAttachmentState attach;
-    memset(&attach, 0, sizeof(attach));
-    attach.format = VK_FORMAT_R8_UINT;  /* not unorm/snorm/float */
-
-    pipe.AddColorAttachment(1, &attach);
-
-    VkCommandBufferObj dummyCmd(m_device);
-    VkDescriptorSetObj descriptorSet(m_device);
-    descriptorSet.AppendDummy();
-    descriptorSet.CreateVKDescriptorSet(&dummyCmd);
-
-    m_errorMonitor->ClearState();
-    pipe.CreateVKPipeline(descriptorSet);
-
-    msgType = m_errorMonitor->GetState(&msgString);
-
-    ASSERT_EQ(VK_DBG_MSG_ERROR, msgType);
-    if (!strstr(msgString.c_str(),"CB format should not be SINT or UINT when using broadcast")) {
-        FAIL() << "Incorrect error: " << msgString;
-    }
-}
 
 /* TODO: would be nice to test the mixed broadcast & custom case, but the GLSL->SPV compiler
  * rejects it. */