Merge pull request #178 from ZehMatt/async-shaders

Async shader loading and caching

Author: marchc1

Dependencies/OpenGL/Gl46.cs

@@ -14444,6 +14444,14 @@ public static void glSpecializeShader(GLuint shader, string pEntryPoint, GLuint
 
 #endif
 
+    public const GLenum GL_COMPLETION_STATUS_KHR = 0x91B1;
+
+    [UnmanagedFunctionPointer(CallingConvention.Cdecl)]
+    private delegate void PFNGLMAXSHADERCOMPILERTHREADSKHRPROC(GLuint count);
+    private static PFNGLMAXSHADERCOMPILERTHREADSKHRPROC _glMaxShaderCompilerThreadsKHR;
+    public static bool glMaxShaderCompilerThreadsKHRLoaded => _glMaxShaderCompilerThreadsKHR != null;
+    public static void glMaxShaderCompilerThreadsKHR(GLuint count) => _glMaxShaderCompilerThreadsKHR(count);
+
     /// <summary>
     /// Loads OpenGL functions using the specified loader delegate.
     /// </summary>
@@ -15144,6 +15152,10 @@ public unsafe static void Import(GetProcAddressHandler loader)
         _glMultiDrawElementsIndirectCount = Marshal.GetDelegateForFunctionPointer<PFNGLMULTIDRAWELEMENTSINDIRECTCOUNTPROC>(loader.Invoke("glMultiDrawElementsIndirectCount"));
         _glPolygonOffsetClamp = Marshal.GetDelegateForFunctionPointer<PFNGLPOLYGONOFFSETCLAMPPROC>(loader.Invoke("glPolygonOffsetClamp"));
 #endif
+        IntPtr maxShaderCompilerThreads = loader.Invoke("glMaxShaderCompilerThreadsKHR");
+        if (maxShaderCompilerThreads == IntPtr.Zero)
+            maxShaderCompilerThreads = loader.Invoke("glMaxShaderCompilerThreadsARB");
+        _glMaxShaderCompilerThreadsKHR = maxShaderCompilerThreads != IntPtr.Zero ? Marshal.GetDelegateForFunctionPointer<PFNGLMAXSHADERCOMPILERTHREADSKHRPROC>(maxShaderCompilerThreads) : null!;
     }
 #endif
 }

Game.Assets/sdn/shaders/bloomadd_gl460.fs

@@ -1,6 +1,6 @@
 #version 460
 
-in vec2 vs_BaseTexCoord;
+layout(location = 0) in vec2 vs_BaseTexCoord;
 
 layout(std140, binding = 3) uniform source_pixel_sharedUBO {
     bool isAlphaTesting;

Game.Assets/sdn/shaders/blurfilter_gl460.fs

@@ -1,12 +1,12 @@
 #version 460
 
-in vec2 vs_CoordTap0;
-in vec2 vs_CoordTap1;
-in vec2 vs_CoordTap2;
-in vec2 vs_CoordTap3;
-in vec2 vs_CoordTap1Neg;
-in vec2 vs_CoordTap2Neg;
-in vec2 vs_CoordTap3Neg;
+layout(location = 0) in vec2 vs_CoordTap0;
+layout(location = 1) in vec2 vs_CoordTap1;
+layout(location = 2) in vec2 vs_CoordTap2;
+layout(location = 3) in vec2 vs_CoordTap3;
+layout(location = 4) in vec2 vs_CoordTap1Neg;
+layout(location = 5) in vec2 vs_CoordTap2Neg;
+layout(location = 6) in vec2 vs_CoordTap3Neg;
 
 layout(std140, binding = 6) uniform source_ps_constants {
     vec4 ps_const[256];

Game.Assets/sdn/shaders/blurfilter_gl460.vs

@@ -11,13 +11,13 @@ layout(std140, binding = 5) uniform source_vs_constants {
 #define vsTapOffs1 vs_const[49].xy
 #define vsTapOffs2 vs_const[50].xy
 
-out vec2 vs_CoordTap0;
-out vec2 vs_CoordTap1;
-out vec2 vs_CoordTap2;
-out vec2 vs_CoordTap3;
-out vec2 vs_CoordTap1Neg;
-out vec2 vs_CoordTap2Neg;
-out vec2 vs_CoordTap3Neg;
+layout(location = 0) out vec2 vs_CoordTap0;
+layout(location = 1) out vec2 vs_CoordTap1;
+layout(location = 2) out vec2 vs_CoordTap2;
+layout(location = 3) out vec2 vs_CoordTap3;
+layout(location = 4) out vec2 vs_CoordTap1Neg;
+layout(location = 5) out vec2 vs_CoordTap2Neg;
+layout(location = 6) out vec2 vs_CoordTap3Neg;
 
 vec2 FlipV(vec2 uv)
 {

Game.Assets/sdn/shaders/common_clipplanes_gl460.vs

@@ -1,6 +1,11 @@
 #ifndef COMMON_CLIPPLANES_GL460_VS
 #define COMMON_CLIPPLANES_GL460_VS
 
+out gl_PerVertex {
+    vec4 gl_Position;
+    float gl_ClipDistance[2];
+};
+
 layout(std140, binding = 7) uniform source_clip_planes {
     vec4 clipPlanes[2];
 };

Game.Assets/sdn/shaders/downsample_gl460.vs

@@ -12,10 +12,10 @@ layout(std140, binding = 5) uniform source_vs_constants {
 #define vsTapOffs2 vs_const[50].xy
 #define vsTapOffs3 vs_const[51].xy
 
-out vec2 vs_CoordTap0;
-out vec2 vs_CoordTap1;
-out vec2 vs_CoordTap2;
-out vec2 vs_CoordTap3;
+layout(location = 0) out vec2 vs_CoordTap0;
+layout(location = 1) out vec2 vs_CoordTap1;
+layout(location = 2) out vec2 vs_CoordTap2;
+layout(location = 3) out vec2 vs_CoordTap3;
 
 vec2 FlipV(vec2 uv)
 {

Game.Assets/sdn/shaders/downsample_nohdr_gl460.fs

@@ -1,10 +1,10 @@
 #version 460
 // STATIC: "CSTRIKE"			"0..1"
 
-in vec2 vs_CoordTap0;
-in vec2 vs_CoordTap1;
-in vec2 vs_CoordTap2;
-in vec2 vs_CoordTap3;
+layout(location = 0) in vec2 vs_CoordTap0;
+layout(location = 1) in vec2 vs_CoordTap1;
+layout(location = 2) in vec2 vs_CoordTap2;
+layout(location = 3) in vec2 vs_CoordTap3;
 
 layout(std140, binding = 6) uniform source_ps_constants {
     vec4 ps_const[256];

Game.Assets/sdn/shaders/eyeglint_gl460.fs

@@ -1,8 +1,8 @@
 #version 460
 
-in vec2 vs_TexCoord;
-in vec2 vs_GlintCenter;
-in vec3 vs_GlintColor;
+layout(location = 0) in vec2 vs_TexCoord;
+layout(location = 1) in vec2 vs_GlintCenter;
+layout(location = 2) in vec3 vs_GlintColor;
 
 out vec4 fragColor;
 

Game.Assets/sdn/shaders/eyeglint_gl460.vs

@@ -5,9 +5,9 @@ layout(location = 10) in vec2 v_TexCoord0;
 layout(location = 11) in vec2 v_TexCoord1;
 layout(location = 12) in vec3 v_TexCoord2;
 
-out vec2 vs_TexCoord;
-out vec2 vs_GlintCenter;
-out vec3 vs_GlintColor;
+layout(location = 0) out vec2 vs_TexCoord;
+layout(location = 1) out vec2 vs_GlintCenter;
+layout(location = 2) out vec3 vs_GlintColor;
 
 #include "common_clipplanes_gl460.vs"
 

Game.Assets/sdn/shaders/eyes_gl460.fs

@@ -2,11 +2,11 @@
 // DYNAMIC: "WRITE_DEPTH_TO_DESTALPHA"	"0..1"
 // DYNAMIC: "PIXELFOGTYPE"				"0..2"
 
-in vec2 vs_BaseTexCoord;
-in vec2 vs_IrisTexCoord;
-in vec2 vs_GlintTexCoord;
-in vec3 vs_Color;
-in vec4 vs_WorldPos_ProjPosZ;
+layout(location = 0) in vec2 vs_BaseTexCoord;
+layout(location = 1) in vec2 vs_IrisTexCoord;
+layout(location = 2) in vec2 vs_GlintTexCoord;
+layout(location = 3) in vec3 vs_Color;
+layout(location = 4) in vec4 vs_WorldPos_ProjPosZ;
 
 layout(std140, binding = 6) uniform source_ps_constants {
     vec4 ps_const[256];