ShuriZma
/
snes9x
mirror of https://github.com/snes9xgit/snes9x.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GTK: Include copy of default glslang resources.

This commit is contained in:
Brandon Wright 2019-09-08 15:16:55 -05:00
parent 491f57ca92
commit 3c24e57105
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gtk/meson.build
View File

@ -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 = [

4
shaders/slang.cpp
View File

@ -84,9 +84,6 @@ static void printuniforms(std::vector<SlangUniform> &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<std::string> &lines,