File libplacebo-glslang.patch of Package libplacebo

Overview Repositories Revisions Requests Users Attributes Meta

File libplacebo-glslang.patch of Package libplacebo (Revision 833c50679a88a8e738c4e7cb6a327ed3)

Currently displaying revision 833c50679a88a8e738c4e7cb6a327ed3 , Show latest

diff --git a/src/glsl/glslang.cc b/src/glsl/glslang.cc
index c237541..24d5f61 100644
--- a/src/glsl/glslang.cc
+++ b/src/glsl/glslang.cc
@@ -23,7 +23,6 @@ extern "C" {
 }
 
 #include <glslang/Include/ResourceLimits.h>
-#include <glslang/Include/revision.h>
 #include <glslang/Public/ShaderLang.h>
 #include <SPIRV/GlslangToSpv.h>
 
@@ -36,7 +35,7 @@ static int pl_glslang_refcount;
 
 int pl_glslang_version()
 {
-    return GLSLANG_PATCH_LEVEL;
+    return 9999;
 }
 
 bool pl_glslang_init()
@@ -78,10 +77,8 @@ struct pl_glslang_res *pl_glslang_compile(const char *glsl, uint32_t api_ver,
     if (api_ver >= EShTargetVulkan_1_1)
         spirv_version = EShTargetSpv_1_3;
 
-#if GLSLANG_PATCH_LEVEL >= 3667
     if (api_ver >= EShTargetVulkan_1_2)
         spirv_version = EShTargetSpv_1_5;
-#endif
 
     assert(pl_glslang_refcount);
     TShader *shader = new TShader(lang);
@@ -200,7 +197,6 @@ const TBuiltInResource DefaultTBuiltInResource = {
     /* .MaxCullDistances = */ 8,
     /* .MaxCombinedClipAndCullDistances = */ 8,
     /* .MaxSamples = */ 4,
-#if GLSLANG_PATCH_LEVEL >= 2892
     /* .maxMeshOutputVerticesNV = */ 256,
     /* .maxMeshOutputPrimitivesNV = */ 512,
     /* .maxMeshWorkGroupSizeX_NV = */ 32,
@@ -210,10 +206,7 @@ const TBuiltInResource DefaultTBuiltInResource = {
     /* .maxTaskWorkGroupSizeY_NV = */ 1,
     /* .maxTaskWorkGroupSizeZ_NV = */ 1,
     /* .maxMeshViewCountNV = */ 4,
-#endif
-#if GLSLANG_PATCH_LEVEL >= 3763
     /* .maxDualSourceDrawBuffersEXT = */ 1,
-#endif
 
     /* .limits = */ {
         /* .nonInductiveForLoops = */ 1,
diff --git a/src/meson.build b/src/meson.build
index 5a77cea..71e11ce 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -83,11 +83,6 @@ else
 endif
 
 if glslang_found
-  glslang_ver = cxx.get_define('GLSLANG_PATCH_LEVEL',
-      prefix: '#include <glslang/Include/revision.h>'
-  ).to_int()
-
-  if glslang_ver >= glslang_min_ver
     # glslang must be linked against pthreads on platforms where pthreads is
     # available. Because of their horrible architecture, gcc can't do it
     # automatically, and for some reason dependency('threads') (which uses
@@ -107,11 +102,6 @@ if glslang_found
     foreach i : extra_glslang_inc
       add_project_arguments('-I' + i, language: 'cpp')
     endforeach
-
-  else
-    error('glslang revision @0@ too old! Must be at least @1@'
-          .format(glslang_ver, glslang_min_ver))
-  endif
 endif

Places

File libplacebo-glslang.patch of Package libplacebo (Revision 833c50679a88a8e738c4e7cb6a327ed3)

Places