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 6f61f66f3b01504c3cbe2e1c4cedbf6597e3d997..a3be805d048483c122bf426301ab43d6ff780364 100644 (file)
--- a/src/mesa/drivers/dri/nouveau/nouveau_screen.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_screen.c
@@ -49,7 +49,7 @@ 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;
@@ -65,7 +65,7 @@ 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 < ARRAY_SIZE(formats); i++) {
@@ -78,7 +78,7 @@ nouveau_get_configs(void)
                                          ARRAY_SIZE(back_buffer_modes),
                                          msaa_samples,
                                          ARRAY_SIZE(msaa_samples),
-                                         GL_TRUE);
+                                         GL_TRUE, chipset < 0x10, GL_FALSE);
                assert(config);
 
                configs = driConcatConfigs(configs, config);
@@ -130,6 +130,7 @@ 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;
@@ -143,7 +144,7 @@ nouveau_init_screen2(__DRIscreen *dri_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;
 
@@ -258,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. */
@@ -323,6 +324,7 @@ static const __DRIextension *nouveau_screen_extensions[] = {
     &nouveau_texbuffer_extension.base,
     &nouveau_renderer_query_extension.base,
     &dri2ConfigQueryExtension.base,
+    &dri2NoErrorExtension.base,
     NULL
 };