Update for latest GPU ABI, add sdlGetShaderFormats

icculus · Aug 16, 2024 · 74c5001 · 74c5001
1 parent 6540970
commit 74c5001
Show file tree

Hide file tree

Showing 3 changed files with 95 additions and 44 deletions.
diff --git a/mojoshader.h b/mojoshader.h
@@ -4105,6 +4105,14 @@ typedef struct SDL_GpuShader SDL_GpuShader;
 typedef struct SDL_GpuCommandBuffer SDL_GpuCommandBuffer;
 #endif /* SDL_GPU_H */
 
+/*
+ * Call this function to get the 'formatFlags' parameter for
+ *  SDL_CreateGpuDevice.
+ *
+ * Returns the SDL_GpuShaderFormatFlagBits for creating the SDL_GpuDevice.
+ */
+DECLSPEC unsigned int MOJOSHADER_sdlGetShaderFormats(void);
+
 /*
  * Prepares a context to manage SDL_gpu shaders.
  *

diff --git a/mojoshader_sdlgpu.c b/mojoshader_sdlgpu.c
@@ -230,6 +230,11 @@ static void update_uniform_buffer(
 
 /* Public API */
 
+unsigned int MOJOSHADER_sdlGetShaderFormats(void)
+{
+    return SDL_ShaderCross_GetShaderFormats();
+} // MOJOSHADER_sdlGetShaderFormats
+
 MOJOSHADER_sdlContext *MOJOSHADER_sdlCreateContext(
     SDL_GpuDevice *device,
     MOJOSHADER_malloc m,
@@ -374,7 +379,7 @@ MOJOSHADER_sdlProgram *MOJOSHADER_sdlLinkProgram(
 
     if (SDL_GpuGetDriver(ctx->device) != SDL_GPU_DRIVER_VULKAN)
     {
-        result->vertexShader = SDL_CompileFromSPIRV(
+        result->vertexShader = SDL_ShaderCross_CompileFromSPIRV(
             ctx->device,
             &createInfo,
             SDL_FALSE
@@ -404,7 +409,7 @@ MOJOSHADER_sdlProgram *MOJOSHADER_sdlLinkProgram(
 
     if (SDL_GpuGetDriver(ctx->device) != SDL_GPU_DRIVER_VULKAN)
     {
-        result->pixelShader = SDL_CompileFromSPIRV(
+        result->pixelShader = SDL_ShaderCross_CompileFromSPIRV(
             ctx->device,
             &createInfo,
             SDL_FALSE

diff --git a/spirv/SDL_gpu_shadercross.h b/spirv/SDL_gpu_shadercross.h
@@ -5,29 +5,45 @@
 
 #ifndef SDL_GPU_SHADERCROSS_SPIRVCROSS
 #define SDL_GPU_SHADERCROSS_SPIRVCROSS 1
-#endif
+#endif /* SDL_GPU_SHADERCROSS_SPIRVCROSS */
 
 #ifndef SDL_GPU_SHADERCROSS_HLSL
 #define SDL_GPU_SHADERCROSS_HLSL 1
-#endif
+#endif /* SDL_GPU_SHADERCROSS_HLSL */
+
+extern SDL_GpuShaderFormat SDL_ShaderCross_GetShaderFormats(void);
 
 #if SDL_GPU_SHADERCROSS_SPIRVCROSS
-extern void *SDL_CompileFromSPIRV(SDL_GpuDevice *device,
-                                  void *createInfo,
-                                  SDL_bool isCompute);
-#endif
+extern void *SDL_ShaderCross_CompileFromSPIRV(SDL_GpuDevice *device,
+                                              void *createInfo,
+                                              SDL_bool isCompute);
+#endif /* SDL_GPU_SHADERCROSS_SPIRVCROSS */
 
 #if SDL_GPU_SHADERCROSS_HLSL
-extern void *SDL_CompileFromHLSL(SDL_GpuDevice *device,
-                                 void *createInfo,
-                                 const char *hlslSource,
-                                 const char *shaderProfile);
-#endif
+extern void *SDL_ShaderCross_CompileFromHLSL(SDL_GpuDevice *device,
+                                             void *createInfo,
+                                             const char *hlslSource,
+                                             const char *shaderProfile);
+#endif /* SDL_GPU_SHADERCROSS_HLSL */
 
 #endif /* SDL_GPU_SHADERCROSS_H */
 
 #ifdef SDL_GPU_SHADERCROSS_IMPLEMENTATION
 
+SDL_GpuShaderFormat SDL_ShaderCross_GetShaderFormats(void)
+{
+    return (0
+#if SDL_GPU_SHADERCROSS_SPIRVCROSS
+      | SDL_GPU_SHADERFORMAT_SPIRV
+      | SDL_GPU_SHADERFORMAT_MSL
+#endif
+#if SDL_GPU_SHADERCROSS_HLSL
+      | SDL_GPU_SHADERFORMAT_DXBC
+      /* TODO: | SDL_GPU_SHADERFORMAT_DXIL */
+#endif /* SDL_GPU_SHADERCROSS_HLSL */
+    );
+}
+
 #if SDL_GPU_SHADERCROSS_HLSL
 
 /* Win32 Type Definitions */
@@ -56,18 +72,18 @@ typedef void ID3DInclude;      /* hack, unused */
 
 /* __stdcall declaration, largely taken from vkd3d_windows.h */
 #ifndef _WIN32
-#ifdef __stdcall
-#undef __stdcall
-#endif
-#if defined(__x86_64__) || defined(__arm64__)
-#define __stdcall __attribute__((ms_abi))
-#else
-#if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__)
-#define __stdcall __attribute__((__stdcall__)) __attribute__((__force_align_arg_pointer__))
-#else
-#define __stdcall __attribute__((__stdcall__))
-#endif
-#endif
+    #ifdef __stdcall
+        #undef __stdcall
+    #endif
+    #if defined(__x86_64__) || defined(__arm64__)
+        #define __stdcall __attribute__((ms_abi))
+    #else
+        #if (__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 2)) || defined(__APPLE__)
+            #define __stdcall __attribute__((__stdcall__)) __attribute__((__force_align_arg_pointer__))
+        #else
+            #define __stdcall __attribute__((__stdcall__))
+        #endif
+    #endif
 #endif
 
 /* ID3DBlob definition, used by both D3DCompiler and DXCompiler */
@@ -109,7 +125,7 @@ typedef HRESULT(__stdcall *pfn_D3DCompile)(
 
 static pfn_D3DCompile SDL_D3DCompile = NULL;
 
-void *SDL_CompileFromHLSL(
+void *SDL_ShaderCross_CompileFromHLSL(
     SDL_GpuDevice *device,
     void *createInfo,
     const char *hlslSource,
@@ -159,15 +175,15 @@ void *SDL_CompileFromHLSL(
     if (shaderProfile[0] == 'c' && shaderProfile[1] == 's') {
         SDL_GpuComputePipelineCreateInfo newCreateInfo;
         newCreateInfo = *(SDL_GpuComputePipelineCreateInfo *)createInfo;
-        newCreateInfo.code = blob->lpVtbl->GetBufferPointer(blob);
+        newCreateInfo.code = (const Uint8*)blob->lpVtbl->GetBufferPointer(blob);
         newCreateInfo.codeSize = blob->lpVtbl->GetBufferSize(blob);
         newCreateInfo.format = SDL_GPU_SHADERFORMAT_DXBC;
 
         result = SDL_GpuCreateComputePipeline(device, &newCreateInfo);
     } else {
         SDL_GpuShaderCreateInfo newCreateInfo;
         newCreateInfo = *(SDL_GpuShaderCreateInfo *)createInfo;
-        newCreateInfo.code = blob->lpVtbl->GetBufferPointer(blob);
+        newCreateInfo.code = (const Uint8*)blob->lpVtbl->GetBufferPointer(blob);
         newCreateInfo.codeSize = blob->lpVtbl->GetBufferSize(blob);
         newCreateInfo.format = SDL_GPU_SHADERFORMAT_DXBC;
 
@@ -179,26 +195,27 @@ void *SDL_CompileFromHLSL(
     return result;
 }
 
-#endif
+#endif /* SDL_GPU_SHADERCROSS_HLSL */
 
 #if SDL_GPU_SHADERCROSS_SPIRVCROSS
 
 #if !SDL_GPU_SHADERCROSS_HLSL
 #error SDL_GPU_SHADERCROSS_HLSL must be enabled for SDL_GPU_SHADERCROSS_SPIRVCROSS!
-#endif
+#endif /* !SDL_GPU_SHADERCROSS_HLSL */
 
 #include "spirv_cross_c.h"
 
-#if defined(_WIN32)
-#define SPIRV_CROSS_DLL "spirv-cross-c-shared.dll"
-#elif defined(__APPLE__)
-#define SPIRV_CROSS_DLL "libspirv-cross-c-shared.0.dylib"
-#else
-#define SPIRV_CROSS_DLL "libspirv-cross-c-shared.so.0"
-#endif
+#ifndef SDL_GPU_SHADERCROSS_STATIC
 
-#define SPVC_ERROR(func) \
-    SDL_SetError(#func " failed: %s", SDL_spvc_context_get_last_error_string(context))
+#ifndef SDL_GPU_SPIRV_CROSS_DLL
+    #if defined(_WIN32)
+        #define SDL_GPU_SPIRV_CROSS_DLL "spirv-cross-c-shared.dll"
+    #elif defined(__APPLE__)
+        #define SDL_GPU_SPIRV_CROSS_DLL "libspirv-cross-c-shared.0.dylib"
+    #else
+        #define SDL_GPU_SPIRV_CROSS_DLL "libspirv-cross-c-shared.so.0"
+    #endif
+#endif /* SDL_GPU_SPIRV_CROSS_DLL */
 
 static void *spirvcross_dll = NULL;
 
@@ -226,7 +243,26 @@ static pfn_spvc_context_get_last_error_string SDL_spvc_context_get_last_error_st
 static pfn_spvc_compiler_get_execution_model SDL_spvc_compiler_get_execution_model = NULL;
 static pfn_spvc_compiler_get_cleansed_entry_point_name SDL_spvc_compiler_get_cleansed_entry_point_name = NULL;
 
-void *SDL_CompileFromSPIRV(
+#else /* SDL_GPU_SHADERCROSS_STATIC */
+
+#define SDL_spvc_context_create spvc_context_create
+#define SDL_spvc_context_destroy spvc_context_destroy
+#define SDL_spvc_context_parse_spirv spvc_context_parse_spirv
+#define SDL_spvc_context_create_compiler spvc_context_create_compiler
+#define SDL_spvc_compiler_create_compiler_options spvc_compiler_create_compiler_options
+#define SDL_spvc_compiler_options_set_uint spvc_compiler_options_set_uint
+#define SDL_spvc_compiler_install_compiler_options spvc_compiler_install_compiler_options
+#define SDL_spvc_compiler_compile spvc_compiler_compile
+#define SDL_spvc_context_get_last_error_string spvc_context_get_last_error_string
+#define SDL_spvc_compiler_get_execution_model spvc_compiler_get_execution_model
+#define SDL_spvc_compiler_get_cleansed_entry_point_name spvc_compiler_get_cleansed_entry_point_name
+
+#endif /* SDL_GPU_SHADERCROSS_STATIC */
+
+#define SPVC_ERROR(func) \
+    SDL_SetError(#func " failed: %s", SDL_spvc_context_get_last_error_string(context))
+
+void *SDL_ShaderCross_CompileFromSPIRV(
     SDL_GpuDevice *device,
     void *originalCreateInfo,
     SDL_bool isCompute)
@@ -266,8 +302,9 @@ void *SDL_CompileFromSPIRV(
     }
 
     /* FIXME: spirv-cross could probably be loaded in a better spot */
+#ifndef SDL_GPU_SHADERCROSS_STATIC
     if (spirvcross_dll == NULL) {
-        spirvcross_dll = SDL_LoadObject(SPIRV_CROSS_DLL);
+        spirvcross_dll = SDL_LoadObject(SDL_GPU_SPIRV_CROSS_DLL);
         if (spirvcross_dll == NULL) {
             return NULL;
         }
@@ -292,6 +329,7 @@ void *SDL_CompileFromSPIRV(
     CHECK_FUNC(spvc_compiler_get_execution_model)
     CHECK_FUNC(spvc_compiler_get_cleansed_entry_point_name)
 #undef CHECK_FUNC
+#endif /* SDL_GPU_SHADERCROSS_STATIC */
 
     /* Create the SPIRV-Cross context */
     result = SDL_spvc_context_create(&context);
@@ -363,7 +401,7 @@ void *SDL_CompileFromSPIRV(
         newCreateInfo.entryPointName = cleansed_entrypoint;
 
         if (backend == SPVC_BACKEND_HLSL) {
-            compiledResult = SDL_CompileFromHLSL(
+            compiledResult = SDL_ShaderCross_CompileFromHLSL(
                 device,
                 &newCreateInfo,
                 translated_source,
@@ -386,7 +424,7 @@ void *SDL_CompileFromSPIRV(
             } else {
                 profile = (shadermodel == 50) ? "ps_5_0" : "ps_5_1";
             }
-            compiledResult = SDL_CompileFromHLSL(
+            compiledResult = SDL_ShaderCross_CompileFromHLSL(
                 device,
                 &newCreateInfo,
                 translated_source,
@@ -404,6 +442,6 @@ void *SDL_CompileFromSPIRV(
     return compiledResult;
 }
 
-#endif
+#endif /* SDL_GPU_SHADERCROSS_SPIRVCROSS */
 
 #endif /* SDL_GPU_SHADERCROSS_IMPLEMENTATION */