Merge branch 'lp-offset-twoside'

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

diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h
index c46029a5617196fa885a4ed5ec736f6e1cc9e09d..ba9fedf0b6cf55fea3ce3f5d4d8c777b1203aa7b 100644 (file)
--- a/src/gallium/drivers/r600/r600_pipe.h
+++ b/src/gallium/drivers/r600/r600_pipe.h
@@ -30,6 +30,7 @@
 #include <pipe/p_screen.h>
 #include <pipe/p_context.h>
 #include <util/u_math.h>
+#include "translate/translate_cache.h"
 #include "r600.h"
 #include "r600_public.h"
 #include "r600_shader.h"
@@ -58,6 +59,7 @@ enum r600_pipe_state_id {
 struct r600_screen {
        struct pipe_screen              screen;
        struct radeon                   *radeon;
+       struct r600_tiling_info         *tiling_info;
 };
 
 struct r600_pipe_sampler_view {
@@ -81,17 +83,43 @@ struct r600_pipe_blend {
 struct r600_vertex_element
 {
        unsigned                        count;
-       unsigned                        refcount;
-       struct pipe_vertex_element      elements[32];
+       struct pipe_vertex_element      elements[PIPE_MAX_ATTRIBS];
+       enum pipe_format                hw_format[PIPE_MAX_ATTRIBS];
+       unsigned                        hw_format_size[PIPE_MAX_ATTRIBS];
+       boolean incompatible_layout;
 };
 
 struct r600_pipe_shader {
        struct r600_shader              shader;
        struct r600_pipe_state          rstate;
        struct r600_bo                  *bo;
+       struct r600_bo                  *bo_fetch;
        struct r600_vertex_element      vertex_elements;
 };
 
+/* needed for blitter save */
+#define NUM_TEX_UNITS 16
+
+struct r600_textures_info {
+       struct r600_pipe_sampler_view   *views[NUM_TEX_UNITS];
+       unsigned                        n_views;
+       void                            *samplers[NUM_TEX_UNITS];
+       unsigned                        n_samplers;
+};
+
+struct r600_translate_context {
+       /* Translate cache for incompatible vertex offset/stride/format fallback. */
+       struct translate_cache *translate_cache;
+
+       /* The vertex buffer slot containing the translated buffer. */
+       unsigned vb_slot;
+       /* Saved and new vertex element state. */
+       void *saved_velems, *new_velems;
+};
+
+#define R600_CONSTANT_ARRAY_SIZE 256
+#define R600_RESOURCE_ARRAY_SIZE 160
+
 struct r600_pipe_context {
        struct pipe_context             context;
        struct blitter_context          *blitter;
@@ -112,12 +140,8 @@ struct r600_pipe_context {
        struct pipe_stencil_ref         stencil_ref;
        struct pipe_viewport_state      viewport;
        struct pipe_clip_state          clip;
-       unsigned                        vs_nconst;
-       unsigned                        ps_nconst;
-       struct r600_pipe_state          vs_const[256];
-       struct r600_pipe_state          ps_const[256];
-       struct r600_pipe_state          vs_resource[160];
-       struct r600_pipe_state          ps_resource[160];
+       struct r600_pipe_state          *vs_resource;
+       struct r600_pipe_state          *ps_resource;
        struct r600_pipe_state          config;
        struct r600_pipe_shader         *ps_shader;
        struct r600_pipe_shader         *vs_shader;
@@ -130,6 +154,11 @@ struct r600_pipe_context {
        struct u_upload_mgr             *upload_vb;
        struct u_upload_mgr             *upload_ib;
        unsigned                        any_user_vbs;
+       struct r600_textures_info       ps_samplers;
+
+       unsigned vb_max_index;
+       struct r600_translate_context tran;
+
 };
 
 struct r600_drawl {
@@ -180,6 +209,7 @@ void r600_init_context_resource_functions(struct r600_pipe_context *r600);
 /* r600_shader.c */
 int r600_pipe_shader_update(struct pipe_context *ctx, struct r600_pipe_shader *shader);
 int r600_pipe_shader_create(struct pipe_context *ctx, struct r600_pipe_shader *shader, const struct tgsi_token *tokens);
+void r600_pipe_shader_destroy(struct pipe_context *ctx, struct r600_pipe_shader *shader);
 int r600_find_vs_semantic_index(struct r600_shader *vs,
                                struct r600_shader *ps, int id);
 
@@ -187,10 +217,6 @@ int r600_find_vs_semantic_index(struct r600_shader *vs,
 void r600_init_state_functions(struct r600_pipe_context *rctx);
 void r600_draw_vbo(struct pipe_context *ctx, const struct pipe_draw_info *info);
 void r600_init_config(struct r600_pipe_context *rctx);
-void r600_translate_index_buffer(struct r600_pipe_context *r600,
-                                       struct pipe_resource **index_buffer,
-                                       unsigned *index_size,
-                                       unsigned *start, unsigned count);
 void *r600_create_db_flush_dsa(struct r600_pipe_context *rctx);
 /* r600_helper.h */
 int r600_conv_pipe_prim(unsigned pprim, unsigned *prim);
@@ -201,6 +227,38 @@ uint32_t r600_translate_texformat(enum pipe_format format,
                                  const unsigned char *swizzle_view, 
                                  uint32_t *word4_p, uint32_t *yuv_format_p);
 
+/* r600_translate.c */
+void r600_begin_vertex_translate(struct r600_pipe_context *rctx);
+void r600_end_vertex_translate(struct r600_pipe_context *rctx);
+void r600_translate_index_buffer(struct r600_pipe_context *r600,
+                                struct pipe_resource **index_buffer,
+                                unsigned *index_size,
+                                unsigned *start, unsigned count);
+
+/* r600_state_common.c */
+void r600_set_index_buffer(struct pipe_context *ctx,
+                          const struct pipe_index_buffer *ib);
+void r600_set_vertex_buffers(struct pipe_context *ctx, unsigned count,
+                            const struct pipe_vertex_buffer *buffers);
+void *r600_create_vertex_elements(struct pipe_context *ctx,
+                                 unsigned count,
+                                 const struct pipe_vertex_element *elements);
+void r600_delete_vertex_element(struct pipe_context *ctx, void *state);
+void r600_bind_blend_state(struct pipe_context *ctx, void *state);
+void r600_bind_rs_state(struct pipe_context *ctx, void *state);
+void r600_delete_rs_state(struct pipe_context *ctx, void *state);
+void r600_sampler_view_destroy(struct pipe_context *ctx,
+                              struct pipe_sampler_view *state);
+void r600_bind_state(struct pipe_context *ctx, void *state);
+void r600_delete_state(struct pipe_context *ctx, void *state);
+void r600_bind_vertex_elements(struct pipe_context *ctx, void *state);
+
+void *r600_create_shader_state(struct pipe_context *ctx,
+                              const struct pipe_shader_state *state);
+void r600_bind_ps_shader(struct pipe_context *ctx, void *state);
+void r600_bind_vs_shader(struct pipe_context *ctx, void *state);
+void r600_delete_ps_shader(struct pipe_context *ctx, void *state);
+void r600_delete_vs_shader(struct pipe_context *ctx, void *state);
 /*
  * common helpers
  */