Attachment 3604 Details for Bug 4277 – Resync with DDX and fix DDX versioning.

[patch] Resync with DDX and fix DDX versioning.

bleh.diff (text/plain), 3.31 KB, created by Luc Verhaegen on 2005-10-23 11:13:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Luc Verhaegen

Created: 2005-10-23 11:13:27 UTC

Size: 3.31 KB

patch

obsolete

>? src/mesa/drivers/dri/unichrome/depend
>Index: src/mesa/drivers/dri/unichrome/via_screen.c
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/unichrome/via_screen.c,v
>retrieving revision 1.30
>diff -u -r1.30 via_screen.c
>--- src/mesa/drivers/dri/unichrome/via_screen.c	4 Sep 2005 22:13:43 -0000	1.30
>+++ src/mesa/drivers/dri/unichrome/via_screen.c	23 Oct 2005 18:08:32 -0000
>@@ -429,7 +429,9 @@
> 			     
> {
>    __DRIscreenPrivate *psp;
>-   static const __DRIversion ddx_expected = { 4, 0, 0 };
>+   static const __DRIversion ddx_expected = { VIA_DRIDDX_VERSION_MAJOR,
>+                                              VIA_DRIDDX_VERSION_MINOR,
>+                                              VIA_DRIDDX_VERSION_PATCH };
>    static const __DRIversion dri_expected = { 4, 0, 0 };
>    static const __DRIversion drm_expected = { 2, 3, 0 };
> 
>Index: src/mesa/drivers/dri/unichrome/server/via_dri.h
>===================================================================
>RCS file: /cvs/mesa/Mesa/src/mesa/drivers/dri/unichrome/server/via_dri.h,v
>retrieving revision 1.2
>diff -u -r1.2 via_dri.h
>--- src/mesa/drivers/dri/unichrome/server/via_dri.h	30 Aug 2005 19:46:08 -0000	1.2
>+++ src/mesa/drivers/dri/unichrome/server/via_dri.h	23 Oct 2005 18:08:32 -0000
>@@ -1,20 +1,49 @@
>-#ifndef _VIA_DRI_
>-#define _VIA_DRI_
>-
>-#include "xf86drm.h"
>+/*
>+ * Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
>+ * Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
>+ *
>+ * Permission is hereby granted, free of charge, to any person obtaining a
>+ * copy of this software and associated documentation files (the "Software"),
>+ * to deal in the Software without restriction, including without limitation
>+ * the rights to use, copy, modify, merge, publish, distribute, sub license,
>+ * and/or sell copies of the Software, and to permit persons to whom the
>+ * Software is furnished to do so, subject to the following conditions:
>+ *
>+ * The above copyright notice and this permission notice (including the
>+ * next paragraph) shall be included in all copies or substantial portions
>+ * of the Software.
>+ *
>+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
>+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
>+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
>+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
>+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
>+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
>+ * DEALINGS IN THE SOFTWARE.
>+ */
>+/*
>+ * Keep this file in perfect sync between the ddx and dri drivers.
>+ * At least bump the VIA_DRIDDX_VERSION defines appropriately.
>+ *
>+ */
>+#ifndef _VIA_DRI_H_
>+#define _VIA_DRI_H_ 1
> 
> #define VIA_MAX_DRAWABLES 256
> 
>-#define VIA_VERSION_MAJOR		4
>-#define VIA_VERSION_MINOR		1
>+#define VIA_DRIDDX_VERSION_MAJOR  4
>+#define VIA_DRIDDX_VERSION_MINOR  2
>+#define VIA_DRIDDX_VERSION_PATCH  0
>+
>+#ifndef XFree86Server
>+typedef int Bool;
>+#endif
> 
> typedef struct {
>     drm_handle_t handle;
>     drmSize size;
> } viaRegion, *viaRegionPtr;
> 
>-typedef int Bool;
>-
> typedef struct {
>     viaRegion regs, agp;
>     int deviceID;
>@@ -46,4 +75,4 @@
>     int dummy;
> } VIADRIContextRec, *VIADRIContextPtr;
> 
>-#endif
>+#endif /* _VIA_DRI_H_ */

Actions: View | Splinter Review

Attachments on bug 4277: 3075 | 3076 | 3077 | 3604

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.