vkd3d-shader: Introduce shader_sm4_reset().

This allows us to drop the "ptr" argument to various functions.

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet
2021-09-02 14:35:54 +02:00
committed by Alexandre Julliard
parent 26009069dd
commit 4509f089e5
5 changed files with 33 additions and 25 deletions

View File

@@ -1781,7 +1781,6 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(struct vkd3d_shader_parser *parser,
struct vkd3d_string_buffer *buffer;
unsigned int indent, i;
const char *indent_str;
const DWORD *ptr;
void *code;
static const struct vkd3d_d3d_asm_colours no_colours =
@@ -1831,17 +1830,17 @@ enum vkd3d_result vkd3d_dxbc_binary_to_text(struct vkd3d_shader_parser *parser,
vkd3d_string_buffer_init(buffer);
shader_version = &compiler.shader_version;
shader_sm4_read_header(parser, &ptr, shader_version);
shader_sm4_read_header(parser, shader_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_version->minor, compiler.colours.reset);
indent = 0;
while (!shader_sm4_is_end(parser, &ptr))
while (!shader_sm4_is_end(parser))
{
struct vkd3d_shader_instruction ins;
shader_sm4_read_instruction(parser, &ptr, &ins);
shader_sm4_read_instruction(parser, &ins);
if (ins.handler_idx == VKD3DSIH_INVALID)
{
WARN("Skipping unrecognized instruction.\n");