From 7181a9fa0e8141794e76d383b7747b5bb4216e1c Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Mon, 5 Mar 2018 10:28:03 -0700 Subject: [PATCH] tgsi,softpipe: use enum tgsi_opcode Reviewed-by: Eric Anholt --- src/gallium/auxiliary/tgsi/tgsi_exec.h | 4 ++-- src/gallium/drivers/softpipe/sp_buffer.c | 4 ++-- src/gallium/drivers/softpipe/sp_image.c | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/gallium/auxiliary/tgsi/tgsi_exec.h b/src/gallium/auxiliary/tgsi/tgsi_exec.h index ad920dcf168..0fac7ea4567 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_exec.h +++ b/src/gallium/auxiliary/tgsi/tgsi_exec.h @@ -134,7 +134,7 @@ struct tgsi_image { void (*op)(const struct tgsi_image *image, const struct tgsi_image_params *params, - unsigned opcode, + enum tgsi_opcode opcode, const int s[TGSI_QUAD_SIZE], const int t[TGSI_QUAD_SIZE], const int r[TGSI_QUAD_SIZE], @@ -167,7 +167,7 @@ struct tgsi_buffer { void (*op)(const struct tgsi_buffer *buffer, const struct tgsi_buffer_params *params, - unsigned opcode, + enum tgsi_opcode opcode, const int s[TGSI_QUAD_SIZE], float rgba[TGSI_NUM_CHANNELS][TGSI_QUAD_SIZE], float rgba2[TGSI_NUM_CHANNELS][TGSI_QUAD_SIZE]); diff --git a/src/gallium/drivers/softpipe/sp_buffer.c b/src/gallium/drivers/softpipe/sp_buffer.c index 69a6bd18c3b..e91d2af78e9 100644 --- a/src/gallium/drivers/softpipe/sp_buffer.c +++ b/src/gallium/drivers/softpipe/sp_buffer.c @@ -159,7 +159,7 @@ handle_op_uint(const struct pipe_shader_buffer *bview, bool just_read, unsigned char *data_ptr, uint qi, - unsigned opcode, + enum tgsi_opcode opcode, unsigned writemask, float rgba[TGSI_NUM_CHANNELS][TGSI_QUAD_SIZE], float rgba2[TGSI_NUM_CHANNELS][TGSI_QUAD_SIZE]) @@ -281,7 +281,7 @@ handle_op_uint(const struct pipe_shader_buffer *bview, static void sp_tgsi_op(const struct tgsi_buffer *buffer, const struct tgsi_buffer_params *params, - unsigned opcode, + enum tgsi_opcode opcode, const int s[TGSI_QUAD_SIZE], float rgba[TGSI_NUM_CHANNELS][TGSI_QUAD_SIZE], float rgba2[TGSI_NUM_CHANNELS][TGSI_QUAD_SIZE]) diff --git a/src/gallium/drivers/softpipe/sp_image.c b/src/gallium/drivers/softpipe/sp_image.c index d5547e294ab..49b775cf0cc 100644 --- a/src/gallium/drivers/softpipe/sp_image.c +++ b/src/gallium/drivers/softpipe/sp_image.c @@ -384,7 +384,7 @@ handle_op_uint(const struct pipe_image_view *iview, char *data_ptr, uint qi, unsigned stride, - unsigned opcode, + enum tgsi_opcode opcode, int s, int t, float rgba[TGSI_NUM_CHANNELS][TGSI_QUAD_SIZE], @@ -501,7 +501,7 @@ handle_op_int(const struct pipe_image_view *iview, char *data_ptr, uint qi, unsigned stride, - unsigned opcode, + enum tgsi_opcode opcode, int s, int t, float rgba[TGSI_NUM_CHANNELS][TGSI_QUAD_SIZE], @@ -615,7 +615,7 @@ handle_op_r32f_xchg(const struct pipe_image_view *iview, char *data_ptr, uint qi, unsigned stride, - unsigned opcode, + enum tgsi_opcode opcode, int s, int t, float rgba[TGSI_NUM_CHANNELS][TGSI_QUAD_SIZE]) @@ -649,7 +649,7 @@ handle_op_r32f_xchg(const struct pipe_image_view *iview, static void sp_tgsi_op(const struct tgsi_image *image, const struct tgsi_image_params *params, - unsigned opcode, + enum tgsi_opcode opcode, const int s[TGSI_QUAD_SIZE], const int t[TGSI_QUAD_SIZE], const int r[TGSI_QUAD_SIZE], -- 2.30.2