1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
|
diff -ru ../Glide3.orig/h3/glide3/src/gglide.c.dri ./h3/glide3/src/gglide.c.dri
--- ../Glide3.orig/h3/glide3/src/gglide.c.dri Fri Nov 24 10:38:46 2000
+++ ./h3/glide3/src/gglide.c.dri Sun Jan 13 17:32:04 2002
@@ -448,7 +448,7 @@
#include "fxcmd.h"
#include "fxinline.h"
-#ifdef __linux__
+#ifdef DRI_BUILD
#include <lindri.h>
#endif
@@ -483,12 +483,12 @@
alphamode = gc->state.shadow.alphaMode;
if (alpha_sf != GR_BLEND_ONE && alpha_sf != GR_BLEND_ZERO) {
- GR_CHECK_W(myName, 1, "unsupported alpha source blend function");
+ /*GR_CHECK_W(myName, 1, "unsupported alpha source blend function");*/
alpha_sf = GR_BLEND_ONE;
}
if (alpha_df != GR_BLEND_ONE && alpha_df != GR_BLEND_ZERO) {
- GR_CHECK_W(myName, 1, "unsupported alpha destination blend function");
+ /*GR_CHECK_W(myName, 1, "unsupported alpha destination blend function");*/
alpha_df = GR_BLEND_ZERO;
}
@@ -917,7 +917,7 @@
REG_GROUP_BEGIN(BROADCAST_ID, colBufferAddr, 2, 0x3);
REG_GROUP_SET(hw, colBufferAddr,gc->buffers[gc->grColBuf]);
-#ifdef __linux__
+#ifdef DRI_BUILD
REG_GROUP_SET(hw, colBufferStride, (!gc->curBuffer)? driInfo.stride :
gc->state.shadow.auxBufferStride);
#else
@@ -951,7 +951,7 @@
REG_GROUP_BEGIN(BROADCAST_ID, colBufferAddr, 2, 0x3);
REG_GROUP_SET(hw, colBufferAddr, gc->buffers[gc->windowed ? 0 : gc->curBuffer]);
-#ifdef __linux__
+#ifdef DRI_BUILD
REG_GROUP_SET(hw, colBufferStride, (!gc->curBuffer) ? driInfo.stride :
gc->state.shadow.colBufferStride);
#else
@@ -1923,7 +1923,7 @@
** grStippleMode
*/
-#ifdef __linux__
+#ifdef DRI_BUILD
GR_STATE_ENTRY(grStippleMode, void, (GrStippleMode_t mode))
{
#define FN_NAME "_grStippleMode"
@@ -1957,7 +1957,7 @@
#endif /* !GLIDE3 */
#undef FN_NAME
} /* grStippleMode */
-#endif /* __linux__ */
+#endif /* DRI_BUILD */
/*---------------------------------------------------------------------------
** grDitherMode
@@ -2325,7 +2325,7 @@
** and the only drawbuffer modes supported by the fbzMode register are 0
** (back) and 1 (front)
*/
-#ifndef __linux__
+#ifndef DRI_BUILD
GR_STATE_ENTRY(grRenderBuffer, void, (GrBuffer_t buffer))
{
#define FN_NAME "_grRenderBuffer"
@@ -2352,7 +2352,7 @@
GR_END();
#undef FN_NAME
} /* grRenderBuffer */
-#else /* __linux__ */
+#else /* DRI_BUILD */
GR_STATE_ENTRY(grRenderBuffer, void, (GrBuffer_t buffer))
{
#define FN_NAME "_grRenderBuffer"
diff -ru ../Glide3.orig/h3/glide3/src/glfb.c.dri ./h3/glide3/src/glfb.c.dri
--- ../Glide3.orig/h3/glide3/src/glfb.c.dri Wed Aug 30 01:47:03 2000
+++ ./h3/glide3/src/glfb.c.dri Sun Jan 13 17:35:08 2002
@@ -217,7 +217,7 @@
#include "fxglide.h"
#include "fxcmd.h"
-#ifdef __linux__
+#ifdef DRI_BUILD
#include <lindri.h>
#endif
@@ -456,7 +456,7 @@
}
if (rv) {
-#ifdef __linux__
+#ifdef DRI_BUILD
if (!colBufferIndex)
info->strideInBytes = driInfo.stride;
else
@@ -487,7 +487,7 @@
GR_CHECK_SIZE();
info->lfbPtr = (void *)gc->lfb_ptr;
-#ifdef __linux__
+#ifdef DRI_BUILD
info->strideInBytes = 0x1000;
#endif
|
