wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/glsl: Handle SV_INSTANCE_ID inputs.

Browse Source
This commit is contained in:
Henri Verbeet
2025-08-08 16:06:39 +02:00
parent 9b375b3dae
commit 05b58c9963
Notes: Henri Verbeet 2025-09-01 15:21:55 +02:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1705
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libs/vkd3d-shader/glsl.c
View File

@@ -1286,6 +1286,13 @@ static void shader_glsl_print_sysval_name(struct vkd3d_string_buffer *buffer, st
vkd3d_string_buffer_printf(buffer, "intBitsToFloat(ivec4(gl_VertexID, 0, 0, 0))"); vkd3d_string_buffer_printf(buffer, "intBitsToFloat(ivec4(gl_VertexID, 0, 0, 0))");
break; break;
case VKD3D_SHADER_SV_INSTANCE_ID:
if (version->type != VKD3D_SHADER_TYPE_VERTEX)
vkd3d_glsl_compiler_error(gen, VKD3D_SHADER_ERROR_GLSL_INTERNAL,
"Internal compiler error: Unhandled SV_INSTANCE_ID in shader type #%x.", version->type);
vkd3d_string_buffer_printf(buffer, "intBitsToFloat(ivec4(gl_InstanceID, 0, 0, 0))");
break;
case VKD3D_SHADER_SV_IS_FRONT_FACE: case VKD3D_SHADER_SV_IS_FRONT_FACE:
if (version->type != VKD3D_SHADER_TYPE_PIXEL) if (version->type != VKD3D_SHADER_TYPE_PIXEL)
vkd3d_glsl_compiler_error(gen, VKD3D_SHADER_ERROR_GLSL_INTERNAL, vkd3d_glsl_compiler_error(gen, VKD3D_SHADER_ERROR_GLSL_INTERNAL,

2
tests/hlsl/instance-id.shader_test
View File

@@ -42,7 +42,7 @@ float4 main(vs_out i) : SV_Target
} }
[test] [test]
todo(glsl | msl) draw triangle list 3 4 todo(msl) draw triangle list 3 4
probe rtv 0 (160, 120) rgba (0.0, 0.25, 0.0, 0.25) probe rtv 0 (160, 120) rgba (0.0, 0.25, 0.0, 0.25)
probe rtv 0 (480, 120) rgba (0.0, 0.5, 0.0, 0.5) probe rtv 0 (480, 120) rgba (0.0, 0.5, 0.0, 0.5)
probe rtv 0 (480, 360) rgba (0.0, 0.75, 0.0, 0.75) probe rtv 0 (480, 360) rgba (0.0, 0.75, 0.0, 0.75)