From 3c24e57105be8f9e4bedc945322eca455e508914 Mon Sep 17 00:00:00 2001 From: Brandon Wright Date: Sun, 8 Sep 2019 15:16:55 -0500 Subject: [PATCH] GTK: Include copy of default glslang resources. --- gtk/meson.build | 11 +++-------- shaders/slang.cpp | 4 ---- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/gtk/meson.build b/gtk/meson.build index 1b56bc24..01f24aa0 100644 --- a/gtk/meson.build +++ b/gtk/meson.build @@ -97,17 +97,10 @@ if slang and opengl osdependent_dep = c_compiler.find_library('OSDependent', required: false) ogl_compiler_dep = c_compiler.find_library('OGLCompiler', required: false) spv_remapper_dep = c_compiler.find_library('SPVRemapper', required: false) - resource_limits_dep = c_compiler.find_library('glslang-default-resource-limits', required:false) if glslang_dep.found() and spirv_dep.found() and osdependent_dep.found() and ogl_compiler_dep.found() and spv_remapper_dep.found() deps += [glslang_dep, spirv_dep, osdependent_dep, ogl_compiler_dep, spv_remapper_dep] - if not resource_limits_dep.found() - warns += 'glslang-default-resource-limits not found. Assuming it is linked statically into glslang.' - else - deps += [resource_limits_dep] - endif - args += ['-DUSE_SLANG', '-DSPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS'] srcs += ['../shaders/slang.cpp'] srcs += ['../shaders/SPIRV-Cross/spirv_cfg.cpp', @@ -389,7 +382,9 @@ srcs += [ 'src/gtk_netplay_dialog.cpp', 'src/gtk_netplay_dialog.h', 'src/gtk_netplay.cpp', - 'src/gtk_netplay.h' + 'src/gtk_netplay.h', + 'src/background_particles.cpp', + 'src/background_particles.h' ] libjma_srcs = [ diff --git a/shaders/slang.cpp b/shaders/slang.cpp index fa2bfef7..214326a5 100644 --- a/shaders/slang.cpp +++ b/shaders/slang.cpp @@ -84,9 +84,6 @@ static void printuniforms(std::vector &unif) #endif // #if 0 namespace glslang { -#ifndef _WIN32 -extern TBuiltInResource DefaultTBuiltInResource; -#else static const TBuiltInResource DefaultTBuiltInResource = { /* .MaxLights = */ 32, /* .MaxClipPlanes = */ 6, @@ -192,7 +189,6 @@ static const TBuiltInResource DefaultTBuiltInResource = { /* .generalVariableIndexing = */ 1, /* .generalConstantMatrixVectorIndexing = */ 1, }}; -#endif } // namespace glslang GLint GLSLShader::slang_compile(std::vector &lines,