r300, amd: Make everything build. (Not necessarily work, mind you.)

Lots of structural work, especially in getting the two parts to talk nicely.

Todo:
- Get damn blitter working.
- Add CS flush.
- Reverse order of above two items.

1 files changed, 4 insertions, 9 deletions

diff --git a/src/gallium/drivers/r300/r300_context.h b/src/gallium/drivers/r300/r300_context.h
index 8393198200..119d46af58 100644
--- a/src/gallium/drivers/r300/r300_context.h
+++ b/src/gallium/drivers/r300/r300_context.h
@@ -31,15 +31,10 @@ struct r300_context {
     /* Parent class */
     struct pipe_context context;
 
-    struct amd_winsys* winsys;
+    /* The interface to the windowing system, etc. */
+    struct r300_winsys* winsys;
+    /* Draw module. Used mostly for SW TCL. */
     struct draw_context* draw;
-
-    /* CS object. This is very much like Intel's batchbuffer.
-     * Fill it full of dwords and relocs and then submit.
-     * Repeat as needed. */
-    /* Note: Unlike Mesa's version of this, we don't keep a copy of the CSM
-     * that was used to create this CS. Is this a good idea? */
-    struct radeon_cs* cs;
 };
 
 /* Convenience cast wrapper. */
@@ -52,6 +47,6 @@ void r300_init_surface_functions(struct r300_context* r300);
 
 struct pipe_context* r300_create_context(struct pipe_screen* screen,
                                          struct pipe_winsys* winsys,
-                                         struct amd_winsys* amd_winsys);
+                                         struct r300_winsys* r300_winsys);
 
 #endif /* R300_CONTEXT_H */
\ No newline at end of file