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: Enable writing string objects for fx_4+.

Browse Source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
This commit is contained in:
Nikolay Sivov 2024-08-13 23:33:16 +02:00 committed by Henri Verbeet
parent 89be723ad7
commit d4ae844bb6
Notes: Henri Verbeet 2024-08-14 22:15:51 +02:00 
Approved-by: Elizabeth Figura (@zfigura)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/995
1 changed files with 39 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -206,6 +206,7 @@ struct fx_write_context
uint32_t depth_stencil_state_count; uint32_t depth_stencil_state_count;
uint32_t rasterizer_state_count; uint32_t rasterizer_state_count;
uint32_t blend_state_count; uint32_t blend_state_count;
uint32_t string_count;
int status; int status;
bool child_effect; bool child_effect;
@ -566,6 +567,9 @@ static const char * get_fx_4_type_name(const struct hlsl_type *type)
case HLSL_CLASS_PIXEL_SHADER: case HLSL_CLASS_PIXEL_SHADER:
return "PixelShader"; return "PixelShader";
case HLSL_CLASS_STRING:
return "String";
default: default:
return type->name; return type->name;
} }
@ -638,6 +642,7 @@ static uint32_t write_fx_4_type(const struct hlsl_type *type, struct fx_write_co
case HLSL_CLASS_HULL_SHADER: case HLSL_CLASS_HULL_SHADER:
case HLSL_CLASS_GEOMETRY_SHADER: case HLSL_CLASS_GEOMETRY_SHADER:
case HLSL_CLASS_BLEND_STATE: case HLSL_CLASS_BLEND_STATE:
case HLSL_CLASS_STRING:
put_u32_unaligned(buffer, 2); put_u32_unaligned(buffer, 2);
break; break;
@ -653,7 +658,6 @@ static uint32_t write_fx_4_type(const struct hlsl_type *type, struct fx_write_co
case HLSL_CLASS_NULL: case HLSL_CLASS_NULL:
vkd3d_unreachable(); vkd3d_unreachable();
case HLSL_CLASS_STRING:
case HLSL_CLASS_VOID: case HLSL_CLASS_VOID:
FIXME("Writing type class %u is not implemented.\n", type->class); FIXME("Writing type class %u is not implemented.\n", type->class);
set_status(fx, VKD3D_ERROR_NOT_IMPLEMENTED); set_status(fx, VKD3D_ERROR_NOT_IMPLEMENTED);
@ -761,6 +765,10 @@ static uint32_t write_fx_4_type(const struct hlsl_type *type, struct fx_write_co
{ {
put_u32_unaligned(buffer, 2); put_u32_unaligned(buffer, 2);
} }
else if (type->class == HLSL_CLASS_STRING)
{
put_u32_unaligned(buffer, 1);
}
else if (hlsl_is_numeric_type(type)) else if (hlsl_is_numeric_type(type))
{ {
numeric_desc = get_fx_4_numeric_type_description(type, fx); numeric_desc = get_fx_4_numeric_type_description(type, fx);
@ -1273,6 +1281,27 @@ static uint32_t write_fx_4_default_value(struct hlsl_type *value_type, struct hl
return offset; return offset;
} }
static void write_fx_4_string_initializer(struct hlsl_ir_var *var, struct fx_write_context *fx)
{
uint32_t elements_count = hlsl_get_multiarray_size(var->data_type), i;
const struct hlsl_default_value *value = var->default_values;
struct vkd3d_bytecode_buffer *buffer = &fx->structured;
struct hlsl_ctx *ctx = fx->ctx;
uint32_t offset;
if (!value)
{
hlsl_error(ctx, &var->loc, VKD3D_SHADER_ERROR_HLSL_INVALID_SYNTAX, "String objects have to be initialized.");
return;
}
for (i = 0; i < elements_count; ++i, ++value)
{
offset = write_fx_4_string(value->string, fx);
put_u32(buffer, offset);
}
}
static void write_fx_4_numeric_variable(struct hlsl_ir_var *var, bool shared, struct fx_write_context *fx) static void write_fx_4_numeric_variable(struct hlsl_ir_var *var, bool shared, struct fx_write_context *fx)
{ {
struct vkd3d_bytecode_buffer *buffer = &fx->structured; struct vkd3d_bytecode_buffer *buffer = &fx->structured;
@ -2239,6 +2268,11 @@ static void write_fx_4_object_variable(struct hlsl_ir_var *var, struct fx_write_
fx->blend_state_count += elements_count; fx->blend_state_count += elements_count;
break; break;
case HLSL_CLASS_STRING:
write_fx_4_string_initializer(var, fx);
fx->string_count += elements_count;
break;
default: default:
hlsl_fixme(ctx, &ctx->location, "Writing initializer for object class %u is not implemented.", hlsl_fixme(ctx, &ctx->location, "Writing initializer for object class %u is not implemented.",
type->class); type->class);
@ -2341,6 +2375,8 @@ static bool is_supported_object_variable(const struct hlsl_ctx *ctx, const struc
case HLSL_CLASS_SAMPLER: case HLSL_CLASS_SAMPLER:
case HLSL_CLASS_TEXTURE: case HLSL_CLASS_TEXTURE:
case HLSL_CLASS_BLEND_STATE: case HLSL_CLASS_BLEND_STATE:
case HLSL_CLASS_VERTEX_SHADER:
case HLSL_CLASS_STRING:
return true; return true;
case HLSL_CLASS_COMPUTE_SHADER: case HLSL_CLASS_COMPUTE_SHADER:
case HLSL_CLASS_DOMAIN_SHADER: case HLSL_CLASS_DOMAIN_SHADER:
@ -2354,8 +2390,6 @@ static bool is_supported_object_variable(const struct hlsl_ctx *ctx, const struc
if (type->e.resource.rasteriser_ordered) if (type->e.resource.rasteriser_ordered)
return false; return false;
return true; return true;
case HLSL_CLASS_VERTEX_SHADER:
return true;
default: default:
return false; return false;
@ -2408,7 +2442,7 @@ static int hlsl_fx_4_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out)
put_u32(&buffer, fx.shared_object_count); put_u32(&buffer, fx.shared_object_count);
put_u32(&buffer, fx.technique_count); put_u32(&buffer, fx.technique_count);
size_offset = put_u32(&buffer, 0); /* Unstructured size. */ size_offset = put_u32(&buffer, 0); /* Unstructured size. */
put_u32(&buffer, 0); /* String count. */ put_u32(&buffer, fx.string_count);
put_u32(&buffer, fx.texture_count); put_u32(&buffer, fx.texture_count);
put_u32(&buffer, fx.depth_stencil_state_count); put_u32(&buffer, fx.depth_stencil_state_count);
put_u32(&buffer, fx.blend_state_count); put_u32(&buffer, fx.blend_state_count);
@ -2466,7 +2500,7 @@ static int hlsl_fx_5_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out)
put_u32(&buffer, fx.shared_object_count); put_u32(&buffer, fx.shared_object_count);
put_u32(&buffer, fx.technique_count); put_u32(&buffer, fx.technique_count);
size_offset = put_u32(&buffer, 0); /* Unstructured size. */ size_offset = put_u32(&buffer, 0); /* Unstructured size. */
put_u32(&buffer, 0); /* String count. */ put_u32(&buffer, fx.string_count);
put_u32(&buffer, fx.texture_count); put_u32(&buffer, fx.texture_count);
put_u32(&buffer, fx.depth_stencil_state_count); put_u32(&buffer, fx.depth_stencil_state_count);
put_u32(&buffer, fx.blend_state_count); put_u32(&buffer, fx.blend_state_count);