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/xserver/xorg/sparc-initvisuals.patch
author Charmaine Lee <Charmaine.Lee@Sun.COM>
Thu, 21 May 2009 16:41:26 -0700
changeset 713 2fd471ebe605
child 851 d428083dbbdd
permissions -rw-r--r--
6844102 missing miInitVisualsProc in Xorg 1.6
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
713
2fd471ebe605 6844102 missing miInitVisualsProc in Xorg 1.6
Charmaine Lee <Charmaine.Lee@Sun.COM>
parents:
diff changeset 
     1
 
diff -ur mi/micmap.c.orig mi/micmap.c
2fd471ebe605 6844102 missing miInitVisualsProc in Xorg 1.6
Charmaine Lee <Charmaine.Lee@Sun.COM>
parents:
diff changeset 
     2
 
--- mi/micmap.c.orig	Thu May 21 21:55:01 2009
2fd471ebe605 6844102 missing miInitVisualsProc in Xorg 1.6
Charmaine Lee <Charmaine.Lee@Sun.COM>
parents:
diff changeset 
     3
 
+++ mi/micmap.c	Thu May 21 21:58:03 2009
2fd471ebe605 6844102 missing miInitVisualsProc in Xorg 1.6
Charmaine Lee <Charmaine.Lee@Sun.COM>
parents:
diff changeset 
     4
 
@@ -497,6 +497,11 @@
2fd471ebe605 6844102 missing miInitVisualsProc in Xorg 1.6
Charmaine Lee <Charmaine.Lee@Sun.COM>
parents:
diff changeset 
     5
 
  * the set which can be used with this version of cfb.
2fd471ebe605 6844102 missing miInitVisualsProc in Xorg 1.6
Charmaine Lee <Charmaine.Lee@Sun.COM>
parents:
diff changeset 
     6
 
  */
2fd471ebe605 6844102 missing miInitVisualsProc in Xorg 1.6
Charmaine Lee <Charmaine.Lee@Sun.COM>
parents:
diff changeset 
     7
2fd471ebe605 6844102 missing miInitVisualsProc in Xorg 1.6
Charmaine Lee <Charmaine.Lee@Sun.COM>
parents:
diff changeset 
     8
 
+#if defined(__sparc__) || defined(__sparc)
2fd471ebe605 6844102 missing miInitVisualsProc in Xorg 1.6
Charmaine Lee <Charmaine.Lee@Sun.COM>
parents:
diff changeset 
     9
 
+miInitVisualsProcPtr miInitVisualsProc = NULL;
2fd471ebe605 6844102 missing miInitVisualsProc in Xorg 1.6
Charmaine Lee <Charmaine.Lee@Sun.COM>
parents:
diff changeset 
    10
 
+#endif /* __sparc__ */
2fd471ebe605 6844102 missing miInitVisualsProc in Xorg 1.6
Charmaine Lee <Charmaine.Lee@Sun.COM>
parents:
diff changeset 
    11
 
+
2fd471ebe605 6844102 missing miInitVisualsProc in Xorg 1.6
Charmaine Lee <Charmaine.Lee@Sun.COM>
parents:
diff changeset 
    12
 
+
2fd471ebe605 6844102 missing miInitVisualsProc in Xorg 1.6
Charmaine Lee <Charmaine.Lee@Sun.COM>
parents:
diff changeset 
    13
 
 _X_EXPORT Bool
2fd471ebe605 6844102 missing miInitVisualsProc in Xorg 1.6
Charmaine Lee <Charmaine.Lee@Sun.COM>
parents:
diff changeset 
    14
 
 miInitVisuals(VisualPtr *visualp, DepthPtr *depthp, int *nvisualp,
2fd471ebe605 6844102 missing miInitVisualsProc in Xorg 1.6
Charmaine Lee <Charmaine.Lee@Sun.COM>
parents:
diff changeset 
    15
 
 		int *ndepthp, int *rootDepthp, VisualID *defaultVisp,
2fd471ebe605 6844102 missing miInitVisualsProc in Xorg 1.6
Charmaine Lee <Charmaine.Lee@Sun.COM>
parents:
diff changeset 
    16
 
@@ -516,6 +521,13 @@
2fd471ebe605 6844102 missing miInitVisualsProc in Xorg 1.6
Charmaine Lee <Charmaine.Lee@Sun.COM>
parents:
diff changeset 
    17
 
     int		*preferredCVCs, *prefp;
2fd471ebe605 6844102 missing miInitVisualsProc in Xorg 1.6
Charmaine Lee <Charmaine.Lee@Sun.COM>
parents:
diff changeset 
    18
 
     int		first_depth;
2fd471ebe605 6844102 missing miInitVisualsProc in Xorg 1.6
Charmaine Lee <Charmaine.Lee@Sun.COM>
parents:
diff changeset 
    19
2fd471ebe605 6844102 missing miInitVisualsProc in Xorg 1.6
Charmaine Lee <Charmaine.Lee@Sun.COM>
parents:
diff changeset 
    20
 
+#if defined(__sparc__) || defined(__sparc)
2fd471ebe605 6844102 missing miInitVisualsProc in Xorg 1.6
Charmaine Lee <Charmaine.Lee@Sun.COM>
parents:
diff changeset 
    21
 
+    if (miInitVisualsProc) {
2fd471ebe605 6844102 missing miInitVisualsProc in Xorg 1.6
Charmaine Lee <Charmaine.Lee@Sun.COM>
parents:
diff changeset 
    22
 
+       return (miInitVisualsProc(visualp, depthp, nvisualp, ndepthp,
2fd471ebe605 6844102 missing miInitVisualsProc in Xorg 1.6
Charmaine Lee <Charmaine.Lee@Sun.COM>
parents:
diff changeset 
    23
 
+               rootDepthp, defaultVisp, sizes, bitsPerRGB, preferredVis));
2fd471ebe605 6844102 missing miInitVisualsProc in Xorg 1.6
Charmaine Lee <Charmaine.Lee@Sun.COM>
parents:
diff changeset 
    24
 
+    }
2fd471ebe605 6844102 missing miInitVisualsProc in Xorg 1.6
Charmaine Lee <Charmaine.Lee@Sun.COM>
parents:
diff changeset 
    25
 
+#endif /* __sparc__ */
2fd471ebe605 6844102 missing miInitVisualsProc in Xorg 1.6
Charmaine Lee <Charmaine.Lee@Sun.COM>
parents:
diff changeset 
    26
 
+
2fd471ebe605 6844102 missing miInitVisualsProc in Xorg 1.6
Charmaine Lee <Charmaine.Lee@Sun.COM>
parents:
diff changeset 
    27
 
     /* none specified, we'll guess from pixmap formats */
2fd471ebe605 6844102 missing miInitVisualsProc in Xorg 1.6
Charmaine Lee <Charmaine.Lee@Sun.COM>
parents:
diff changeset 
    28
 
     if (!miVisuals)
2fd471ebe605 6844102 missing miInitVisualsProc in Xorg 1.6
Charmaine Lee <Charmaine.Lee@Sun.COM>
parents:
diff changeset 
    29
 
     {
upstream/oracle/x-cons/x-s11-update-clone