Attachment 88537 Details for Bug 71172 – nouveau_dri_screen_init_breakage.patch

[patch] nouveau_dri_screen_init_breakage.patch

nouveau_dri_screen_init_breakage.patch (text/plain), 1.55 KB, created by Francisco Jerez on 2013-11-02 21:01:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Francisco Jerez

Created: 2013-11-02 21:01:31 UTC

Size: 1.55 KB

patch

obsolete

>diff --git a/src/mesa/drivers/dri/nouveau/nouveau_screen.c b/src/mesa/drivers/dri/nouveau/nouveau_screen.c
>index 6816406..0ea292a 100644
>--- a/src/mesa/drivers/dri/nouveau/nouveau_screen.c
>+++ b/src/mesa/drivers/dri/nouveau/nouveau_screen.c
>@@ -93,22 +93,6 @@ nouveau_init_screen2(__DRIscreen *dri_screen)
> 	if (!screen)
> 		return NULL;
> 
>-
>-        /* Compat version validation will occur at context init after
>-         * _mesa_compute_version().
>-         */
>-        dri_screen->max_gl_compat_version = 15;
>-
>-        /* NV10 and NV20 can support OpenGL ES 1.0 only.  Older chips
>-         * cannot do even that.
>-         */
>-        if ((screen->device->chipset & 0xf0) != 0x00)
>-                dri_screen->max_gl_es1_version = 10;
>-
>-	dri_screen->driverPrivate = screen;
>-	dri_screen->extensions = nouveau_screen_extensions;
>-	screen->dri_screen = dri_screen;
>-
> 	/* Open the DRM device. */
> 	ret = nouveau_device_wrap(dri_screen->fd, 0, &screen->device);
> 	if (ret) {
>@@ -131,6 +115,21 @@ nouveau_init_screen2(__DRIscreen *dri_screen)
> 		assert(0);
> 	}
> 
>+	/* Compat version validation will occur at context init after
>+	 * _mesa_compute_version().
>+	 */
>+	dri_screen->max_gl_compat_version = 15;
>+
>+	/* NV10 and NV20 can support OpenGL ES 1.0 only.  Older chips
>+	 * cannot do even that.
>+	 */
>+	if ((screen->device->chipset & 0xf0) != 0x00)
>+		dri_screen->max_gl_es1_version = 10;
>+
>+	dri_screen->driverPrivate = screen;
>+	dri_screen->extensions = nouveau_screen_extensions;
>+	screen->dri_screen = dri_screen;
>+
> 	configs = nouveau_get_configs();
> 	if (!configs)
> 		goto fail;

Actions: View | Splinter Review

Attachments on bug 71172: 88535 | 88536 | 88537 | 88585

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.