diff --git a/scripts/compile_shaders.py b/scripts/compile_shaders.py index 32399f5..933c893 100755 --- a/scripts/compile_shaders.py +++ b/scripts/compile_shaders.py @@ -110,7 +110,7 @@ def compile_dxil_shaders(shaders: Iterable[Shader], dxc: str | None = None, cwd: for shader in shaders: entry, shader_type = { "vert": ("VertexMain", "vs_6_0"), - "frag": ("FragmentMain", "ps_6_0") }[shader.type] + "frag": ("PixelMain", "ps_6_0") }[shader.type] cflags = ["-E", entry, "-T", shader_type] subprocess.run([dxc, *cflags, "-Fo", shader.output, shader.source], cwd=cwd, check=True) @@ -124,7 +124,7 @@ def compile_dxbc_shaders(shaders: Iterable[Shader], cwd: Path | None = None) -> for shader in shaders: entry, shader_type = { "vert": ("VertexMain", "vs_5_1"), - "frag": ("FragmentMain", "ps_5_1") }[shader.type] + "frag": ("PixelMain", "ps_5_1") }[shader.type] cflags = ["/E", entry, "/T", shader_type] subprocess.run(["fxc", *cflags, "/Fo", shader.output, shader.source], cwd=cwd, check=True) diff --git a/src/c/lesson7.c b/src/c/lesson7.c index 26df537..21ce59d 100644 --- a/src/c/lesson7.c +++ b/src/c/lesson7.c @@ -50,12 +50,12 @@ static const Vertex vertices[] = static const uint16_t indices[] = { - 0, 1, 2, 2, 3, 0, // Front - 4, 5, 6, 6, 7, 4, // Back - 8, 9, 10, 10, 11, 8, // Top - 12, 13, 14, 14, 15, 12, // Bottom - 16, 17, 18, 18, 19, 16, // Right - 20, 21, 22, 22, 23, 20 // Left + 0, 1, 2, 2, 3, 0, // Front + 4, 5, 6, 6, 7, 4, // Back + 8, 9, 10, 10, 11, 8, // Top + 12, 13, 14, 14, 15, 12, // Bottom + 16, 17, 18, 18, 19, 16, // Right + 20, 21, 22, 22, 23, 20 // Left }; @@ -191,7 +191,7 @@ static bool Lesson7_Init(NeHeContext* restrict ctx) }); SDL_ReleaseGPUShader(ctx->device, fragmentShaderLight); SDL_ReleaseGPUShader(ctx->device, vertexShaderLight); - if (!psoUnlit) + if (!psoLight) { SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "SDL_CreateGPUGraphicsPipeline: %s", SDL_GetError()); return false; diff --git a/src/c/nehe.c b/src/c/nehe.c index 142eb52..b2cdbae 100644 --- a/src/c/nehe.c +++ b/src/c/nehe.c @@ -386,7 +386,6 @@ bool NeHe_LoadShaders(NeHeContext* restrict ctx, SDL_GPUShader** restrict outFragment, const char* restrict name, const NeHeShaderProgramCreateInfo* restrict info) - //unsigned vertexUniforms, unsigned fragmentSamplers, unsigned vertexStorage) { SDL_GPUShader *vtxShader = NULL, *frgShader = NULL; diff --git a/src/shaders/lesson6.metal b/src/shaders/lesson6.metal index 6ef0955..0b05448 100644 --- a/src/shaders/lesson6.metal +++ b/src/shaders/lesson6.metal @@ -37,7 +37,7 @@ vertex Vertex2Fragment VertexMain( } fragment half4 FragmentMain( - Vertex2Fragment in [[stage_in]], + Vertex2Fragment in [[stage_in]], metal::texture2d texture [[texture(0)]], metal::sampler sampler [[sampler(0)]]) {