diff --git a/engine/rend/shaders/meshes.vert.hlsl b/engine/rend/shaders/meshes.vert.hlsl index 2de58e5..160ca56 100644 --- a/engine/rend/shaders/meshes.vert.hlsl +++ b/engine/rend/shaders/meshes.vert.hlsl @@ -32,7 +32,7 @@ cbuffer Uniforms : register(b0, space1) Output main(Input input) { Output output; - output.TexCoord = input.TexCoord; + output.TexCoord = input.UV; output.Position = mul(ViewProjection, mul(float4(input.Position, 1.0), scene[input.InstanceIndex].Model)); return output; diff --git a/engine/rend/shaders/meshes.vert.json b/engine/rend/shaders/meshes.vert.json index bd492c3..279e031 100644 --- a/engine/rend/shaders/meshes.vert.json +++ b/engine/rend/shaders/meshes.vert.json @@ -61,8 +61,8 @@ }, { "type" : "vec2", - "name" : "in.var.TEXCOORD1", - "location" : 1 + "name" : "in.var.TEXCOORD3", + "location" : 3 } ], "outputs" : [ diff --git a/projects/content/_shaders/dxil/meshes.vert.dxil b/projects/content/_shaders/dxil/meshes.vert.dxil index 1081683..3eeb0b1 100644 Binary files a/projects/content/_shaders/dxil/meshes.vert.dxil and b/projects/content/_shaders/dxil/meshes.vert.dxil differ diff --git a/projects/content/_shaders/msl/meshes.vert.msl b/projects/content/_shaders/msl/meshes.vert.msl index b96b908..51d6266 100644 --- a/projects/content/_shaders/msl/meshes.vert.msl +++ b/projects/content/_shaders/msl/meshes.vert.msl @@ -28,13 +28,13 @@ struct main0_out struct main0_in { float3 in_var_TEXCOORD0 [[attribute(0)]]; - float2 in_var_TEXCOORD1 [[attribute(1)]]; + float2 in_var_TEXCOORD3 [[attribute(3)]]; }; vertex main0_out main0(main0_in in [[stage_in]], constant type_Uniforms& Uniforms [[buffer(0)]], const device type_StructuredBuffer_Scene& scene [[buffer(1)]], uint gl_InstanceIndex [[instance_id]]) { main0_out out = {}; - out.out_var_TEXCOORD0 = in.in_var_TEXCOORD1; + out.out_var_TEXCOORD0 = in.in_var_TEXCOORD3; out.gl_Position = Uniforms.ViewProjection * (float4(in.in_var_TEXCOORD0, 1.0) * scene._m0[gl_InstanceIndex].Model); return out; } diff --git a/projects/content/_shaders/spv/meshes.vert.spv b/projects/content/_shaders/spv/meshes.vert.spv index c0f9714..e7ccb60 100644 Binary files a/projects/content/_shaders/spv/meshes.vert.spv and b/projects/content/_shaders/spv/meshes.vert.spv differ