radv: Only save the descriptor set if we have one.

[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 766ae6f2f79e76767dc2d98fdd7a8e7d78eb876e..a3be805d048483c122bf426301ab43d6ff780364 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_screen.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_screen.c
@@ -24,6 +24,7 @@
  *
  */
 
+#include <stdio.h>
 #include <xf86drm.h>
 #include <nouveau_drm.h>
 #include "nouveau_driver.h"
@@ -39,13 +40,16 @@
 #include "main/renderbuffer.h"
 #include "swrast/s_renderbuffer.h"
 
+#include <nvif/class.h>
+#include <nvif/cl0080.h>
+
 static const __DRIextension *nouveau_screen_extensions[];
 
 static void
 nouveau_destroy_screen(__DRIscreen *dri_screen);
 
 static const __DRIconfig **
-nouveau_get_configs(void)
+nouveau_get_configs(uint32_t chipset)
 {
        __DRIconfig **configs = NULL;
        int i;
@@ -61,20 +65,20 @@ nouveau_get_configs(void)
        };
 
        const GLenum back_buffer_modes[] = {
-               GLX_NONE, GLX_SWAP_UNDEFINED_OML
+               __DRI_ATTRIB_SWAP_NONE, __DRI_ATTRIB_SWAP_UNDEFINED
        };
 
-       for (i = 0; i < Elements(formats); i++) {
+       for (i = 0; i < ARRAY_SIZE(formats); i++) {
                __DRIconfig **config;
 
                config = driCreateConfigs(formats[i],
                                          depth_bits, stencil_bits,
-                                         Elements(depth_bits),
+                                         ARRAY_SIZE(depth_bits),
                                          back_buffer_modes,
-                                         Elements(back_buffer_modes),
+                                         ARRAY_SIZE(back_buffer_modes),
                                          msaa_samples,
-                                         Elements(msaa_samples),
-                                         GL_TRUE);
+                                         ARRAY_SIZE(msaa_samples),
+                                         GL_TRUE, chipset < 0x10, GL_FALSE);
                assert(config);
 
                configs = driConcatConfigs(configs, config);
@@ -95,13 +99,25 @@ nouveau_init_screen2(__DRIscreen *dri_screen)
        if (!screen)
                return NULL;
 
+       dri_screen->driverPrivate = screen;
+
        /* Open the DRM device. */
-       ret = nouveau_device_wrap(dri_screen->fd, 0, &screen->device);
+       ret = nouveau_drm_new(dri_screen->fd, &screen->drm);
        if (ret) {
                nouveau_error("Error opening the DRM device.\n");
                goto fail;
        }
 
+       ret = nouveau_device_new(&screen->drm->client, NV_DEVICE,
+                                &(struct nv_device_v0) {
+                                       .device = ~0ULL,
+                                }, sizeof(struct nv_device_v0),
+                                &screen->device);
+       if (ret) {
+               nouveau_error("Error creating device object.\n");
+               goto fail;
+       }
+
        /* Choose the card specific function pointers. */
        switch (screen->device->chipset & 0xf0) {
        case 0x00:
@@ -114,19 +130,21 @@ nouveau_init_screen2(__DRIscreen *dri_screen)
                dri_screen->max_gl_es1_version = 10;
                break;
        case 0x20:
+       case 0x30:
                screen->driver = &nv20_driver;
                dri_screen->max_gl_compat_version = 13;
                dri_screen->max_gl_es1_version = 10;
                break;
        default:
-               assert(0);
+               nouveau_error("Unknown chipset: %02X\n",
+                             screen->device->chipset);
+               goto fail;
        }
 
-       dri_screen->driverPrivate = screen;
        dri_screen->extensions = nouveau_screen_extensions;
        screen->dri_screen = dri_screen;
 
-       configs = nouveau_get_configs();
+       configs = nouveau_get_configs(screen->device->chipset);
        if (!configs)
                goto fail;
 
@@ -209,6 +227,7 @@ nouveau_destroy_screen(__DRIscreen *dri_screen)
                return;
 
        nouveau_device_del(&screen->device);
+       nouveau_drm_del(&screen->drm);
 
        free(screen);
        dri_screen->driverPrivate = NULL;
@@ -240,27 +259,27 @@ nouveau_create_buffer(__DRIscreen *dri_screen,
 
        /* Front buffer. */
        rb = nouveau_renderbuffer_dri_new(color_format, drawable);
-       _mesa_add_renderbuffer(fb, BUFFER_FRONT_LEFT, rb);
+       _mesa_attach_and_own_rb(fb, BUFFER_FRONT_LEFT, rb);
 
        /* Back buffer */
        if (visual->doubleBufferMode) {
                rb = nouveau_renderbuffer_dri_new(color_format, drawable);
-               _mesa_add_renderbuffer(fb, BUFFER_BACK_LEFT, rb);
+               _mesa_attach_and_own_rb(fb, BUFFER_BACK_LEFT, rb);
        }
 
        /* Depth/stencil buffer. */
        if (visual->depthBits == 24 && visual->stencilBits == 8) {
                rb = nouveau_renderbuffer_dri_new(GL_DEPTH24_STENCIL8_EXT, drawable);
-               _mesa_add_renderbuffer(fb, BUFFER_DEPTH, rb);
-               _mesa_add_renderbuffer(fb, BUFFER_STENCIL, rb);
+               _mesa_attach_and_own_rb(fb, BUFFER_DEPTH, rb);
+               _mesa_attach_and_reference_rb(fb, BUFFER_STENCIL, rb);
 
        } else if (visual->depthBits == 24) {
                rb = nouveau_renderbuffer_dri_new(GL_DEPTH_COMPONENT24, drawable);
-               _mesa_add_renderbuffer(fb, BUFFER_DEPTH, rb);
+               _mesa_attach_and_own_rb(fb, BUFFER_DEPTH, rb);
 
        } else if (visual->depthBits == 16) {
                rb = nouveau_renderbuffer_dri_new(GL_DEPTH_COMPONENT16, drawable);
-               _mesa_add_renderbuffer(fb, BUFFER_DEPTH, rb);
+               _mesa_attach_and_own_rb(fb, BUFFER_DEPTH, rb);
        }
 
        /* Software renderbuffers. */
@@ -305,6 +324,7 @@ static const __DRIextension *nouveau_screen_extensions[] = {
     &nouveau_texbuffer_extension.base,
     &nouveau_renderer_query_extension.base,
     &dri2ConfigQueryExtension.base,
+    &dri2NoErrorExtension.base,
     NULL
 };