]> git.pld-linux.org Git - packages/Glide_V5-DRI.git/blame - glide-no_redefine_macro.patch
- rediffed
[packages/Glide_V5-DRI.git] / glide-no_redefine_macro.patch
CommitLineData
e0c8b99e
JB
1--- glide3x.orig/h3/glide3/src/xdraw2.inc.S
2+++ glide3x/h3/glide3/src/xdraw2.inc.S
3@@ -59,6 +59,8 @@
4 .file "xdraw2.inc.S"
5
6
7+#ifndef XDRAW2_FIFO_MACROS
8+#define XDRAW2_FIFO_MACROS
9 .macro GR_FIFO_WRITE __addr __offset __data
10 mov \__data , \__offset(\__addr)
11 .endm /* GR_FIFO_WRITE */
12@@ -72,6 +74,7 @@
13 .macro WRITE_MM1LOW_FIFO
14 movd %mm1 , (%ebp) /* store current param | previous param */
15 .endm /* WRITE_MM1LOW_FIFO */
16+#endif
17
18
19 #if 0
20@@ -815,9 +818,12 @@ LOCAL(nocull):
21 #define packCol %edi
22 #define tempVal %edi
23
24+#ifndef XDRAW2_FIFO_MACROS
25+#define XDRAW2_FIFO_MACROS
26 .macro GR_FIFO_WRITE __addr __offset __data
27 mov \__data , \__offset(\__addr)
28 .endm /* GR_FIFO_WRITE */
29+#endif
30
31 .align 4
32 LOCAL(__triBegin):
33--- glide3x.orig/h5/glide3/src/xdraw2.inc.s
34+++ glide3x/h5/glide3/src/xdraw2.inc.s
35@@ -81,6 +81,8 @@
36 .file "xdraw2.inc.S"
37
38
39+#ifndef XDRAW2_FIFO_MACROS
40+#define XDRAW2_FIFO_MACROS
41 .macro GR_FIFO_WRITE __addr __offset __data
42 #ifdef HAL_CSIM
43 pushad
44@@ -121,6 +123,7 @@
45 movd %mm1 , (%ebp) /* store current param | previous param */
46 #endif
47 .endm /* WRITE_MM1LOW_FIFO */
48+#endif
49
50
51 #if 0
52@@ -867,6 +870,8 @@ LOCAL(nocull):
53 #define packCol %edi
54 #define tempVal %edi
55
56+#ifndef XDRAW2_FIFO_MACROS
57+#define XDRAW2_FIFO_MACROS
58 .macro GR_FIFO_WRITE __addr __offset __data
59 #ifdef HAL_CSIM
60 pushad
61@@ -884,6 +889,7 @@ LOCAL(nocull):
62 mov \__data , \__offset(\__addr)
63 #endif
64 .endm /* GR_FIFO_WRITE */
65+#endif
66
67 .align 4
68 LOCAL(__triBegin):
This page took 0.42211 seconds and 4 git commands to generate.