projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Turn off VBO's.
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
r128
/
r128_ioctl.c
diff --git
a/src/mesa/drivers/dri/r128/r128_ioctl.c
b/src/mesa/drivers/dri/r128/r128_ioctl.c
index bf643210c56d37d29e699e63abe0421d174d6a55..fc017329ca2527a5b4075a654d6d7abd1860d840 100644
(file)
--- a/
src/mesa/drivers/dri/r128/r128_ioctl.c
+++ b/
src/mesa/drivers/dri/r128/r128_ioctl.c
@@
-43,6
+43,7
@@
USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "swrast/swrast.h"
#include "vblank.h"
#include "swrast/swrast.h"
#include "vblank.h"
+#include "mmio.h"
#define R128_TIMEOUT 2048
#define R128_IDLE_RETRY 32
#define R128_TIMEOUT 2048
#define R128_IDLE_RETRY 32
@@
-229,7
+230,7
@@
static int r128WaitForFrameCompletion( r128ContextPtr rmesa )
int wait = 0;
while ( 1 ) {
int wait = 0;
while ( 1 ) {
- u
int32_t frame = LE32_TO_CPU(*(volatile uint32_t *)(R128MMIO + R128_LAST_FRAME_REG)
);
+ u
_int32_t frame = read_MMIO_LE32( R128MMIO, R128_LAST_FRAME_REG
);
if ( rmesa->sarea->last_frame - frame <= R128_MAX_OUTSTANDING ) {
break;
if ( rmesa->sarea->last_frame - frame <= R128_MAX_OUTSTANDING ) {
break;
@@
-428,25
+429,25
@@
static void r128Clear( GLcontext *ctx, GLbitfield mask, GLboolean all,
rmesa->new_state = save_state & ~R128_NEW_MASKS;
}
rmesa->new_state = save_state & ~R128_NEW_MASKS;
}
- if ( mask &
DD_FRONT_LEFT_BI
T ) {
+ if ( mask &
BUFFER_BIT_FRONT_LEF
T ) {
flags |= R128_FRONT;
flags |= R128_FRONT;
- mask &= ~
DD_FRONT_LEFT_BI
T;
+ mask &= ~
BUFFER_BIT_FRONT_LEF
T;
}
}
- if ( mask &
DD_BACK_LEFT_BI
T ) {
+ if ( mask &
BUFFER_BIT_BACK_LEF
T ) {
flags |= R128_BACK;
flags |= R128_BACK;
- mask &= ~
DD_BACK_LEFT_BI
T;
+ mask &= ~
BUFFER_BIT_BACK_LEF
T;
}
}
- if ( ( mask &
DD_DEPTH_BIT
) && ctx->Depth.Mask ) {
+ if ( ( mask &
BUFFER_BIT_DEPTH
) && ctx->Depth.Mask ) {
flags |= R128_DEPTH;
flags |= R128_DEPTH;
- mask &= ~
DD_DEPTH_BIT
;
+ mask &= ~
BUFFER_BIT_DEPTH
;
}
#if 0
/* FIXME: Add stencil support */
}
#if 0
/* FIXME: Add stencil support */
- if ( mask &
DD_STENCIL_BIT
) {
+ if ( mask &
BUFFER_BIT_STENCIL
) {
flags |= DRM_R128_DEPTH_BUFFER;
flags |= DRM_R128_DEPTH_BUFFER;
- mask &= ~
DD_STENCIL_BIT
;
+ mask &= ~
BUFFER_BIT_STENCIL
;
}
#endif
}
#endif