wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/glsl: Add interpolation modifiers to interstage inputs and outputs.

Browse Source
This commit is contained in:
Henri Verbeet 2024-09-30 12:04:31 +02:00
parent 7b47528e4b
commit 4eed6b8887
Notes: Henri Verbeet 2024-10-07 17:53:05 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1145
2 changed files with 57 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1494,15 +1494,62 @@ static void shader_glsl_generate_descriptor_declarations(struct vkd3d_glsl_gener
vkd3d_string_buffer_printf(gen->buffer, "\n"); vkd3d_string_buffer_printf(gen->buffer, "\n");
} }
static void shader_glsl_generate_interface_block(struct vkd3d_string_buffer *buffer, static const struct signature_element *signature_get_element_by_location(
const char *type, unsigned int count) const struct shader_signature *signature, unsigned int location)
{ {
const struct signature_element *e;
unsigned int i;
for (i = 0; i < signature->element_count; ++i)
{
e = &signature->elements[i];
if (e->target_location != location)
continue;
return e;
}
return NULL;
}
static const char *shader_glsl_get_interpolation(struct vkd3d_glsl_generator *gen,
const struct shader_signature *signature, const char *type, unsigned int location)
{
enum vkd3d_shader_interpolation_mode m;
const struct signature_element *e;
if ((e = signature_get_element_by_location(signature, location)))
m = e->interpolation_mode;
else
m = VKD3DSIM_NONE;
switch (m)
{
case VKD3DSIM_NONE:
case VKD3DSIM_LINEAR:
return "";
case VKD3DSIM_CONSTANT:
return "flat ";
default:
vkd3d_glsl_compiler_error(gen, VKD3D_SHADER_ERROR_GLSL_INTERNAL,
"Internal compiler error: Unhandled interpolation mode %#x for %s location %u.", m, type, location);
return "";
}
}
static void shader_glsl_generate_interface_block(struct vkd3d_glsl_generator *gen,
const struct shader_signature *signature, const char *type, unsigned int count)
{
struct vkd3d_string_buffer *buffer = gen->buffer;
const char *interpolation;
unsigned int i; unsigned int i;
vkd3d_string_buffer_printf(buffer, "%s shader_in_out\n{\n", type); vkd3d_string_buffer_printf(buffer, "%s shader_in_out\n{\n", type);
for (i = 0; i < count; ++i) for (i = 0; i < count; ++i)
{ {
vkd3d_string_buffer_printf(buffer, " vec4 reg_%u;\n", i); interpolation = shader_glsl_get_interpolation(gen, signature, type, i);
vkd3d_string_buffer_printf(buffer, " %svec4 reg_%u;\n", interpolation, i);
} }
vkd3d_string_buffer_printf(buffer, "} shader_%s;\n", type); vkd3d_string_buffer_printf(buffer, "} shader_%s;\n", type);
} }
@ -1550,7 +1597,7 @@ static void shader_glsl_generate_input_declarations(struct vkd3d_glsl_generator
} }
else if (gen->limits.input_count) else if (gen->limits.input_count)
{ {
shader_glsl_generate_interface_block(buffer, "in", gen->limits.input_count); shader_glsl_generate_interface_block(gen, signature, "in", gen->limits.input_count);
} }
vkd3d_string_buffer_printf(buffer, "\n"); vkd3d_string_buffer_printf(buffer, "\n");
} }
@ -1605,7 +1652,7 @@ static void shader_glsl_generate_output_declarations(struct vkd3d_glsl_generator
} }
else if (gen->limits.output_count) else if (gen->limits.output_count)
{ {
shader_glsl_generate_interface_block(buffer, "out", gen->limits.output_count); shader_glsl_generate_interface_block(gen, signature, "out", gen->limits.output_count);
} }
vkd3d_string_buffer_printf(buffer, "\n"); vkd3d_string_buffer_printf(buffer, "\n");
} }

10
tests/hlsl/nointerpolation.shader_test
View File

@ -24,7 +24,7 @@ float4 main(nointerpolation float4 t : texcoord) : sv_target
[test] [test]
draw triangle list 3 draw triangle list 3
todo(glsl) probe (0, 0, 640, 480) rgba (0.0, 1.0, 0.0, 1.0) probe (0, 0, 640, 480) rgba (0.0, 1.0, 0.0, 1.0)
[vertex shader] [vertex shader]
struct ps_input struct ps_input
@ -51,7 +51,7 @@ float4 main(ps_input input) : sv_target
[test] [test]
draw triangle list 3 draw triangle list 3
todo(glsl) probe (0, 0, 640, 480) rgba (0.0, 1.0, 0.0, 1.0) probe (0, 0, 640, 480) rgba (0.0, 1.0, 0.0, 1.0)
[vertex shader] [vertex shader]
struct ps_input struct ps_input
@ -78,7 +78,7 @@ float4 main(nointerpolation ps_input input) : sv_target
[test] [test]
draw triangle list 3 draw triangle list 3
todo(glsl) probe (0, 0, 640, 480) rgba (0.0, 1.0, 0.0, 1.0) probe (0, 0, 640, 480) rgba (0.0, 1.0, 0.0, 1.0)
[vertex shader] [vertex shader]
struct ps_input struct ps_input
@ -105,7 +105,7 @@ float4 main(centroid ps_input input) : sv_target
[test] [test]
draw triangle list 3 draw triangle list 3
todo(glsl) probe (0, 0, 640, 480) rgba (0.0, 1.0, 0.0, 1.0) probe (0, 0, 640, 480) rgba (0.0, 1.0, 0.0, 1.0)
[vertex shader] [vertex shader]
struct ps_input struct ps_input
@ -136,7 +136,7 @@ shader model < 6.0
[test] [test]
draw triangle list 3 draw triangle list 3
todo(glsl) probe (0, 0, 640, 480) rgba (0.0, 1.0, 0.0, 1.0) probe (0, 0, 640, 480) rgba (0.0, 1.0, 0.0, 1.0)
% Centroid for SM 6. % Centroid for SM 6.
[require] [require]