wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-12-15 08:03:30 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/spirv: Pass a vsir_data_type to spirv_compiler_emit_interpolation_decorations().

Browse Source
This commit is contained in:
Henri Verbeet
2025-10-07 13:40:15 +02:00
parent 8bf97a27bf
commit d50503f116
Notes: Henri Verbeet 2025-10-08 13:50:55 +02:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1774
2 changed files with 5 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libs/vkd3d-shader/spirv.c
View File

@@ -5217,7 +5217,7 @@ static void spirv_compiler_decorate_builtin(struct spirv_compiler *compiler,
} }
static void spirv_compiler_emit_interpolation_decorations(struct spirv_compiler *compiler, static void spirv_compiler_emit_interpolation_decorations(struct spirv_compiler *compiler,
enum vkd3d_shader_component_type component_type, uint32_t id, enum vkd3d_shader_interpolation_mode mode) enum vsir_data_type data_type, uint32_t id, enum vkd3d_shader_interpolation_mode mode)
{ {
struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder;
@@ -5226,7 +5226,7 @@ static void spirv_compiler_emit_interpolation_decorations(struct spirv_compiler
case VKD3DSIM_NONE: case VKD3DSIM_NONE:
/* VUID-StandaloneSpirv-Flat-04744: integer or double types must be /* VUID-StandaloneSpirv-Flat-04744: integer or double types must be
* decorated 'Flat' for fragment shaders. */ * decorated 'Flat' for fragment shaders. */
if (compiler->shader_type != VKD3D_SHADER_TYPE_PIXEL || component_type == VKD3D_SHADER_COMPONENT_FLOAT) if (compiler->shader_type != VKD3D_SHADER_TYPE_PIXEL || data_type == VSIR_DATA_F32)
break; break;
/* fall through */ /* fall through */
case VKD3DSIM_CONSTANT: case VKD3DSIM_CONSTANT:
@@ -5712,7 +5712,6 @@ static void spirv_compiler_emit_input(struct spirv_compiler *compiler,
unsigned int component_idx, input_component_count; unsigned int component_idx, input_component_count;
const struct signature_element *signature_element; const struct signature_element *signature_element;
const struct shader_signature *shader_signature; const struct shader_signature *shader_signature;
enum vkd3d_shader_component_type component_type;
enum vkd3d_shader_register_type sysval_reg_type; enum vkd3d_shader_register_type sysval_reg_type;
const struct vkd3d_spirv_builtin *builtin; const struct vkd3d_spirv_builtin *builtin;
enum vkd3d_shader_sysval_semantic sysval; enum vkd3d_shader_sysval_semantic sysval;
@@ -5770,13 +5769,11 @@ static void spirv_compiler_emit_input(struct spirv_compiler *compiler,
if (builtin) if (builtin)
{ {
data_type = builtin->data_type; data_type = builtin->data_type;
component_type = vkd3d_component_type_from_data_type(data_type);
input_component_count = builtin->component_count; input_component_count = builtin->component_count;
} }
else else
{ {
component_type = signature_element->component_type; data_type = vsir_data_type_from_component_type(signature_element->component_type);
data_type = vsir_data_type_from_component_type(component_type);
input_component_count = vsir_write_mask_component_count(signature_element->mask); input_component_count = vsir_write_mask_component_count(signature_element->mask);
} }
@@ -5829,8 +5826,8 @@ static void spirv_compiler_emit_input(struct spirv_compiler *compiler,
if (component_idx) if (component_idx)
vkd3d_spirv_build_op_decorate1(builder, input_id, SpvDecorationComponent, component_idx); vkd3d_spirv_build_op_decorate1(builder, input_id, SpvDecorationComponent, component_idx);
spirv_compiler_emit_interpolation_decorations(compiler, component_type, input_id, spirv_compiler_emit_interpolation_decorations(compiler, data_type,
signature_element->interpolation_mode); input_id, signature_element->interpolation_mode);
} }
var_id = input_id; var_id = input_id;

36
libs/vkd3d-shader/vkd3d_shader_private.h
View File

@@ -1883,42 +1883,6 @@ int hlsl_parse(const struct vkd3d_shader_compile_info *compile_info,
struct vkd3d_shader_message_context *message_context, struct vkd3d_shader_message_context *message_context,
struct vsir_program *program, struct vkd3d_shader_code *reflection_data); struct vsir_program *program, struct vkd3d_shader_code *reflection_data);
static inline enum vkd3d_shader_component_type vkd3d_component_type_from_data_type( enum vsir_data_type data_type)
{
switch (data_type)
{
case VSIR_DATA_BOOL:
return VKD3D_SHADER_COMPONENT_BOOL;
case VSIR_DATA_F16:
return VKD3D_SHADER_COMPONENT_FLOAT16;
case VSIR_DATA_F32:
case VSIR_DATA_SNORM:
case VSIR_DATA_UNORM:
return VKD3D_SHADER_COMPONENT_FLOAT;
case VSIR_DATA_F64:
return VKD3D_SHADER_COMPONENT_DOUBLE;
case VSIR_DATA_I16:
return VKD3D_SHADER_COMPONENT_INT16;
case VSIR_DATA_I32:
return VKD3D_SHADER_COMPONENT_INT;
case VSIR_DATA_I64:
return VKD3D_SHADER_COMPONENT_INT64;
case VSIR_DATA_U16:
return VKD3D_SHADER_COMPONENT_UINT16;
case VSIR_DATA_U32:
return VKD3D_SHADER_COMPONENT_UINT;
case VSIR_DATA_U64:
return VKD3D_SHADER_COMPONENT_UINT64;
case VSIR_DATA_UNUSED:
return VKD3D_SHADER_COMPONENT_VOID;
default:
FIXME("Unhandled data type %#x.\n", data_type);
/* fall-through */
case VSIR_DATA_MIXED:
return VKD3D_SHADER_COMPONENT_UINT;
}
}
static inline enum vsir_data_type vsir_data_type_from_component_type(enum vkd3d_shader_component_type component_type) static inline enum vsir_data_type vsir_data_type_from_component_type(enum vkd3d_shader_component_type component_type)
{ {
switch (component_type) switch (component_type)