wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-09-12 18:50:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/fx: Use more generic names for the literal constant array.

Browse Source 
It's going to be reused for 64-bit floats too.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
This commit is contained in:
Nikolay Sivov
2025-06-07 20:17:06 +02:00
committed by Henri Verbeet
parent f525399545
commit b098af3ef8
Notes: Henri Verbeet 2025-06-11 20:37:36 +02:00 
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1559
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4823,8 +4823,11 @@ struct fxlvm_code
const uint32_t *ptr, *end; const uint32_t *ptr, *end;
bool failed; bool failed;
const float *cli4; union
uint32_t cli4_count; {
const float *_4;
} cli;
uint32_t cli_count;
const struct fx_4_ctab_entry *constants; const struct fx_4_ctab_entry *constants;
uint32_t ctab_offset; uint32_t ctab_offset;
@@ -4906,7 +4909,7 @@ static void fx_print_fxlc_argument(struct fx_parser *parser, const struct fxlc_a
{ {
case FX_FXLC_REG_LITERAL: case FX_FXLC_REG_LITERAL:
count = code->scalar ? 1 : code->comp_count; count = code->scalar ? 1 : code->comp_count;
if (arg->address >= code->cli4_count || count > code->cli4_count - arg->address) if (arg->address >= code->cli_count || count > code->cli_count - arg->address)
{ {
vkd3d_string_buffer_printf(&parser->buffer, "(<out-of-bounds>)"); vkd3d_string_buffer_printf(&parser->buffer, "(<out-of-bounds>)");
parser->failed = true; parser->failed = true;
@@ -4914,11 +4917,11 @@ static void fx_print_fxlc_argument(struct fx_parser *parser, const struct fxlc_a
} }
vkd3d_string_buffer_printf(&parser->buffer, "("); vkd3d_string_buffer_printf(&parser->buffer, "(");
vkd3d_string_buffer_print_f32(&parser->buffer, code->cli4[arg->address]); vkd3d_string_buffer_print_f32(&parser->buffer, code->cli._4[arg->address]);
for (unsigned int i = 1; i < code->comp_count; ++i) for (unsigned int i = 1; i < code->comp_count; ++i)
{ {
vkd3d_string_buffer_printf(&parser->buffer, ", "); vkd3d_string_buffer_printf(&parser->buffer, ", ");
vkd3d_string_buffer_print_f32(&parser->buffer, code->cli4[arg->address + (code->scalar ? 0 : i)]); vkd3d_string_buffer_print_f32(&parser->buffer, code->cli._4[arg->address + (code->scalar ? 0 : i)]);
} }
vkd3d_string_buffer_printf(&parser->buffer, ")"); vkd3d_string_buffer_printf(&parser->buffer, ")");
break; break;
@@ -5040,8 +5043,8 @@ static void fx_4_parse_fxlvm_expression(struct fx_parser *parser, uint32_t offse
{ {
uint32_t cli4_offset = offset + (size_t)cli4.data.code - (size_t)dxbc.code; uint32_t cli4_offset = offset + (size_t)cli4.data.code - (size_t)dxbc.code;
fx_parser_read_unstructured(parser, &code.cli4_count, cli4_offset, sizeof(code.cli4_count)); fx_parser_read_unstructured(parser, &code.cli_count, cli4_offset, sizeof(code.cli_count));
code.cli4 = fx_parser_get_unstructured_ptr(parser, cli4_offset + 4, code.cli4_count * sizeof(float)); code.cli._4 = fx_parser_get_unstructured_ptr(parser, cli4_offset + 4, code.cli_count * sizeof(float));
} }
if (ctab.data.code) if (ctab.data.code)