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/fx: Accept texture types when writing fx_2_0 effects.

Browse Source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
This commit is contained in:
Nikolay Sivov 2024-03-19 10:46:31 +01:00 committed by Alexandre Julliard
parent b09f919673
commit b382d1843d
Notes: Alexandre Julliard 2024-03-27 23:07:48 +01:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Zebediah Figura (@zfigura)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/729
2 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
libs/vkd3d-shader/fx.c
View File

@ -649,6 +649,7 @@ static uint32_t write_fx_2_parameter(const struct hlsl_type *type, const char *n
case HLSL_TYPE_INT: case HLSL_TYPE_INT:
case HLSL_TYPE_UINT: case HLSL_TYPE_UINT:
case HLSL_TYPE_VOID: case HLSL_TYPE_VOID:
case HLSL_TYPE_TEXTURE:
break; break;
default: default:
hlsl_fixme(ctx, &ctx->location, "Writing parameter type %u is not implemented.", hlsl_fixme(ctx, &ctx->location, "Writing parameter type %u is not implemented.",
@ -772,6 +773,46 @@ static uint32_t write_fx_2_initial_value(const struct hlsl_ir_var *var, struct f
return offset; return offset;
} }
static bool is_type_supported_fx_2(const struct hlsl_type *type)
{
type = hlsl_get_multiarray_element_type(type);
if (type->class == HLSL_CLASS_STRUCT)
return true;
switch (type->base_type)
{
case HLSL_TYPE_FLOAT:
case HLSL_TYPE_HALF:
case HLSL_TYPE_DOUBLE:
case HLSL_TYPE_INT:
case HLSL_TYPE_UINT:
case HLSL_TYPE_BOOL:
case HLSL_TYPE_PIXELSHADER:
case HLSL_TYPE_VERTEXSHADER:
case HLSL_TYPE_STRING:
return true;
case HLSL_TYPE_TEXTURE:
case HLSL_TYPE_SAMPLER:
switch (type->sampler_dim)
{
case HLSL_SAMPLER_DIM_1D:
case HLSL_SAMPLER_DIM_2D:
case HLSL_SAMPLER_DIM_3D:
case HLSL_SAMPLER_DIM_CUBE:
case HLSL_SAMPLER_DIM_GENERIC:
return true;
default:
;
}
break;
default:
return false;
}
return false;
}
static void write_fx_2_parameters(struct fx_write_context *fx) static void write_fx_2_parameters(struct fx_write_context *fx)
{ {
struct vkd3d_bytecode_buffer *buffer = &fx->structured; struct vkd3d_bytecode_buffer *buffer = &fx->structured;
@ -785,6 +826,9 @@ static void write_fx_2_parameters(struct fx_write_context *fx)
LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry) LIST_FOR_EACH_ENTRY(var, &ctx->extern_vars, struct hlsl_ir_var, extern_entry)
{ {
if (!is_type_supported_fx_2(var->data_type))
continue;
desc_offset = write_fx_2_parameter(var->data_type, var->name, &var->semantic, fx); desc_offset = write_fx_2_parameter(var->data_type, var->name, &var->semantic, fx);
value_offset = write_fx_2_initial_value(var, fx); value_offset = write_fx_2_initial_value(var, fx);

13
tests/hlsl/effect-variables-fx_2.shader_test
View File

@ -11,3 +11,16 @@ uint _uint;
technique technique
{ {
} }
[effect]
Texture tex1;
texture tex2;
teXture tex3;
Texture2DMS<float4, 4> tex4;
Texture1D tex5;
Texture2D tex6;
Texture3D tex7;
technique
{
}