Attachment 46072 Details for Bug 103135

[patch] Patch required for Mesa 6.2 branch

Mesa-6.2_branch_060814.diff (text/plain), 1.48 KB, created by Stefan Dirsch on 2005-08-15 15:28:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Dirsch

Created: 2005-08-15 15:28:22 UTC

Size: 1.48 KB

patch

obsolete

>--- src/mesa/drivers/dri/i915/server/i830_dri.h.orig	2005-08-14 18:16:37.968099368 +0200
>+++ src/mesa/drivers/dri/i915/server/i830_dri.h	2005-08-14 18:16:51.936661465 +0200
>@@ -20,7 +20,6 @@
> typedef struct _I830DRIRec {
>    drm_handle_t regs;
>    drmSize regsSize;
>-   drmAddress regsMap;
> 
>    drmSize backbufferSize;
>    drm_handle_t backbuffer;
>Index: src/mesa/drivers/dri/i915/intel_screen.c
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/i915/intel_screen.c,v
>retrieving revision 1.23
>retrieving revision 1.24
>diff -u -r1.23 -r1.24
>--- src/mesa/drivers/dri/i915/intel_screen.c	29 Jul 2005 00:19:36 -0000	1.23
>+++ src/mesa/drivers/dri/i915/intel_screen.c	14 Aug 2005 12:16:51 -0000	1.24
>@@ -79,6 +79,10 @@
>      (PFNGLXSCRENABLEEXTENSIONPROC) (*dri_interface->getProcAddress("glxEnableExtension"));
>    void * const psc = sPriv->psc->screenConfigs;
> 
>+   if (sPriv->devPrivSize != sizeof(I830DRIRec)) {
>+      fprintf(stderr,"\nERROR!  sizeof(I830DRIRec) does not match passed size from 2D driver\n");
>+      return GL_FALSE;
>+   }
> 
>    /* Allocate the private area */
>    intelScreen = (intelScreenPrivate *)CALLOC(sizeof(intelScreenPrivate));
>--- src/mesa/sources.orig	2005-08-15 17:04:47.039443637 +0200
>+++ src/mesa/sources	2005-08-15 17:05:22.494287848 +0200
>@@ -116,6 +116,7 @@
> 	tnl/t_save_loopback.c \
> 	tnl/t_save_playback.c \
> 	tnl/t_vb_fog.c \
>+	tnl/t_vb_cull.c \
> 	tnl/t_vb_light.c \
> 	tnl/t_vb_normals.c \
> 	tnl/t_vb_points.c \

Actions: View | Diff

Attachments on bug 103135: 45381 | 45484 | 45953 | 45954 | 46072