commit b5e222512bdfe65cef2043291372fe4a3a5d46c1
author Chris Forbes <chrisforbes@google.com> Tue Apr 04 15:51:36 2017 -0700
committer Chris Forbes <chrisf@ijw.co.nz> Fri Apr 14 07:16:42 2017 +1200
tree 1f7ec9d47fc6a4de1a02d3dac56a25cae1d94b83
parent ecf0ae123eac6003bdd65db46f8f5ff957575e7f

tests: Remove no-spirv support from framework

The early ICDs that accepted GLSL with this header on the front are long
dead.

tests/vkrenderframework.cpp

diff --git a/tests/vkrenderframework.cpp b/tests/vkrenderframework.cpp
index e98b921..91a7b81 100644
--- a/tests/vkrenderframework.cpp
+++ b/tests/vkrenderframework.cpp
@@ -1082,7 +1082,6 @@
     VkResult U_ASSERT_ONLY err = VK_SUCCESS;
     std::vector<unsigned int> spv;
     VkShaderModuleCreateInfo moduleCreateInfo;
-    size_t shader_len;
 
     m_stage = stage;
     m_device = device;
@@ -1091,25 +1090,10 @@
     moduleCreateInfo.sType = VK_STRUCTURE_TYPE_SHADER_MODULE_CREATE_INFO;
     moduleCreateInfo.pNext = NULL;
 
-    if (framework->m_use_glsl) {
-        shader_len = strlen(shader_code);
-        moduleCreateInfo.codeSize = 3 * sizeof(uint32_t) + shader_len + 1;
-        moduleCreateInfo.pCode = (uint32_t *)malloc(moduleCreateInfo.codeSize);
-        moduleCreateInfo.flags = 0;
-
-        /* try version 0 first: VkShaderStage followed by GLSL */
-        ((uint32_t *)moduleCreateInfo.pCode)[0] = ICD_SPV_MAGIC;
-        ((uint32_t *)moduleCreateInfo.pCode)[1] = 0;
-        ((uint32_t *)moduleCreateInfo.pCode)[2] = stage;
-        memcpy(((uint32_t *)moduleCreateInfo.pCode + 3), shader_code, shader_len + 1);
-
-    } else {
-        // Use Reference GLSL to SPV compiler
-        framework->GLSLtoSPV(stage, shader_code, spv);
-        moduleCreateInfo.pCode = spv.data();
-        moduleCreateInfo.codeSize = spv.size() * sizeof(unsigned int);
-        moduleCreateInfo.flags = 0;
-    }
+    framework->GLSLtoSPV(stage, shader_code, spv);
+    moduleCreateInfo.pCode = spv.data();
+    moduleCreateInfo.codeSize = spv.size() * sizeof(unsigned int);
+    moduleCreateInfo.flags = 0;
 
     err = init_try(*m_device, moduleCreateInfo);
     assert(VK_SUCCESS == err);

tests/vktestframework.cpp

diff --git a/tests/vktestframework.cpp b/tests/vktestframework.cpp
index 992de35..693aba0 100644
--- a/tests/vktestframework.cpp
+++ b/tests/vktestframework.cpp
@@ -140,7 +140,6 @@
 VkTestFramework::~VkTestFramework() {}
 
 // Define all the static elements
-bool VkTestFramework::m_use_glsl = false;
 bool VkTestFramework::m_canonicalize_spv = false;
 bool VkTestFramework::m_strip_spv = false;
 bool VkTestFramework::m_do_everything_spv = false;
@@ -158,9 +157,7 @@
     int i, n;
 
     for (i = 1, n = 1; i < *argc; i++) {
-        if (optionMatch("--no-SPV", argv[i]))
-            m_use_glsl = true;
-        else if (optionMatch("--strip-SPV", argv[i]))
+        if (optionMatch("--strip-SPV", argv[i]))
             m_strip_spv = true;
         else if (optionMatch("--canonicalize-SPV", argv[i]))
             m_canonicalize_spv = true;

tests/vktestframework.h

diff --git a/tests/vktestframework.h b/tests/vktestframework.h
index 3c6b287..f2ed24b 100644
--- a/tests/vktestframework.h
+++ b/tests/vktestframework.h
@@ -69,7 +69,6 @@
     static void Finish();
 
     bool GLSLtoSPV(const VkShaderStageFlagBits shader_type, const char *pshader, std::vector<unsigned int> &spv);
-    static bool m_use_glsl;
     static bool m_canonicalize_spv;
     static bool m_strip_spv;
     static bool m_do_everything_spv;

tests/vktestframeworkandroid.cpp

diff --git a/tests/vktestframeworkandroid.cpp b/tests/vktestframeworkandroid.cpp
index 079ea36..56a8b5c 100644
--- a/tests/vktestframeworkandroid.cpp
+++ b/tests/vktestframeworkandroid.cpp
@@ -24,8 +24,6 @@
 VkTestFramework::VkTestFramework() {}
 VkTestFramework::~VkTestFramework() {}
 
-bool VkTestFramework::m_use_glsl = false;
-
 VkFormat VkTestFramework::GetFormat(VkInstance instance, vk_testing::Device *device) {
     VkFormatProperties format_props;
     vkGetPhysicalDeviceFormatProperties(device->phy().handle(), VK_FORMAT_B8G8R8A8_UNORM, &format_props);

tests/vktestframeworkandroid.h

diff --git a/tests/vktestframeworkandroid.h b/tests/vktestframeworkandroid.h
index 2576bc2..f5668c6 100644
--- a/tests/vktestframeworkandroid.h
+++ b/tests/vktestframeworkandroid.h
@@ -44,8 +44,6 @@
 
     VkFormat GetFormat(VkInstance instance, vk_testing::Device *device);
     bool GLSLtoSPV(const VkShaderStageFlagBits shader_type, const char *pshader, std::vector<unsigned int> &spv);
-
-    static bool m_use_glsl;
 };
 
 class TestEnvironment : public ::testing::Environment {