gallium-r300: Look less like i915.

Todo:
- Figure out how much code goes in winsys.
- Make it build.
- Make it suck less.

2 files changed, 12 insertions, 4 deletions

diff --git a/src/gallium/drivers/r300/r300_context.c b/src/gallium/drivers/r300/r300_context.c
index a2ed0270cb..4aef5030fc 100644
--- a/src/gallium/drivers/r300/r300_context.c
+++ b/src/gallium/drivers/r300/r300_context.c
@@ -18,10 +18,10 @@ struct pipe_context* r300_create_context(struct pipe_screen* screen,
         return NULL;
 
     context->winsys = amd_winsys;
-    context->pipe.winsys = winsys;
-    context->pipe.screen = screen;
+    context->context.winsys = winsys;
+    context->context.screen = screen;
 
-    context->pipe.destroy = r300_destroy_context;
+    context->context.destroy = r300_destroy_context;
 
-    return &context->pipe;
+    return &context->context;
 }
\ No newline at end of file
diff --git a/src/gallium/drivers/r300/r300_context.h b/src/gallium/drivers/r300/r300_context.h
index 28363fd36c..fd344361d9 100644
--- a/src/gallium/drivers/r300/r300_context.h
+++ b/src/gallium/drivers/r300/r300_context.h
@@ -23,6 +23,14 @@
 #ifndef R300_CONTEXT_H
 #define R300_CONTEXT_H
 
+struct r300_context {
+    /* Parent class */
+    struct pipe_context context;
+
+    struct amd_winsys* winsys;
+    struct draw_context* draw;
+}
+
 /* Convenience cast wrapper. */
 static struct r300_context* r300_context(struct pipe_context* pipe) {
     return (struct r300_context*)pipe;