projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Drop GLcontext typedef and use struct gl_context instead
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
mach64
/
mach64_ioctl.c
diff --git
a/src/mesa/drivers/dri/mach64/mach64_ioctl.c
b/src/mesa/drivers/dri/mach64/mach64_ioctl.c
index 7405a27f8eb4b7c722491642bcf75d462e24a13f..0146e0d05151776f5cb4b41b83814bc4cca035db 100644
(file)
--- a/
src/mesa/drivers/dri/mach64/mach64_ioctl.c
+++ b/
src/mesa/drivers/dri/mach64/mach64_ioctl.c
@@
-1,4
+1,4
@@
-/*
$XFree86$ */ /*
-*- mode: c; c-basic-offset: 3 -*- */
+/* -*- mode: c; c-basic-offset: 3 -*- */
/*
* Copyright 2000 Gareth Hughes
* All Rights Reserved.
/*
* Copyright 2000 Gareth Hughes
* All Rights Reserved.
@@
-35,8
+35,8
@@
#include "mach64_ioctl.h"
#include "mach64_tex.h"
#include "mach64_ioctl.h"
#include "mach64_tex.h"
-#include "imports.h"
-#include "macros.h"
+#include "
main/
imports.h"
+#include "ma
in/ma
cros.h"
#include "swrast/swrast.h"
#include "swrast/swrast.h"
@@
-279,7
+279,7
@@
static int mach64WaitForFrameCompletion( mach64ContextPtr mmesa )
/* Copy the back color buffer to the front color buffer.
*/
/* Copy the back color buffer to the front color buffer.
*/
-void mach64CopyBuffer( __DRIdrawable
Private
*dPriv )
+void mach64CopyBuffer( __DRIdrawable *dPriv )
{
mach64ContextPtr mmesa;
GLint nbox, i, ret;
{
mach64ContextPtr mmesa;
GLint nbox, i, ret;
@@
-320,7
+320,7
@@
void mach64CopyBuffer( __DRIdrawablePrivate *dPriv )
#endif
UNLOCK_HARDWARE( mmesa );
#endif
UNLOCK_HARDWARE( mmesa );
- driWaitForVBlank( dPriv, &
dPriv->vblSeq, dPriv->vblFlags, &
missed_target );
+ driWaitForVBlank( dPriv, &missed_target );
LOCK_HARDWARE( mmesa );
/* use front buffer cliprects */
LOCK_HARDWARE( mmesa );
/* use front buffer cliprects */
@@
-665,10
+665,10
@@
void mach64PerformanceBoxesLocked( mach64ContextPtr mmesa )
* Buffer clear
*/
* Buffer clear
*/
-static void mach64DDClear(
GL
context *ctx, GLbitfield mask )
+static void mach64DDClear(
struct gl_
context *ctx, GLbitfield mask )
{
mach64ContextPtr mmesa = MACH64_CONTEXT( ctx );
{
mach64ContextPtr mmesa = MACH64_CONTEXT( ctx );
- __DRIdrawable
Private
*dPriv = mmesa->driDrawable;
+ __DRIdrawable *dPriv = mmesa->driDrawable;
drm_mach64_clear_t clear;
GLuint flags = 0;
GLint i;
drm_mach64_clear_t clear;
GLuint flags = 0;
GLint i;