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 BlendState variables.

Browse Source
This commit is contained in:
Nikolay Sivov 2024-08-07 12:59:24 +02:00 committed by Henri Verbeet
parent 91e88fac2e
commit f1e65ecc83
Notes: Henri Verbeet 2024-08-12 14:30:49 +02:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/989
3 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -205,6 +205,7 @@ struct fx_write_context
uint32_t sampler_state_count; uint32_t sampler_state_count;
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;
int status; int status;
bool child_effect; bool child_effect;
@ -755,6 +756,10 @@ static uint32_t write_fx_4_type(const struct hlsl_type *type, struct fx_write_co
{ {
put_u32_unaligned(buffer, 3); put_u32_unaligned(buffer, 3);
} }
else if (type->class == HLSL_CLASS_BLEND_STATE)
{
put_u32_unaligned(buffer, 2);
}
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);
@ -2082,6 +2087,11 @@ static void write_fx_4_object_variable(struct hlsl_ir_var *var, struct fx_write_
fx->rasterizer_state_count += elements_count; fx->rasterizer_state_count += elements_count;
break; break;
case HLSL_CLASS_BLEND_STATE:
write_fx_4_state_object_initializer(var, fx);
fx->blend_state_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);
@ -2183,6 +2193,7 @@ static bool is_supported_object_variable(const struct hlsl_ctx *ctx, const struc
case HLSL_CLASS_RENDER_TARGET_VIEW: case HLSL_CLASS_RENDER_TARGET_VIEW:
case HLSL_CLASS_SAMPLER: case HLSL_CLASS_SAMPLER:
case HLSL_CLASS_TEXTURE: case HLSL_CLASS_TEXTURE:
case HLSL_CLASS_BLEND_STATE:
return true; return true;
case HLSL_CLASS_COMPUTE_SHADER: case HLSL_CLASS_COMPUTE_SHADER:
case HLSL_CLASS_DOMAIN_SHADER: case HLSL_CLASS_DOMAIN_SHADER:
@ -2253,7 +2264,7 @@ static int hlsl_fx_4_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out)
put_u32(&buffer, 0); /* String count. */ put_u32(&buffer, 0); /* 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, 0); /* Blend state count. */ put_u32(&buffer, fx.blend_state_count);
put_u32(&buffer, fx.rasterizer_state_count); put_u32(&buffer, fx.rasterizer_state_count);
put_u32(&buffer, fx.sampler_state_count); put_u32(&buffer, fx.sampler_state_count);
put_u32(&buffer, fx.rtv_count); put_u32(&buffer, fx.rtv_count);
@ -2311,7 +2322,7 @@ static int hlsl_fx_5_write(struct hlsl_ctx *ctx, struct vkd3d_shader_code *out)
put_u32(&buffer, 0); /* String count. */ put_u32(&buffer, 0); /* 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, 0); /* Blend state count. */ put_u32(&buffer, fx.blend_state_count);
put_u32(&buffer, fx.rasterizer_state_count); put_u32(&buffer, fx.rasterizer_state_count);
put_u32(&buffer, fx.sampler_state_count); put_u32(&buffer, fx.sampler_state_count);
put_u32(&buffer, fx.rtv_count); put_u32(&buffer, fx.rtv_count);

3
tests/hlsl/effect-variables-fx_4.shader_test
View File

@ -40,3 +40,6 @@ SamplerState sampler7 { Texture = t7; };
SamplerState sampler8 { Texture = t8; }; SamplerState sampler8 { Texture = t8; };
SamplerState sampler9 { Texture = t9; }; SamplerState sampler9 { Texture = t9; };
SamplerState sampler10 { Texture = t10; }; SamplerState sampler10 { Texture = t10; };
[effect]
BlendState bs;

3
tests/hlsl/effect-variables-fx_5.shader_test
View File

@ -40,3 +40,6 @@ SamplerState sampler7 { Texture = t7; };
SamplerState sampler8 { Texture = t8; }; SamplerState sampler8 { Texture = t8; };
SamplerState sampler9 { Texture = t9; }; SamplerState sampler9 { Texture = t9; };
SamplerState sampler10 { Texture = t10; }; SamplerState sampler10 { Texture = t10; };
[effect]
BlendState bs;