draw: corrections to allow for different cliptest cases

[mesa.git] / src / gallium / drivers / r600 / r600_context.h

diff --git a/src/gallium/drivers/r600/r600_context.h b/src/gallium/drivers/r600/r600_context.h
index c15e64329d8018ad5baefb5e5baeae30c51e6661..d104531d365688d2f8e31515a855d2f24d0489ba 100644 (file)
--- a/src/gallium/drivers/r600/r600_context.h
+++ b/src/gallium/drivers/r600/r600_context.h
@@ -198,10 +198,14 @@ extern struct r600_context_hw_state_vtbl eg_hw_state_vtbl;
 
 struct r600_context {
        struct pipe_context             context;
+       struct blitter_context          *blitter;
+       struct pipe_framebuffer_state   *pframebuffer;
+       unsigned                        family;
+       void                            *custom_dsa_flush;
+       struct list_head                query_list;
        struct r600_screen              *screen;
        struct radeon                   *rw;
        struct radeon_ctx               *ctx;
-       struct blitter_context          *blitter;
        struct radeon_draw              draw;
        struct r600_context_hw_state_vtbl *vtbl;
        struct radeon_state             config;
@@ -238,14 +242,11 @@ struct r600_context {
        struct pipe_vertex_buffer       vertex_buffer[PIPE_MAX_ATTRIBS];
        struct pipe_index_buffer        index_buffer;
        struct pipe_blend_color         blend_color;
-       struct list_head                query_list;
 
        /* upload managers */
        struct u_upload_mgr *upload_vb;
        struct u_upload_mgr *upload_ib;
        bool any_user_vbs;
-
-       void *custom_dsa_flush;
 };
 
 /* Convenience cast wrapper. */
@@ -279,6 +280,7 @@ extern int r600_pipe_shader_create(struct pipe_context *ctx,
                        const struct tgsi_token *tokens);
 extern int r600_pipe_shader_update(struct pipe_context *ctx,
                                struct r600_context_state *rstate);
+extern int r600_find_vs_semantic_index(struct r600_context *rctx, struct r600_shader *rshader, int id);
 
 #define R600_ERR(fmt, args...) \
        fprintf(stderr, "EE %s/%s:%d - "fmt, __FILE__, __func__, __LINE__, ##args)