Dasko/snes9x
Dasko/snes9x
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update glslang to bleeding edge.

Browse Source
This commit is contained in:
BearOso 2023-03-10 17:24:40 -06:00
parent 3d22cc7f2d
commit f9374e527b
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
external/glslang vendored

@ -1 +1 @@
Subproject commit e3bca2add61a83cc87b0db199c1fbd45690dbf0b
Subproject commit 6d41bb9c557c5a0eec61ffba1f775dc5f717a8f7

6
shaders/slang.cpp
View File

@ -11,7 +11,7 @@
#include <sstream>
#include "external/glslang/glslang/Public/ShaderLang.h"
#include "external/glslang/SPIRV/GlslangToSpv.h"
#include "external/glslang/StandAlone/ResourceLimits.h"
#include "external/glslang/glslang/Public/ResourceLimits.h"
#include "external/SPIRV-Cross/spirv_cross.hpp"
#include "external/SPIRV-Cross/spirv_glsl.hpp"
@ -113,14 +113,14 @@ GLint GLSLShader::slang_compile(std::vector<std::string> &lines,
std::string debug;
auto forbid_includer = glslang::TShader::ForbidIncluder();
if (!shader.preprocess(&glslang::DefaultTBuiltInResource, 100, ENoProfile, false,
if (!shader.preprocess(GetDefaultResources(), 100, ENoProfile, false,
false, messages, &debug, forbid_includer))
{
puts(debug.c_str());
return -1;
}
if (!shader.parse(&glslang::DefaultTBuiltInResource, 100, false, messages))
if (!shader.parse(GetDefaultResources(), 100, false, messages))
{
puts(shader.getInfoLog());
puts(shader.getInfoDebugLog());

6
vulkan/slang_shader.cpp
View File

@ -9,7 +9,7 @@
#include <fstream>
#include "../external/glslang/glslang/Public/ShaderLang.h"
#include "../external/glslang/SPIRV/GlslangToSpv.h"
#include "../external/glslang/StandAlone/ResourceLimits.h"
#include "../external/glslang/glslang/Public/ResourceLimits.h"
using std::string;
using std::vector;
@ -205,9 +205,9 @@ std::vector<uint32_t> SlangShader::generate_spirv(std::string shader_string, std
auto compile = [&](glslang::TShader &shader, string &shader_string, std::vector<uint32_t> &spirv) -> bool {
const char *source = shader_string.c_str();
shader.setStrings(&source, 1);
if (!shader.preprocess(&glslang::DefaultTBuiltInResource, 450, ENoProfile, false, false, messages, &debug, forbid_includer))
if (!shader.preprocess(GetDefaultResources(), 450, ENoProfile, false, false, messages, &debug, forbid_includer))
return false;
if (!shader.parse(&glslang::DefaultTBuiltInResource, 450, false, messages))
if (!shader.parse(GetDefaultResources(), 450, false, messages))
return false;
glslang::TProgram program;