r300: Hook up to winsys, add missing header.

In theory it works, which of course means that it doesn't.

src/gallium/drivers/r300/r300_context.c

@@ -41,10 +41,17 @@ struct pipe_context* r300_create_context(struct pipe_screen* screen,
 
     r300->winsys = amd_winsys;
     r300->context.winsys = winsys;
-    r300->context.screen = screen;
+    if (screen) {
+        r300->context.screen = screen;
+    } else {
+        /* XXX second arg should be pciid, find a way to get it from winsys */
+        r300->context.screen = r300_create_screen(winsys, 0x0);
+    }
 
     r300->context.destroy = r300_destroy_context;
 
+    r300->draw = draw_create();
+
     /* XXX this is almost certainly wrong
      * put this all in winsys, where we can get an FD
     struct radeon_cs_manager* csm = radeon_cs_manager_gem_ctor(fd);

src/gallium/winsys/drm/amd/amd_context.c

@@ -242,7 +242,13 @@ GLboolean amd_context_create(const __GLcontextModes *visual,
         return GL_FALSE;
     }
 
-    pipe = amd_create_softpipe(amd_context);
+    if (GL_TRUE) {
+        /* XXX "NULL" is a struct pipe_screen* just in case we ever need it... */
+        pipe = r300_create_context(NULL, amd_context->pipe_winsys,
+                                   (struct amd_pipe_winsys*)amd_context->pipe_winsys);
+    } else {
+        pipe = amd_create_softpipe(amd_context);
+    }
     amd_context->st_context = st_create_context(pipe, visual,
                                                 shared_st_context);
     driInitExtensions(amd_context->st_context->ctx,