=?UTF-8?Q?J=C3=B3zef=20Kucia=20?=: wined3d: Sort WINED3DSIH enum values.
Alexandre Julliard
julliard at winehq.org
Tue May 29 16:08:31 CDT 2018
Module: wine
Branch: master
Commit: 1dd33399db687d3de43f6b667f81fbbdec4334b1
URL: https://source.winehq.org/git/wine.git/?a=commit;h=1dd33399db687d3de43f6b667f81fbbdec4334b1
Author: Józef Kucia <jkucia at codeweavers.com>
Date: Tue May 29 12:22:32 2018 +0200
wined3d: Sort WINED3DSIH enum values.
Signed-off-by: Józef Kucia <jkucia at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/wined3d/arb_program_shader.c | 2 +-
dlls/wined3d/glsl_shader.c | 2 +-
dlls/wined3d/shader.c | 2 +-
dlls/wined3d/wined3d_private.h | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c
index 4fbb3a5..c05dca0 100644
--- a/dlls/wined3d/arb_program_shader.c
+++ b/dlls/wined3d/arb_program_shader.c
@@ -5084,7 +5084,6 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
/* WINED3DSIH_DSY */ shader_hw_dsy,
/* WINED3DSIH_DSY_COARSE */ NULL,
/* WINED3DSIH_DSY_FINE */ NULL,
- /* WINED3DSIH_EVAL_SAMPLE_INDEX */ NULL,
/* WINED3DSIH_ELSE */ shader_hw_else,
/* WINED3DSIH_EMIT */ NULL,
/* WINED3DSIH_EMIT_STREAM */ NULL,
@@ -5093,6 +5092,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL
/* WINED3DSIH_ENDREP */ shader_hw_endrep,
/* WINED3DSIH_ENDSWITCH */ NULL,
/* WINED3DSIH_EQ */ NULL,
+ /* WINED3DSIH_EVAL_SAMPLE_INDEX */ NULL,
/* WINED3DSIH_EXP */ shader_hw_scalar_op,
/* WINED3DSIH_EXPP */ shader_hw_scalar_op,
/* WINED3DSIH_F16TOF32 */ NULL,
diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c
index 0d0e25a..3692a27 100644
--- a/dlls/wined3d/glsl_shader.c
+++ b/dlls/wined3d/glsl_shader.c
@@ -11292,7 +11292,6 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
/* WINED3DSIH_DSY */ shader_glsl_map2gl,
/* WINED3DSIH_DSY_COARSE */ shader_glsl_map2gl,
/* WINED3DSIH_DSY_FINE */ shader_glsl_map2gl,
- /* WINED3DSIH_EVAL_SAMPLE_INDEX */ NULL,
/* WINED3DSIH_ELSE */ shader_glsl_else,
/* WINED3DSIH_EMIT */ shader_glsl_emit,
/* WINED3DSIH_EMIT_STREAM */ shader_glsl_emit,
@@ -11301,6 +11300,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB
/* WINED3DSIH_ENDREP */ shader_glsl_end,
/* WINED3DSIH_ENDSWITCH */ shader_glsl_end,
/* WINED3DSIH_EQ */ shader_glsl_relop,
+ /* WINED3DSIH_EVAL_SAMPLE_INDEX */ NULL,
/* WINED3DSIH_EXP */ shader_glsl_scalar_op,
/* WINED3DSIH_EXPP */ shader_glsl_expp,
/* WINED3DSIH_F16TOF32 */ shader_glsl_float16,
diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c
index 3a0a302..8a6307a 100644
--- a/dlls/wined3d/shader.c
+++ b/dlls/wined3d/shader.c
@@ -125,7 +125,6 @@ static const char * const shader_opcode_names[] =
/* WINED3DSIH_DSY */ "dsy",
/* WINED3DSIH_DSY_COARSE */ "deriv_rty_coarse",
/* WINED3DSIH_DSY_FINE */ "deriv_rty_fine",
- /* WINED3DSIH_EVAL_SAMPLE_INDEX */ "eval_sample_index",
/* WINED3DSIH_ELSE */ "else",
/* WINED3DSIH_EMIT */ "emit",
/* WINED3DSIH_EMIT_STREAM */ "emit_stream",
@@ -134,6 +133,7 @@ static const char * const shader_opcode_names[] =
/* WINED3DSIH_ENDREP */ "endrep",
/* WINED3DSIH_ENDSWITCH */ "endswitch",
/* WINED3DSIH_EQ */ "eq",
+ /* WINED3DSIH_EVAL_SAMPLE_INDEX */ "eval_sample_index",
/* WINED3DSIH_EXP */ "exp",
/* WINED3DSIH_EXPP */ "expp",
/* WINED3DSIH_F16TOF32 */ "f16tof32",
diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h
index c30bb13..33bc463 100644
--- a/dlls/wined3d/wined3d_private.h
+++ b/dlls/wined3d/wined3d_private.h
@@ -771,7 +771,6 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
WINED3DSIH_DSY,
WINED3DSIH_DSY_COARSE,
WINED3DSIH_DSY_FINE,
- WINED3DSIH_EVAL_SAMPLE_INDEX,
WINED3DSIH_ELSE,
WINED3DSIH_EMIT,
WINED3DSIH_EMIT_STREAM,
@@ -780,6 +779,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER
WINED3DSIH_ENDREP,
WINED3DSIH_ENDSWITCH,
WINED3DSIH_EQ,
+ WINED3DSIH_EVAL_SAMPLE_INDEX,
WINED3DSIH_EXP,
WINED3DSIH_EXPP,
WINED3DSIH_F16TOF32,
More information about the wine-cvs
mailing list