radeonsi: inline util_blitter_copy_texture

[mesa.git] / src / gallium / drivers / radeonsi / si_state.h

diff --git a/src/gallium/drivers/radeonsi/si_state.h b/src/gallium/drivers/radeonsi/si_state.h
index f7082f5df43307637f6c07ad66dcd4557887a638..fbc0d231226d3e18cb8d9581da160ea02f042089 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_state.h
+++ b/src/gallium/drivers/radeonsi/si_state.h
@@ -115,10 +115,10 @@ union si_state {
 #define NUM_SAMPLER_STATES     NUM_TEX_UNITS
 
 #define NUM_PIPE_CONST_BUFFERS 16
-#define SI_RING_ESGS           17
-#define SI_RING_GSVS           18
-#define NUM_CONST_BUFFERS      (SI_RING_GSVS + 1)
+#define NUM_CONST_BUFFERS      (NUM_PIPE_CONST_BUFFERS + 1)
 
+#define SI_RING_ESGS           0
+#define SI_RING_GSVS           1
 
 /* This represents resource descriptors in memory, such as buffer resources,
  * image resources, and sampler states.
@@ -217,7 +217,6 @@ void si_upload_const_buffer(struct si_context *sctx, struct r600_resource **rbuf
 
 /* si_state.c */
 struct si_pipe_shader_selector;
-struct si_surface;
 
 boolean si_is_format_supported(struct pipe_screen *screen,
                                enum pipe_format format,