wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-04-13 05:43:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/fx: Fix const strings array types.

Browse Source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
This commit is contained in:
Nikolay Sivov
2025-03-03 19:17:23 +01:00
committed by Henri Verbeet
parent 1c43b7b55c
commit 871c9c61a5
Notes: Henri Verbeet 2025-03-05 14:16:22 +01:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1395
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2408,7 +2408,15 @@ static unsigned int decompose_fx_4_state_function_call(struct hlsl_ir_var *var,
static unsigned int decompose_fx_4_state_block_expand_array(struct hlsl_ir_var *var, struct hlsl_state_block *block, static unsigned int decompose_fx_4_state_block_expand_array(struct hlsl_ir_var *var, struct hlsl_state_block *block,
unsigned int entry_index, struct fx_write_context *fx) unsigned int entry_index, struct fx_write_context *fx)
{ {
static const char *states[] = { "SrcBlend", "DestBlend", "BlendOp", "SrcBlendAlpha", "DestBlendAlpha", "BlendOpAlpha" }; static const char *const states[] =
{
"SrcBlend",
"DestBlend",
"BlendOp",
"SrcBlendAlpha",
"DestBlendAlpha",
"BlendOpAlpha",
};
const struct hlsl_type *type = hlsl_get_multiarray_element_type(var->data_type); const struct hlsl_type *type = hlsl_get_multiarray_element_type(var->data_type);
struct hlsl_state_block_entry *entry = block->entries[entry_index]; struct hlsl_state_block_entry *entry = block->entries[entry_index];
static const unsigned int array_size = 8; static const unsigned int array_size = 8;
@@ -3979,7 +3987,7 @@ static void fx_4_parse_state_object_initializer(struct fx_parser *parser, uint32
float f; float f;
}; };
} value; } value;
static const char *value_types[FX_COMPONENT_TYPE_COUNT] = static const char *const value_types[FX_COMPONENT_TYPE_COUNT] =
{ {
[FX_BOOL] = "bool", [FX_BOOL] = "bool",
[FX_FLOAT] = "float", [FX_FLOAT] = "float",