aboutsummaryrefslogtreecommitdiff
path: root/gtests
diff options
context:
space:
mode:
Diffstat (limited to 'gtests')
-rw-r--r--gtests/AST.FromFile.cpp2
-rw-r--r--gtests/BuiltInResource.FromFile.cpp14
-rw-r--r--gtests/CMakeLists.txt2
-rw-r--r--gtests/Config.FromFile.cpp4
-rw-r--r--gtests/Link.FromFile.Vk.cpp2
-rw-r--r--gtests/Link.FromFile.cpp3
-rw-r--r--gtests/Spv.FromFile.cpp12
-rw-r--r--gtests/TestFixture.h12
8 files changed, 13 insertions, 38 deletions
diff --git a/gtests/AST.FromFile.cpp b/gtests/AST.FromFile.cpp
index 12e0137d..1d975464 100644
--- a/gtests/AST.FromFile.cpp
+++ b/gtests/AST.FromFile.cpp
@@ -211,7 +211,6 @@ INSTANTIATE_TEST_SUITE_P(
"runtimeArray.vert",
"simpleFunctionCall.frag",
"stringToDouble.vert",
- "struct.error.frag",
"structAssignment.frag",
"structDeref.frag",
"structure.frag",
@@ -292,7 +291,6 @@ INSTANTIATE_TEST_SUITE_P(
"GL_EXT_shader_integer_mix.vert",
"GL_ARB_draw_instanced.vert",
"GL_ARB_fragment_coord_conventions.vert",
- "GL_ARB_bindless_texture.frag",
"BestMatchFunction.vert",
"EndStreamPrimitive.geom",
"floatBitsToInt.vert",
diff --git a/gtests/BuiltInResource.FromFile.cpp b/gtests/BuiltInResource.FromFile.cpp
index eeea5118..da81fe98 100644
--- a/gtests/BuiltInResource.FromFile.cpp
+++ b/gtests/BuiltInResource.FromFile.cpp
@@ -36,7 +36,7 @@
#include <gtest/gtest.h>
-#include "glslang/Public/ResourceLimits.h"
+#include "StandAlone/ResourceLimits.h"
#include "TestFixture.h"
namespace glslangtest {
@@ -49,19 +49,9 @@ TEST_F(DefaultResourceTest, FromFile)
const std::string path = GlobalTestSettings.testRoot + "/baseResults/test.conf";
std::string expectedConfig;
tryLoadFile(path, "expected resource limit", &expectedConfig);
- const std::string realConfig = GetDefaultTBuiltInResourceString();
+ const std::string realConfig = glslang::GetDefaultTBuiltInResourceString();
ASSERT_EQ(expectedConfig, realConfig);
}
-TEST_F(DefaultResourceTest, UnrecognizedLimit)
-{
- const std::string defaultConfig = GetDefaultTBuiltInResourceString();
- testing::internal::CaptureStdout();
- TBuiltInResource resources;
- DecodeResourceLimits(&resources, const_cast<char*>(defaultConfig.c_str()));
- std::string output = testing::internal::GetCapturedStdout();
- ASSERT_EQ(output.find("unrecognized limit"), std::string::npos);
-}
-
} // anonymous namespace
} // namespace glslangtest
diff --git a/gtests/CMakeLists.txt b/gtests/CMakeLists.txt
index 203812d8..8dff7ede 100644
--- a/gtests/CMakeLists.txt
+++ b/gtests/CMakeLists.txt
@@ -76,7 +76,7 @@ if(BUILD_TESTING)
message(WARNING \"Using `glslangtestsTargets.cmake` is deprecated: use `find_package(glslang)` to find glslang CMake targets.\")
if (NOT TARGET glslang::glslangtests)
- include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/glslang-targets.cmake\")
+ include(\"\${CMAKE_CURRENT_LIST_DIR}/../../${CMAKE_INSTALL_LIBDIR}/${PROJECT_NAME}/glslang-targets.cmake\")
endif()
add_library(glslangtests ALIAS glslang::glslangtests)
diff --git a/gtests/Config.FromFile.cpp b/gtests/Config.FromFile.cpp
index 05107e78..dd18c13a 100644
--- a/gtests/Config.FromFile.cpp
+++ b/gtests/Config.FromFile.cpp
@@ -32,7 +32,7 @@
// ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
// POSSIBILITY OF SUCH DAMAGE.
-#include "glslang/Public/ResourceLimits.h"
+#include "StandAlone/ResourceLimits.h"
#include "TestFixture.h"
namespace glslangtest {
@@ -65,7 +65,7 @@ TEST_P(ConfigTest, FromFile)
char* configChars = new char[len + 1];
memcpy(configChars, configContents.data(), len);
configChars[len] = 0;
- DecodeResourceLimits(&resources, configChars);
+ glslang::DecodeResourceLimits(&resources, configChars);
delete[] configChars;
}
diff --git a/gtests/Link.FromFile.Vk.cpp b/gtests/Link.FromFile.Vk.cpp
index 6015c331..4db71c2c 100644
--- a/gtests/Link.FromFile.Vk.cpp
+++ b/gtests/Link.FromFile.Vk.cpp
@@ -75,7 +75,7 @@ TEST_P(LinkTestVulkan, FromFile)
result.linkingOutput = program.getInfoLog();
result.linkingError = program.getInfoDebugLog();
-#if !defined(GLSLANG_WEB)
+#if !defined(GLSLANG_WEB) && !defined(GLSLANG_ANGLE)
if (success)
program.mapIO();
#endif
diff --git a/gtests/Link.FromFile.cpp b/gtests/Link.FromFile.cpp
index 3b769bbb..9e029fc7 100644
--- a/gtests/Link.FromFile.cpp
+++ b/gtests/Link.FromFile.cpp
@@ -90,9 +90,6 @@ INSTANTIATE_TEST_SUITE_P(
Glsl, LinkTest,
::testing::ValuesIn(std::vector<std::vector<std::string>>({
{"mains1.frag", "mains2.frag", "noMain1.geom", "noMain2.geom"},
- {"implicitArraySize.vert", "implicitArraySize.frag"},
- {"implicitArraySizeBuiltin.vert", "implicitArraySizeBuiltin.geom"},
- {"implicitArraySize1.geom", "implicitArraySize2.geom"},
{"noMain.vert", "mains.frag"},
{"link1.frag", "link2.frag", "link3.frag"},
{"recurse1.vert", "recurse1.frag", "recurse2.frag"},
diff --git a/gtests/Spv.FromFile.cpp b/gtests/Spv.FromFile.cpp
index fafd33cf..93e364d9 100644
--- a/gtests/Spv.FromFile.cpp
+++ b/gtests/Spv.FromFile.cpp
@@ -493,8 +493,6 @@ INSTANTIATE_TEST_SUITE_P(
"spv.samplerlessTextureFunctions.frag",
"spv.smBuiltins.vert",
"spv.smBuiltins.frag",
- "spv.ARMCoreBuiltIns.vert",
- "spv.ARMCoreBuiltIns.frag",
"spv.builtin.PrimitiveShadingRateEXT.vert",
"spv.builtin.ShadingRateEXT.frag",
"spv.atomicAdd.bufferReference.comp",
@@ -652,12 +650,6 @@ INSTANTIATE_TEST_SUITE_P(
"spv.atomiAddEXT.task",
"spv.460.subgroupEXT.task",
"spv.460.subgroupEXT.mesh",
-
- // SPV_NV_shader_execution_reorder
-
- "spv.nv.hitobject-allops.rgen",
- "spv.nv.hitobject-allops.rchit",
- "spv.nv.hitobject-allops.rmiss",
})),
FileNameAsCustomTestSuffix
);
@@ -668,7 +660,6 @@ INSTANTIATE_TEST_SUITE_P(
::testing::ValuesIn(std::vector<std::string>({
"spv.1.6.conditionalDiscard.frag",
"spv.1.6.helperInvocation.frag",
- "spv.1.6.helperInvocation.memmodel.frag",
"spv.1.6.specConstant.comp",
"spv.1.6.samplerBuffer.frag",
"spv.1.6.separate.frag",
@@ -858,8 +849,7 @@ INSTANTIATE_TEST_SUITE_P(
"spv.debuginfo.glsl.comp",
"spv.debuginfo.glsl.geom",
"spv.debuginfo.glsl.tesc",
- "spv.debuginfo.glsl.tese",
- "spv.debuginfo.const_params.glsl.comp"
+ "spv.debuginfo.glsl.tese"
})),
FileNameAsCustomTestSuffix
);
diff --git a/gtests/TestFixture.h b/gtests/TestFixture.h
index 67783c0c..d087d6dd 100644
--- a/gtests/TestFixture.h
+++ b/gtests/TestFixture.h
@@ -48,7 +48,7 @@
#include "SPIRV/disassemble.h"
#include "SPIRV/doc.h"
#include "SPIRV/SPVRemapper.h"
-#include "glslang/Public/ResourceLimits.h"
+#include "StandAlone/ResourceLimits.h"
#include "glslang/Public/ShaderLang.h"
#include "Initializer.h"
@@ -199,7 +199,7 @@ public:
shader->setStringsWithLengths(&shaderStrings, &shaderLengths, 1);
if (!entryPointName.empty()) shader->setEntryPoint(entryPointName.c_str());
return shader->parse(
- (resources ? resources : GetDefaultResources()),
+ (resources ? resources : &glslang::DefaultTBuiltInResource),
defaultVersion, isForwardCompatible, controls);
}
@@ -254,7 +254,7 @@ public:
glslang::TProgram program;
program.addShader(&shader);
success &= program.link(controls);
-#if !defined(GLSLANG_WEB)
+#if !defined(GLSLANG_WEB) && !defined(GLSLANG_ANGLE)
if (success)
program.mapIO();
#endif
@@ -318,7 +318,7 @@ public:
program.addShader(&shader);
success &= program.link(controls);
-#if !defined(GLSLANG_WEB)
+#if !defined(GLSLANG_WEB) && !defined(GLSLANG_ANGLE)
if (success)
program.mapIO();
#endif
@@ -363,7 +363,7 @@ public:
glslang::TProgram program;
program.addShader(&shader);
success &= program.link(controls);
-#if !defined(GLSLANG_WEB)
+#if !defined(GLSLANG_WEB) && !defined(GLSLANG_ANGLE)
if (success)
program.mapIO();
#endif
@@ -640,7 +640,7 @@ public:
std::string ppShader;
glslang::TShader::ForbidIncluder includer;
const bool success = shader.preprocess(
- GetDefaultResources(), defaultVersion, defaultProfile,
+ &glslang::DefaultTBuiltInResource, defaultVersion, defaultProfile,
forceVersionProfile, isForwardCompatible, (EShMessages)(EShMsgOnlyPreprocessor | EShMsgCascadingErrors),
&ppShader, includer);
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-23 07:09:03 +0000