Merge remote branch 'origin/master' into nv50-compiler

[mesa.git] / src / gallium / winsys / r600 / drm / radeon_priv.h

diff --git a/src/gallium/winsys/r600/drm/radeon_priv.h b/src/gallium/winsys/r600/drm/radeon_priv.h
index 66ee5f21771dbcb50e2f6ac80961c487f14c64cb..84e552ba4d3b1c2b766a28c2f095e8bcc3b536d8 100644 (file)
--- a/src/gallium/winsys/r600/drm/radeon_priv.h
+++ b/src/gallium/winsys/r600/drm/radeon_priv.h
@@ -38,19 +38,19 @@ struct radeon_register {
 };
 
 struct radeon_sub_type {
-       int shader_type;
-       const struct radeon_register *regs;
-       unsigned nstates;
+       int                             shader_type;
+       const struct radeon_register    *regs;
+       unsigned                        nstates;
 };
 
 struct radeon_stype_info {
-       unsigned stype;
-       unsigned num;
-       unsigned stride;
-       radeon_state_pm4_t pm4;
-       struct radeon_sub_type reginfo[R600_SHADER_MAX];
-       unsigned base_id;
-       unsigned npm4;
+       unsigned                        stype;
+       unsigned                        num;
+       unsigned                        stride;
+       radeon_state_pm4_t              pm4;
+       struct radeon_sub_type          reginfo[R600_SHADER_MAX];
+       unsigned                        base_id;
+       unsigned                        npm4;
 };
 
 struct radeon {
@@ -58,9 +58,10 @@ struct radeon {
        int                             refcount;
        unsigned                        device;
        unsigned                        family;
-       unsigned                        nstate;
-       unsigned                        nstype;
-       struct radeon_stype_info *stype;
+       unsigned                        nstype;
+       unsigned                        nstate_per_shader;
+       unsigned                        *state_type_id;
+       struct radeon_stype_info        *stype;
 };
 
 extern struct radeon *radeon_new(int fd, unsigned device);
@@ -69,12 +70,6 @@ extern struct radeon *radeon_decref(struct radeon *radeon);
 extern unsigned radeon_family_from_device(unsigned device);
 extern int radeon_is_family_compatible(unsigned family1, unsigned family2);
 
-int radeon_ctx_set_bo_new(struct radeon_ctx *ctx, struct radeon_bo *bo);
-struct radeon_bo *radeon_ctx_get_bo(struct radeon_ctx *ctx, unsigned reloc);
-void radeon_ctx_get_placement(struct radeon_ctx *ctx, unsigned reloc, u32 *placement);
-int radeon_ctx_set_draw_new(struct radeon_ctx *ctx, struct radeon_draw *draw);
-int radeon_ctx_draw(struct radeon_ctx *ctx);
-
 /*
  * r600/r700 context functions
  */