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: Give fxlvm-specific constants a version-neutral name.

Browse Source 
Those are reusable for fx_2_0 preshaders.

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
This commit is contained in:
Nikolay Sivov
2025-06-07 16:33:57 +02:00
committed by Henri Verbeet
parent 94cbb333f8
commit 47b9316a86
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 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,6 +54,19 @@ enum state_property_component_type
FX_COMPONENT_TYPE_COUNT, FX_COMPONENT_TYPE_COUNT,
}; };
enum fxlvm_constants
{
FX_FXLC_COMP_COUNT_MASK = 0xffff,
FX_FXLC_OPCODE_MASK = 0x7ff,
FX_FXLC_OPCODE_SHIFT = 20,
FX_FXLC_IS_SCALAR_MASK = 0x80000000,
FX_FXLC_REG_LITERAL = 1,
FX_FXLC_REG_CB = 2,
FX_FXLC_REG_OUTPUT = 4,
FX_FXLC_REG_TEMP = 7,
};
struct rhs_named_value struct rhs_named_value
{ {
const char *name; const char *name;
@@ -1079,17 +1092,6 @@ enum fx_4_type_constants
FX_4_ASSIGNMENT_VALUE_EXPRESSION = 0x6, FX_4_ASSIGNMENT_VALUE_EXPRESSION = 0x6,
FX_4_ASSIGNMENT_INLINE_SHADER = 0x7, FX_4_ASSIGNMENT_INLINE_SHADER = 0x7,
FX_5_ASSIGNMENT_INLINE_SHADER = 0x8, FX_5_ASSIGNMENT_INLINE_SHADER = 0x8,
/* FXLVM constants */
FX_4_FXLC_COMP_COUNT_MASK = 0xffff,
FX_4_FXLC_OPCODE_MASK = 0x7ff,
FX_4_FXLC_OPCODE_SHIFT = 20,
FX_4_FXLC_IS_SCALAR_MASK = 0x80000000,
FX_4_FXLC_REG_LITERAL = 1,
FX_4_FXLC_REG_CB = 2,
FX_4_FXLC_REG_OUTPUT = 4,
FX_4_FXLC_REG_TEMP = 7,
}; };
static const uint32_t fx_4_numeric_base_types[] = static const uint32_t fx_4_numeric_base_types[] =
@@ -4862,7 +4864,7 @@ static void fx_4_parse_fxlc_argument(struct fx_parser *parser, uint32_t offset,
switch (arg.reg_type) switch (arg.reg_type)
{ {
case FX_4_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->cli4_count || count > code->cli4_count - arg.address)
{ {
@@ -4881,13 +4883,13 @@ static void fx_4_parse_fxlc_argument(struct fx_parser *parser, uint32_t offset,
vkd3d_string_buffer_printf(&parser->buffer, ")"); vkd3d_string_buffer_printf(&parser->buffer, ")");
break; break;
case FX_4_FXLC_REG_CB: case FX_FXLC_REG_CB:
fx_4_parse_fxlc_constant_argument(parser, &arg, code); fx_4_parse_fxlc_constant_argument(parser, &arg, code);
break; break;
case FX_4_FXLC_REG_OUTPUT: case FX_FXLC_REG_OUTPUT:
case FX_4_FXLC_REG_TEMP: case FX_FXLC_REG_TEMP:
if (arg.reg_type == FX_4_FXLC_REG_OUTPUT) if (arg.reg_type == FX_FXLC_REG_OUTPUT)
vkd3d_string_buffer_printf(&parser->buffer, "expr"); vkd3d_string_buffer_printf(&parser->buffer, "expr");
else else
vkd3d_string_buffer_printf(&parser->buffer, "r%u", arg.address / 4); vkd3d_string_buffer_printf(&parser->buffer, "r%u", arg.address / 4);
@@ -4973,8 +4975,8 @@ static void fx_4_parse_fxlvm_expression(struct fx_parser *parser, uint32_t offse
offset = fx_parser_read_unstructured(parser, &instr, offset, sizeof(instr)); offset = fx_parser_read_unstructured(parser, &instr, offset, sizeof(instr));
offset = fx_parser_read_unstructured(parser, &src_count, offset, sizeof(src_count)); offset = fx_parser_read_unstructured(parser, &src_count, offset, sizeof(src_count));
opcode = (instr >> FX_4_FXLC_OPCODE_SHIFT) & FX_4_FXLC_OPCODE_MASK; opcode = (instr >> FX_FXLC_OPCODE_SHIFT) & FX_FXLC_OPCODE_MASK;
code.comp_count = instr & FX_4_FXLC_COMP_COUNT_MASK; code.comp_count = instr & FX_FXLC_COMP_COUNT_MASK;
code.scalar = false; code.scalar = false;
parse_fx_print_indent(parser); parse_fx_print_indent(parser);
@@ -4988,7 +4990,7 @@ static void fx_4_parse_fxlvm_expression(struct fx_parser *parser, uint32_t offse
vkd3d_string_buffer_printf(&parser->buffer, ", "); vkd3d_string_buffer_printf(&parser->buffer, ", ");
/* Scalar modifier applies only to first source. */ /* Scalar modifier applies only to first source. */
code.scalar = j == 0 && !!(instr & FX_4_FXLC_IS_SCALAR_MASK); code.scalar = j == 0 && !!(instr & FX_FXLC_IS_SCALAR_MASK);
fx_4_parse_fxlc_argument(parser, offset, &code); fx_4_parse_fxlc_argument(parser, offset, &code);
offset += sizeof(arg); offset += sizeof(arg);