Merge branch 'lp-offset-twoside'

[mesa.git] / src / mesa / drivers / dri / nouveau / nouveau_screen.c

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_screen.c b/src/mesa/drivers/dri/nouveau/nouveau_screen.c
index 6abab8c9656bdce4d281e313883811c152bc128b..a6e2186cf4370b9bd92549dea99fc78a9b468aa1 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_screen.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_screen.c
@@ -27,6 +27,7 @@
 #include "nouveau_driver.h"
 #include "nouveau_context.h"
 #include "nouveau_fbo.h"
+#include "nouveau_texture.h"
 #include "nouveau_drmif.h"
 #include "nv04_driver.h"
 #include "nv10_driver.h"
@@ -40,16 +41,6 @@ static const __DRIextension *nouveau_screen_extensions[];
 static void
 nouveau_destroy_screen(__DRIscreen *dri_screen);
 
-static void
-nouveau_channel_flush_notify(struct nouveau_channel *chan)
-{
-       struct nouveau_screen *screen = chan->user_private;
-       struct nouveau_context *nctx = screen->context;
-
-       if (nctx && nctx->fallback < SWRAST)
-               nouveau_state_emit(&nctx->base);
-}
-
 static const __DRIconfig **
 nouveau_get_configs(void)
 {
@@ -118,39 +109,24 @@ nouveau_init_screen2(__DRIscreen *dri_screen)
                goto fail;
        }
 
-       ret = nouveau_channel_alloc(screen->device, 0xbeef0201, 0xbeef0202,
-                                   &screen->chan);
-       if (ret) {
-               nouveau_error("Error initializing the FIFO.\n");
-               goto fail;
-       }
-       screen->chan->flush_notify = nouveau_channel_flush_notify;
-       screen->chan->user_private = screen;
-
-       /* Do the card specific initialization */
+       /* Choose the card specific function pointers. */
        switch (screen->device->chipset & 0xf0) {
        case 0x00:
-               ret = nv04_screen_init(screen);
+               screen->driver = &nv04_driver;
                break;
        case 0x10:
-               ret = nv10_screen_init(screen);
+               screen->driver = &nv10_driver;
                break;
        case 0x20:
-               ret = nv20_screen_init(screen);
+               screen->driver = &nv20_driver;
                break;
        default:
                assert(0);
        }
-       if (!ret) {
-               nouveau_error("Error initializing the hardware.\n");
-               goto fail;
-       }
 
        configs = nouveau_get_configs();
-       if (!configs) {
-               nouveau_error("Error creating the framebuffer configs.\n");
+       if (!configs)
                goto fail;
-       }
 
        return configs;
 fail:
@@ -167,13 +143,6 @@ nouveau_destroy_screen(__DRIscreen *dri_screen)
        if (!screen)
                return;
 
-       screen->driver->screen_destroy(screen);
-
-       if (screen->chan) {
-               screen->chan->flush_notify = NULL;
-               nouveau_channel_free(&screen->chan);
-       }
-
        if (screen->device)
                nouveau_device_close(&screen->device);
 
@@ -184,10 +153,10 @@ nouveau_destroy_screen(__DRIscreen *dri_screen)
 static GLboolean
 nouveau_create_buffer(__DRIscreen *dri_screen,
                      __DRIdrawable *drawable,
-                     const __GLcontextModes *visual,
+                     const struct gl_config *visual,
                      GLboolean is_pixmap)
 {
-       struct gl_renderbuffer  *rb;
+       struct gl_renderbuffer *rb;
        struct gl_framebuffer *fb;
        GLenum color_format;
 
@@ -247,7 +216,27 @@ nouveau_destroy_buffer(__DRIdrawable *drawable)
                (struct gl_framebuffer **)&drawable->driverPrivate, NULL);
 }
 
+static void
+nouveau_drawable_flush(__DRIdrawable *draw)
+{
+}
+
+static const struct __DRI2flushExtensionRec nouveau_flush_extension = {
+    { __DRI2_FLUSH, __DRI2_FLUSH_VERSION },
+    nouveau_drawable_flush,
+    dri2InvalidateDrawable,
+};
+
+static const struct __DRItexBufferExtensionRec nouveau_texbuffer_extension = {
+    { __DRI_TEX_BUFFER, __DRI_TEX_BUFFER_VERSION },
+    NULL,
+    nouveau_set_texbuffer,
+};
+
 static const __DRIextension *nouveau_screen_extensions[] = {
+    &nouveau_flush_extension.base,
+    &nouveau_texbuffer_extension.base,
+    &dri2ConfigQueryExtension.base,
     NULL
 };