diff options
| -rw-r--r-- | tests/vkrenderframework.cpp | 24 | ||||
| -rw-r--r-- | tests/vktestframework.cpp | 5 | ||||
| -rw-r--r-- | tests/vktestframework.h | 1 | ||||
| -rw-r--r-- | tests/vktestframeworkandroid.cpp | 2 | ||||
| -rw-r--r-- | tests/vktestframeworkandroid.h | 2 |
5 files changed, 5 insertions, 29 deletions
diff --git a/tests/vkrenderframework.cpp b/tests/vkrenderframework.cpp index e98b921f8..91a7b8142 100644 --- a/tests/vkrenderframework.cpp +++ b/tests/vkrenderframework.cpp @@ -1082,7 +1082,6 @@ VkShaderObj::VkShaderObj(VkDeviceObj *device, const char *shader_code, VkShaderS 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 @@ VkShaderObj::VkShaderObj(VkDeviceObj *device, const char *shader_code, VkShaderS 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); diff --git a/tests/vktestframework.cpp b/tests/vktestframework.cpp index 992de357c..693aba088 100644 --- a/tests/vktestframework.cpp +++ b/tests/vktestframework.cpp @@ -140,7 +140,6 @@ VkTestFramework::VkTestFramework() : m_compile_options(0), m_num_shader_strings( 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 @@ void VkTestFramework::InitArgs(int *argc, char *argv[]) { 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; diff --git a/tests/vktestframework.h b/tests/vktestframework.h index 3c6b28734..f2ed24b0c 100644 --- a/tests/vktestframework.h +++ b/tests/vktestframework.h @@ -69,7 +69,6 @@ class VkTestFramework : public ::testing::Test { 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; diff --git a/tests/vktestframeworkandroid.cpp b/tests/vktestframeworkandroid.cpp index 079ea3683..56a8b5cb5 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); diff --git a/tests/vktestframeworkandroid.h b/tests/vktestframeworkandroid.h index 2576bc275..f5668c6ee 100644 --- a/tests/vktestframeworkandroid.h +++ b/tests/vktestframeworkandroid.h @@ -44,8 +44,6 @@ class VkTestFramework : public ::testing::Test { 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 { |