MojoShader update for new SPIR-V linker

FNA-XNA · Jan 20, 2025 · 3d160cb · 3d160cb
1 parent e9dd55e
commit 3d160cb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/MojoShader b/MojoShader
diff --git a/src/FNA3D_Driver_SDL.c b/src/FNA3D_Driver_SDL.c
@@ -1319,7 +1319,7 @@ static void SDLGPU_INTERNAL_GenerateVertexInputInfo(
 	FNA3D_VertexDeclaration vertexDeclaration;
 	FNA3D_VertexElement element;
 	FNA3D_VertexElementUsage usage;
-	MOJOSHADER_sdlVertexAttribute mojoshaderVertexAttributes[16];
+	MOJOSHADER_vertexAttribute mojoshaderVertexAttributes[16];
 	int32_t index, attribLoc;
 
 	MOJOSHADER_sdlGetBoundShaderData(renderer->mojoshaderContext, &vertexShader, &blah);
@@ -1377,7 +1377,7 @@ static void SDLGPU_INTERNAL_GenerateVertexInputInfo(
 			attributes[attributeDescriptionCounter].buffer_slot = i;
 
 			mojoshaderVertexAttributes[attributeDescriptionCounter].usage = VertexAttribUsage(element.vertexElementUsage);
-			mojoshaderVertexAttributes[attributeDescriptionCounter].vertexElementFormat = element.vertexElementFormat;
+			mojoshaderVertexAttributes[attributeDescriptionCounter].vertexElementFormat = (MOJOSHADER_vertexElementFormat) element.vertexElementFormat; /* FNA3D/MojoShader use the same enum values */
 			mojoshaderVertexAttributes[attributeDescriptionCounter].usageIndex = index;
 
 			attributeDescriptionCounter += 1;
+0 −2		CMakeLists.txt
+56 −0		mojoshader.c
+43 −546		mojoshader.h
+0 −553		mojoshader_metal.c
+26 −283		mojoshader_sdlgpu.c
+0 −858		mojoshader_vulkan.c
+0 −41		mojoshader_vulkan_vkfuncs.h