wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/sm4: Get rid of the redundant "shader_version" field in the vkd3d_shader_sm4_parser structure.

Browse Source 
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2021-10-01 17:51:13 +02:00 committed by Alexandre Julliard
parent 3023d6ba46
commit 6be802ac1f
3 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,7 +87,6 @@ struct vkd3d_shader_src_param_entry
struct vkd3d_shader_sm4_parser struct vkd3d_shader_sm4_parser
{ {
struct vkd3d_shader_version shader_version;
const DWORD *start, *end; const DWORD *start, *end;
unsigned int output_map[MAX_REG_OUTPUT]; unsigned int output_map[MAX_REG_OUTPUT];
@ -170,9 +169,10 @@ static struct vkd3d_shader_sm4_parser *vkd3d_shader_sm4_parser(struct vkd3d_shad
return CONTAINING_RECORD(parser, struct vkd3d_shader_sm4_parser, p); return CONTAINING_RECORD(parser, struct vkd3d_shader_sm4_parser, p);
} }
static bool shader_is_sm_5_1(const struct vkd3d_shader_sm4_parser *priv) static bool shader_is_sm_5_1(const struct vkd3d_shader_sm4_parser *sm4)
{ {
const struct vkd3d_shader_version *version = &priv->shader_version; const struct vkd3d_shader_version *version = &sm4->p.shader_version;
return version->major >= 5 && version->minor >= 1; return version->major >= 5 && version->minor >= 1;
} }
@ -920,23 +920,23 @@ static const struct vkd3d_sm4_opcode_info *get_opcode_info(enum vkd3d_sm4_opcode
return NULL; return NULL;
} }
static void map_register(const struct vkd3d_shader_sm4_parser *priv, struct vkd3d_shader_register *reg) static void map_register(const struct vkd3d_shader_sm4_parser *sm4, struct vkd3d_shader_register *reg)
{ {
switch (priv->shader_version.type) switch (sm4->p.shader_version.type)
{ {
case VKD3D_SHADER_TYPE_PIXEL: case VKD3D_SHADER_TYPE_PIXEL:
if (reg->type == VKD3DSPR_OUTPUT) if (reg->type == VKD3DSPR_OUTPUT)
{ {
unsigned int reg_idx = reg->idx[0].offset; unsigned int reg_idx = reg->idx[0].offset;
if (reg_idx >= ARRAY_SIZE(priv->output_map)) if (reg_idx >= ARRAY_SIZE(sm4->output_map))
{ {
ERR("Invalid output index %u.\n", reg_idx); ERR("Invalid output index %u.\n", reg_idx);
break; break;
} }
reg->type = VKD3DSPR_COLOROUT; reg->type = VKD3DSPR_COLOROUT;
reg->idx[0].offset = priv->output_map[reg_idx]; reg->idx[0].offset = sm4->output_map[reg_idx];
} }
break; break;
@ -1000,34 +1000,35 @@ static bool shader_sm4_init(struct vkd3d_shader_sm4_parser *sm4, const uint32_t
switch (version_token >> 16) switch (version_token >> 16)
{ {
case VKD3D_SM4_PS: case VKD3D_SM4_PS:
sm4->shader_version.type = VKD3D_SHADER_TYPE_PIXEL; sm4->p.shader_version.type = VKD3D_SHADER_TYPE_PIXEL;
break; break;
case VKD3D_SM4_VS: case VKD3D_SM4_VS:
sm4->shader_version.type = VKD3D_SHADER_TYPE_VERTEX; sm4->p.shader_version.type = VKD3D_SHADER_TYPE_VERTEX;
break; break;
case VKD3D_SM4_GS: case VKD3D_SM4_GS:
sm4->shader_version.type = VKD3D_SHADER_TYPE_GEOMETRY; sm4->p.shader_version.type = VKD3D_SHADER_TYPE_GEOMETRY;
break; break;
case VKD3D_SM5_HS: case VKD3D_SM5_HS:
sm4->shader_version.type = VKD3D_SHADER_TYPE_HULL; sm4->p.shader_version.type = VKD3D_SHADER_TYPE_HULL;
break; break;
case VKD3D_SM5_DS: case VKD3D_SM5_DS:
sm4->shader_version.type = VKD3D_SHADER_TYPE_DOMAIN; sm4->p.shader_version.type = VKD3D_SHADER_TYPE_DOMAIN;
break; break;
case VKD3D_SM5_CS: case VKD3D_SM5_CS:
sm4->shader_version.type = VKD3D_SHADER_TYPE_COMPUTE; sm4->p.shader_version.type = VKD3D_SHADER_TYPE_COMPUTE;
break; break;
default: default:
FIXME("Unrecognised shader type %#x.\n", version_token >> 16); FIXME("Unrecognised shader type %#x.\n", version_token >> 16);
} }
sm4->shader_version.major = VKD3D_SM4_VERSION_MAJOR(version_token); sm4->p.shader_version.major = VKD3D_SM4_VERSION_MAJOR(version_token);
sm4->shader_version.minor = VKD3D_SM4_VERSION_MINOR(version_token); sm4->p.shader_version.minor = VKD3D_SM4_VERSION_MINOR(version_token);
sm4->p.ptr = sm4->start;
memset(sm4->output_map, 0xff, sizeof(sm4->output_map)); memset(sm4->output_map, 0xff, sizeof(sm4->output_map));
for (i = 0; i < output_signature->element_count; ++i) for (i = 0; i < output_signature->element_count; ++i)
@ -1087,14 +1088,6 @@ static struct vkd3d_shader_src_param *get_src_param(struct vkd3d_shader_sm4_pars
return &e->param; return &e->param;
} }
void shader_sm4_read_header(struct vkd3d_shader_parser *parser, struct vkd3d_shader_version *shader_version)
{
struct vkd3d_shader_sm4_parser *sm4 = vkd3d_shader_sm4_parser(parser);
parser->ptr = sm4->start;
*shader_version = sm4->shader_version;
}
static bool shader_sm4_read_reg_idx(struct vkd3d_shader_sm4_parser *priv, const uint32_t **ptr, static bool shader_sm4_read_reg_idx(struct vkd3d_shader_sm4_parser *priv, const uint32_t **ptr,
const uint32_t *end, uint32_t addressing, struct vkd3d_shader_register_index *reg_idx) const uint32_t *end, uint32_t addressing, struct vkd3d_shader_register_index *reg_idx)
{ {
@ -1702,7 +1695,6 @@ int vkd3d_shader_sm4_parser_create(const struct vkd3d_shader_compile_info *compi
return VKD3D_ERROR_INVALID_ARGUMENT; return VKD3D_ERROR_INVALID_ARGUMENT;
} }
shader_sm4_read_header(&sm4->p, &sm4->p.shader_version);
*parser = &sm4->p; *parser = &sm4->p;
return VKD3D_OK; return VKD3D_OK;

3
libs/vkd3d-shader/trace.c
View File

@ -1883,12 +1883,13 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(struct vkd3d_shader_parser *parser,
vkd3d_string_buffer_init(buffer); vkd3d_string_buffer_init(buffer);
shader_version = &compiler.shader_version; shader_version = &compiler.shader_version;
shader_sm4_read_header(parser, shader_version); *shader_version = parser->shader_version;
vkd3d_string_buffer_printf(buffer, "%s%s_%u_%u%s\n", compiler.colours.version, vkd3d_string_buffer_printf(buffer, "%s%s_%u_%u%s\n", compiler.colours.version,
shader_get_type_prefix(shader_version->type), shader_version->major, shader_get_type_prefix(shader_version->type), shader_version->major,
shader_version->minor, compiler.colours.reset); shader_version->minor, compiler.colours.reset);
indent = 0; indent = 0;
shader_sm4_reset(parser);
while (!shader_sm4_is_end(parser)) while (!shader_sm4_is_end(parser))
{ {
struct vkd3d_shader_instruction ins; struct vkd3d_shader_instruction ins;

1
libs/vkd3d-shader/vkd3d_shader_private.h
View File

@ -901,7 +901,6 @@ const char *shader_get_type_prefix(enum vkd3d_shader_type type);
struct vkd3d_shader_message_context; struct vkd3d_shader_message_context;
void shader_sm4_free(struct vkd3d_shader_parser *parser); void shader_sm4_free(struct vkd3d_shader_parser *parser);
void shader_sm4_read_header(struct vkd3d_shader_parser *parser, struct vkd3d_shader_version *shader_version);
void shader_sm4_read_instruction(struct vkd3d_shader_parser *parser, struct vkd3d_shader_instruction *ins); void shader_sm4_read_instruction(struct vkd3d_shader_parser *parser, struct vkd3d_shader_instruction *ins);
bool shader_sm4_is_end(struct vkd3d_shader_parser *parser); bool shader_sm4_is_end(struct vkd3d_shader_parser *parser);
void shader_sm4_reset(struct vkd3d_shader_parser *parser); void shader_sm4_reset(struct vkd3d_shader_parser *parser);