From 3fbbc681609498e7538b7303c5c3d92a8d5ff475 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B3zef=20Kucia?= <jkucia@codeweavers.com>
Date: Wed, 20 Feb 2019 13:42:48 +0100
Subject: [PATCH] vkd3d-shader: Replace VKD3DSIH_TABLE_SIZE with
 VKD3DSIH_INVALID.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 libs/vkd3d-shader/dxbc.c                 | 10 +++++-----
 libs/vkd3d-shader/trace.c                |  2 +-
 libs/vkd3d-shader/vkd3d_shader_main.c    |  4 ++--
 libs/vkd3d-shader/vkd3d_shader_private.h |  3 ++-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c
index 0b5f7bc8..5e4babb1 100644
--- a/libs/vkd3d-shader/dxbc.c
+++ b/libs/vkd3d-shader/dxbc.c
@@ -545,7 +545,7 @@ static void shader_sm4_read_shader_data(struct vkd3d_shader_instruction *ins,
     if (icb_size % 4 || icb_size > MAX_IMMEDIATE_CONSTANT_BUFFER_SIZE)
     {
         FIXME("Unexpected immediate constant buffer size %u.\n", icb_size);
-        ins->handler_idx = VKD3DSIH_TABLE_SIZE;
+        ins->handler_idx = VKD3DSIH_INVALID;
         return;
     }
 
@@ -1689,7 +1689,7 @@ void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct vkd3d_sha
     if (!(opcode_info = get_opcode_info(opcode)))
     {
         FIXME("Unrecognized opcode %#x, opcode_token 0x%08x.\n", opcode, opcode_token);
-        ins->handler_idx = VKD3DSIH_TABLE_SIZE;
+        ins->handler_idx = VKD3DSIH_INVALID;
         *ptr += len;
         return;
     }
@@ -1733,7 +1733,7 @@ void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct vkd3d_sha
             if (!(shader_sm4_read_dst_param(priv, &p, *ptr, map_data_type(opcode_info->dst_info[i]),
                     &priv->dst_param[i])))
             {
-                ins->handler_idx = VKD3DSIH_TABLE_SIZE;
+                ins->handler_idx = VKD3DSIH_INVALID;
                 return;
             }
             priv->dst_param[i].modifiers |= instruction_dst_modifier;
@@ -1744,7 +1744,7 @@ void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct vkd3d_sha
             if (!(shader_sm4_read_src_param(priv, &p, *ptr, map_data_type(opcode_info->src_info[i]),
                     &priv->src_param[i])))
             {
-                ins->handler_idx = VKD3DSIH_TABLE_SIZE;
+                ins->handler_idx = VKD3DSIH_INVALID;
                 return;
             }
         }
@@ -1754,7 +1754,7 @@ void shader_sm4_read_instruction(void *data, const DWORD **ptr, struct vkd3d_sha
 
 fail:
     *ptr = priv->end;
-    ins->handler_idx = VKD3DSIH_TABLE_SIZE;
+    ins->handler_idx = VKD3DSIH_INVALID;
     return;
 }
 
diff --git a/libs/vkd3d-shader/trace.c b/libs/vkd3d-shader/trace.c
index cb7452bd..6375e714 100644
--- a/libs/vkd3d-shader/trace.c
+++ b/libs/vkd3d-shader/trace.c
@@ -1602,7 +1602,7 @@ void vkd3d_shader_trace(void *data)
         struct vkd3d_shader_instruction ins;
 
         shader_sm4_read_instruction(data, &ptr, &ins);
-        if (ins.handler_idx == VKD3DSIH_TABLE_SIZE)
+        if (ins.handler_idx == VKD3DSIH_INVALID)
         {
             WARN("Skipping unrecognized instruction.\n");
             shader_addline(&buffer, "<unrecognized instruction>\n");
diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c
index 6e6880c6..55cb56c2 100644
--- a/libs/vkd3d-shader/vkd3d_shader_main.c
+++ b/libs/vkd3d-shader/vkd3d_shader_main.c
@@ -175,7 +175,7 @@ int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc,
     {
         shader_sm4_read_instruction(parser.data, &parser.ptr, &instruction);
 
-        if (instruction.handler_idx == VKD3DSIH_TABLE_SIZE)
+        if (instruction.handler_idx == VKD3DSIH_INVALID)
         {
             WARN("Encountered unrecognized or invalid instruction.\n");
             vkd3d_dxbc_compiler_destroy(spirv_compiler);
@@ -305,7 +305,7 @@ int vkd3d_shader_scan_dxbc(const struct vkd3d_shader_code *dxbc,
     {
         shader_sm4_read_instruction(parser.data, &parser.ptr, &instruction);
 
-        if (instruction.handler_idx == VKD3DSIH_TABLE_SIZE)
+        if (instruction.handler_idx == VKD3DSIH_INVALID)
         {
             WARN("Encountered unrecognized or invalid instruction.\n");
             vkd3d_shader_parser_destroy(&parser);
diff --git a/libs/vkd3d-shader/vkd3d_shader_private.h b/libs/vkd3d-shader/vkd3d_shader_private.h
index 40d46b3b..6b095a9c 100644
--- a/libs/vkd3d-shader/vkd3d_shader_private.h
+++ b/libs/vkd3d-shader/vkd3d_shader_private.h
@@ -300,7 +300,8 @@ enum VKD3D_SHADER_INSTRUCTION_HANDLER
     VKD3DSIH_USHR,
     VKD3DSIH_UTOF,
     VKD3DSIH_XOR,
-    VKD3DSIH_TABLE_SIZE
+
+    VKD3DSIH_INVALID,
 };
 
 enum vkd3d_shader_register_type