summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/r600/r600_pipe.h
diff options
context:
space:
mode:
authorConstantine Kharlamov <[email protected]>2017-04-02 20:33:04 +0300
committerMarek Olšák <[email protected]>2017-04-04 22:15:47 +0200
commitfa8bc90990212ac213355140e59a57df655efb73 (patch)
treef27c7c472183055cf712c23d00b9f18ad66c6cf2 /src/gallium/drivers/r600/r600_pipe.h
parentef62a7651cb8cbf54dab26305fb2cd5dcfcba9f7 (diff)
r600g/radeonsi: use the correct types (taken from pipe_draw_info)
Note: si_shader.h has also "type" variable that should be changed to "enum pipe_prim_type", however it triggers a bunch of warnings about unhandled switches, so due not knowing the correct way to handle them, I decided to leave it as is. Signed-off-by: Constantine Kharlamov <[email protected]> Signed-off-by: Marek Olšák <[email protected]> Tested-by: Dieter Nützel <[email protected]>
Diffstat (limited to 'src/gallium/drivers/r600/r600_pipe.h')
-rw-r--r--src/gallium/drivers/r600/r600_pipe.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h
index a7b7276732c..a05d543f0d1 100644
--- a/src/gallium/drivers/r600/r600_pipe.h
+++ b/src/gallium/drivers/r600/r600_pipe.h
@@ -29,6 +29,7 @@
#include "radeon/r600_pipe_common.h"
#include "radeon/r600_cs.h"
#include "r600_public.h"
+#include "pipe/p_defines.h"
#include "util/u_suballoc.h"
#include "util/list.h"
@@ -318,8 +319,7 @@ struct r600_pipe_shader_selector {
unsigned num_shaders;
- /* PIPE_SHADER_[VERTEX|FRAGMENT|...] */
- unsigned type;
+ enum pipe_shader_type type;
/* geometry shader properties */
unsigned gs_output_prim;
@@ -511,8 +511,8 @@ struct r600_context {
struct pipe_index_buffer index_buffer;
/* Last draw state (-1 = unset). */
- int last_primitive_type; /* Last primitive type used in draw_vbo. */
- int last_start_instance;
+ enum pipe_prim_type last_primitive_type; /* Last primitive type used in draw_vbo. */
+ unsigned last_start_instance;
void *sb_context;
struct r600_isa *isa;