r600g: hide radeon_ctx inside winsys.

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

diff --git a/src/gallium/drivers/r600/radeon.h b/src/gallium/drivers/r600/radeon.h
index 5759f363ead9fe1e776701014e131c73f5aeef61..12e8b993c8fed2d399f98b63dc111752440c38ec 100644 (file)
--- a/src/gallium/drivers/r600/radeon.h
+++ b/src/gallium/drivers/r600/radeon.h
@@ -161,18 +161,9 @@ struct radeon_cs_reloc {
 };
 #pragma pack()
 
-struct radeon_ctx {
-       struct radeon                   *radeon;
-       u32                             *pm4;
-       int                             cdwords;
-       int                             ndwords;
-       unsigned                        nreloc;
-       struct radeon_cs_reloc          *reloc;
-       unsigned                        nbo;
-       struct radeon_bo                **bo;
-};
+struct radeon_ctx;
 
-int radeon_ctx_init(struct radeon_ctx *ctx, struct radeon *radeon);
+struct radeon_ctx *radeon_ctx_init(struct radeon *radeon);
 void radeon_ctx_fini(struct radeon_ctx *ctx);
 void radeon_ctx_clear(struct radeon_ctx *ctx);
 int radeon_ctx_set_draw(struct radeon_ctx *ctx, struct radeon_draw *draw);
@@ -214,9 +205,11 @@ enum r600_stype {
        R600_STATE_DRAW,
        R600_STATE_CB_FLUSH,
        R600_STATE_DB_FLUSH,
+       R600_STATE_MAX,
 };
 
 #include "r600_states_inc.h"
+#include "eg_states_inc.h"
 
 /* R600 QUERY BEGIN/END */
 #define R600_QUERY__OFFSET                     0