diff --git a/resources/shaders/gl3/reproject.vs.glsl b/resources/shaders/gl3/reproject.vs.glsl index 35a3db40..f32005f2 100644 --- a/resources/shaders/gl3/reproject.vs.glsl +++ b/resources/shaders/gl3/reproject.vs.glsl @@ -27,6 +27,7 @@ void main(){ + gl_Position = uNewTransform * vec4(position, 0.0, 1.0); } diff --git a/resources/shaders/metal/debug_texture.fs.metal b/resources/shaders/metal/debug_texture.fs.metal index 9949a558..80a811f3 100644 --- a/resources/shaders/metal/debug_texture.fs.metal +++ b/resources/shaders/metal/debug_texture.fs.metal @@ -6,9 +6,9 @@ using namespace metal; struct spvDescriptorSetBuffer0 { - constant float4* uColor [[id(0)]]; - texture2d uTexture [[id(1)]]; - sampler uTextureSmplr [[id(2)]]; + texture2d uTexture [[id(0)]]; + sampler uTextureSmplr [[id(1)]]; + constant float4* uColor [[id(2)]]; }; struct main0_out diff --git a/resources/shaders/metal/post.fs.metal b/resources/shaders/metal/post.fs.metal index 989fd5d7..3c9502b4 100644 --- a/resources/shaders/metal/post.fs.metal +++ b/resources/shaders/metal/post.fs.metal @@ -8,12 +8,12 @@ using namespace metal; struct spvDescriptorSetBuffer0 { - constant float4* uKernel [[id(0)]]; - texture2d uGammaLUT [[id(1)]]; - texture2d uSource [[id(2)]]; - constant float2* uSourceSize [[id(3)]]; + texture2d uGammaLUT [[id(0)]]; + sampler uGammaLUTSmplr [[id(1)]]; + constant float4* uKernel [[id(2)]]; + texture2d uSource [[id(3)]]; sampler uSourceSmplr [[id(4)]]; - sampler uGammaLUTSmplr [[id(5)]]; + constant float2* uSourceSize [[id(5)]]; constant int* uGammaCorrectionEnabled [[id(6)]]; constant float4* uBGColor [[id(7)]]; constant float4* uFGColor [[id(8)]]; diff --git a/resources/shaders/metal/tile_alpha_multicolor.vs.metal b/resources/shaders/metal/tile_alpha_multicolor.vs.metal index bc25f729..7e62af78 100644 --- a/resources/shaders/metal/tile_alpha_multicolor.vs.metal +++ b/resources/shaders/metal/tile_alpha_multicolor.vs.metal @@ -9,11 +9,11 @@ using namespace metal; struct spvDescriptorSetBuffer0 { constant float2* uTileSize [[id(0)]]; - texture2d uPaintTexture [[id(1)]]; - constant float2* uViewBoxOrigin [[id(2)]]; - sampler uPaintTextureSmplr [[id(3)]]; - constant float2* uFramebufferSize [[id(4)]]; - constant float2* uStencilTextureSize [[id(5)]]; + constant float2* uViewBoxOrigin [[id(1)]]; + constant float2* uFramebufferSize [[id(2)]]; + constant float2* uStencilTextureSize [[id(3)]]; + texture2d uPaintTexture [[id(4)]]; + sampler uPaintTextureSmplr [[id(5)]]; }; struct main0_out diff --git a/resources/shaders/metal/tile_solid_multicolor.vs.metal b/resources/shaders/metal/tile_solid_multicolor.vs.metal index edfe17d0..573f5173 100644 --- a/resources/shaders/metal/tile_solid_multicolor.vs.metal +++ b/resources/shaders/metal/tile_solid_multicolor.vs.metal @@ -9,10 +9,10 @@ using namespace metal; struct spvDescriptorSetBuffer0 { constant float2* uTileSize [[id(0)]]; - texture2d uPaintTexture [[id(1)]]; - constant float2* uViewBoxOrigin [[id(2)]]; - sampler uPaintTextureSmplr [[id(3)]]; - constant float2* uFramebufferSize [[id(4)]]; + constant float2* uViewBoxOrigin [[id(1)]]; + constant float2* uFramebufferSize [[id(2)]]; + texture2d uPaintTexture [[id(3)]]; + sampler uPaintTextureSmplr [[id(4)]]; }; struct main0_out