sync ports with The Matrix

This commit is contained in:
purplerain 2023-09-23 22:48:29 +00:00
parent 546ec68bda
commit 0bb298a7cc
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
27 changed files with 240 additions and 76 deletions

View file

@ -0,0 +1,22 @@
Use system glslang and SPIRV-Cross.
Index: shaders/slang.cpp
--- shaders/slang.cpp.orig
+++ shaders/slang.cpp
@@ -9,11 +9,11 @@
#include <vector>
#include <string>
#include <sstream>
-#include "external/glslang/glslang/Public/ShaderLang.h"
-#include "external/glslang/SPIRV/GlslangToSpv.h"
-#include "external/glslang/glslang/Public/ResourceLimits.h"
-#include "external/SPIRV-Cross/spirv_cross.hpp"
-#include "external/SPIRV-Cross/spirv_glsl.hpp"
+#include <glslang/Public/ShaderLang.h>
+#include <glslang/SPIRV/GlslangToSpv.h>
+#include <glslang/Public/ResourceLimits.h>
+#include <spirv_cross/spirv_cross.hpp>
+#include <spirv_cross/spirv_glsl.hpp>
std::string GLSLShader::slang_get_stage(std::vector<std::string> &lines,
std::string name)