From 6495f77b04af5bef7a12767316a2c4a7ed94d2ce Mon Sep 17 00:00:00 2001 From: Arcady Goldmints-Orlov Date: Wed, 11 Sep 2024 09:46:38 -0700 Subject: [PATCH] Remove redundant calls to spv::Parameterize() from tests This means the tests won't need to have this entrypoint exposed when building as a shared library with hidden symbols. --- gtests/GlslMapIO.FromFile.cpp | 1 - gtests/Link.FromFile.Vk.cpp | 1 - gtests/TestFixture.h | 4 ---- gtests/VkRelaxed.FromFile.cpp | 1 - 4 files changed, 7 deletions(-) diff --git a/gtests/GlslMapIO.FromFile.cpp b/gtests/GlslMapIO.FromFile.cpp index 927dde048d..1ad9e0296f 100644 --- a/gtests/GlslMapIO.FromFile.cpp +++ b/gtests/GlslMapIO.FromFile.cpp @@ -312,7 +312,6 @@ TEST_P(GlslMapIOTest, FromFile) spirv_binary, &logger, &options()); std::ostringstream disassembly_stream; - spv::Parameterize(); spv::Disassemble(disassembly_stream, spirv_binary); result.spirvWarningsErrors += logger.getAllMessages(); result.spirv += disassembly_stream.str(); diff --git a/gtests/Link.FromFile.Vk.cpp b/gtests/Link.FromFile.Vk.cpp index fed5d260cf..9ec67576ed 100644 --- a/gtests/Link.FromFile.Vk.cpp +++ b/gtests/Link.FromFile.Vk.cpp @@ -86,7 +86,6 @@ TEST_P(LinkTestVulkan, FromFile) spirv_binary, &logger, &options()); std::ostringstream disassembly_stream; - spv::Parameterize(); spv::Disassemble(disassembly_stream, spirv_binary); result.spirvWarningsErrors = logger.getAllMessages(); result.spirv = disassembly_stream.str(); diff --git a/gtests/TestFixture.h b/gtests/TestFixture.h index 9777c27576..ab548f5627 100644 --- a/gtests/TestFixture.h +++ b/gtests/TestFixture.h @@ -324,7 +324,6 @@ class GlslangTest : public GT { } std::ostringstream disassembly_stream; - spv::Parameterize(); spv::Disassemble(disassembly_stream, spirv_binary); bool validation_result = !options().validate || logger.getAllMessages().empty(); return {{ @@ -384,7 +383,6 @@ class GlslangTest : public GT { spirv_binary, &logger, &options()); std::ostringstream disassembly_stream; - spv::Parameterize(); spv::Disassemble(disassembly_stream, spirv_binary); bool validation_result = !options().validate || logger.getAllMessages().empty(); return {{{shaderName, shader.getInfoLog(), shader.getInfoDebugLog()},}, @@ -429,7 +427,6 @@ class GlslangTest : public GT { spv::spirvbin_t(0 /*verbosity*/).remap(spirv_binary, whiteListStrings, remapOptions); std::ostringstream disassembly_stream; - spv::Parameterize(); spv::Disassemble(disassembly_stream, spirv_binary); bool validation_result = !options().validate || logger.getAllMessages().empty(); return {{{shaderName, shader.getInfoLog(), shader.getInfoDebugLog()},}, @@ -453,7 +450,6 @@ class GlslangTest : public GT { spv::spirvbin_t(0 /*verbosity*/).remap(spirv_binary, whiteListStrings, remapOptions); std::ostringstream disassembly_stream; - spv::Parameterize(); spv::Disassemble(disassembly_stream, spirv_binary); return {{{shaderName, "", ""},}, diff --git a/gtests/VkRelaxed.FromFile.cpp b/gtests/VkRelaxed.FromFile.cpp index 483d7c7fdb..6e31974aae 100644 --- a/gtests/VkRelaxed.FromFile.cpp +++ b/gtests/VkRelaxed.FromFile.cpp @@ -264,7 +264,6 @@ TEST_P(VulkanRelaxedTest, FromFile) spirv_binary, &logger, &options()); std::ostringstream disassembly_stream; - spv::Parameterize(); spv::Disassemble(disassembly_stream, spirv_binary); result.spirvWarningsErrors += logger.getAllMessages(); result.spirv += disassembly_stream.str();