Mercurial Mercurial > upstream > oracle > x-cons > x-s11-update-clone / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
open-src/driver/xf86-video-trident/16067432.patch
author Niveditha Rau <Niveditha.Rau@Oracle.COM>
Thu, 06 Jun 2013 10:49:39 -0700
changeset 1351 9ad483eabd22
permissions -rw-r--r--
16739280 update to Xorg 1.14.1
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1351
9ad483eabd22 16739280 update to Xorg 1.14.1
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
     1
 
--- src/trident_dga.c.orig	2012-12-04 03:30:11.000000000 +0100
9ad483eabd22 16739280 update to Xorg 1.14.1
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
     2
 
+++ src/trident_dga.c	2012-12-04 03:32:48.000000000 +0100
9ad483eabd22 16739280 update to Xorg 1.14.1
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
     3
 
@@ -37,10 +37,10 @@
9ad483eabd22 16739280 update to Xorg 1.14.1
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
     4
 
 static Bool TRIDENT_OpenFramebuffer(ScrnInfoPtr, char **, unsigned char **,
9ad483eabd22 16739280 update to Xorg 1.14.1
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
     5
 
 					int *, int *, int *);
9ad483eabd22 16739280 update to Xorg 1.14.1
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
     6
 
 static Bool TRIDENT_SetMode(ScrnInfoPtr, DGAModePtr);
9ad483eabd22 16739280 update to Xorg 1.14.1
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
     7
 
-static void TRIDENT_Sync(ScrnInfoPtr);
9ad483eabd22 16739280 update to Xorg 1.14.1
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
     8
 
 static int  TRIDENT_GetViewport(ScrnInfoPtr);
9ad483eabd22 16739280 update to Xorg 1.14.1
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
     9
 
 static void TRIDENT_SetViewport(ScrnInfoPtr, int, int, int);
9ad483eabd22 16739280 update to Xorg 1.14.1
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    10
 
 #ifdef HAVE_XAA_H
9ad483eabd22 16739280 update to Xorg 1.14.1
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    11
 
+static void TRIDENT_Sync(ScrnInfoPtr);
9ad483eabd22 16739280 update to Xorg 1.14.1
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    12
 
 static void TRIDENT_FillRect(ScrnInfoPtr, int, int, int, int, unsigned long);
9ad483eabd22 16739280 update to Xorg 1.14.1
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    13
 
 static void TRIDENT_BlitRect(ScrnInfoPtr, int, int, int, int, int, int);
9ad483eabd22 16739280 update to Xorg 1.14.1
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    14
 
 #if 0
9ad483eabd22 16739280 update to Xorg 1.14.1
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    15
 
@@ -56,8 +56,8 @@
9ad483eabd22 16739280 update to Xorg 1.14.1
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    16
 
    TRIDENT_SetMode,
9ad483eabd22 16739280 update to Xorg 1.14.1
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    17
 
    TRIDENT_SetViewport,
9ad483eabd22 16739280 update to Xorg 1.14.1
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    18
 
    TRIDENT_GetViewport,
9ad483eabd22 16739280 update to Xorg 1.14.1
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    19
 
-   TRIDENT_Sync,
9ad483eabd22 16739280 update to Xorg 1.14.1
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    20
 
 #ifdef HAVE_XAA_H
9ad483eabd22 16739280 update to Xorg 1.14.1
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    21
 
+   TRIDENT_Sync,
9ad483eabd22 16739280 update to Xorg 1.14.1
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    22
 
    TRIDENT_FillRect,
9ad483eabd22 16739280 update to Xorg 1.14.1
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    23
 
    TRIDENT_BlitRect,
9ad483eabd22 16739280 update to Xorg 1.14.1
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    24
 
 #if 0
9ad483eabd22 16739280 update to Xorg 1.14.1
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    25
 
@@ -66,7 +66,7 @@
9ad483eabd22 16739280 update to Xorg 1.14.1
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    26
 
    NULL
9ad483eabd22 16739280 update to Xorg 1.14.1
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    27
 
 #endif
9ad483eabd22 16739280 update to Xorg 1.14.1
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    28
 
 #else
9ad483eabd22 16739280 update to Xorg 1.14.1
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    29
 
-   NULL, NULL, NULL
9ad483eabd22 16739280 update to Xorg 1.14.1
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    30
 
+   NULL, NULL, NULL, NULL
9ad483eabd22 16739280 update to Xorg 1.14.1
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    31
 
 #endif
9ad483eabd22 16739280 update to Xorg 1.14.1
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    32
 
 };
upstream/oracle/x-cons/x-s11-update-clone