projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'llvm-cliptest-viewport'
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
i810
/
i810ioctl.c
diff --git
a/src/mesa/drivers/dri/i810/i810ioctl.c
b/src/mesa/drivers/dri/i810/i810ioctl.c
index d162f7650dcdee9899c430cd1bb19c97d6c0a108..4b004d54c6548bf93853a437daddb6d2eac46364 100644
(file)
--- a/
src/mesa/drivers/dri/i810/i810ioctl.c
+++ b/
src/mesa/drivers/dri/i810/i810ioctl.c
@@
-1,4
+1,3
@@
-/* $XFree86: xc/lib/GL/mesa/src/drv/i810/i810ioctl.c,v 1.7 2002/10/30 12:51:33 alanh Exp $ */
#include <unistd.h> /* for usleep() */
#include <unistd.h> /* for usleep() */
@@
-48,11
+47,11
@@
static drmBufPtr i810_get_buffer_ioctl( i810ContextPtr imesa )
#define DEPTH_SCALE ((1<<16)-1)
#define DEPTH_SCALE ((1<<16)-1)
-static void i810Clear(
GL
context *ctx, GLbitfield mask )
+static void i810Clear(
struct gl_
context *ctx, GLbitfield mask )
{
i810ContextPtr imesa = I810_CONTEXT( ctx );
{
i810ContextPtr imesa = I810_CONTEXT( ctx );
- __DRIdrawable
Private
*dPriv = imesa->driDrawable;
- const GLuint colorMask = *((GLuint *) &ctx->Color.ColorMask);
+ __DRIdrawable *dPriv = imesa->driDrawable;
+ const GLuint colorMask = *((GLuint *) &ctx->Color.ColorMask
[0]
);
drmI810Clear clear;
unsigned int i;
drmI810Clear clear;
unsigned int i;
@@
-150,7
+149,7
@@
static void i810Clear( GLcontext *ctx, GLbitfield mask )
/*
* Copy the back buffer to the front buffer.
*/
/*
* Copy the back buffer to the front buffer.
*/
-void i810CopyBuffer( const __DRIdrawable
Private
*dPriv )
+void i810CopyBuffer( const __DRIdrawable *dPriv )
{
i810ContextPtr imesa;
drm_clip_rect_t *pbox;
{
i810ContextPtr imesa;
drm_clip_rect_t *pbox;
@@
-198,7
+197,7
@@
void i810CopyBuffer( const __DRIdrawablePrivate *dPriv )
/*
* XXX implement when full-screen extension is done.
*/
/*
* XXX implement when full-screen extension is done.
*/
-void i810PageFlip( const __DRIdrawable
Private
*dPriv )
+void i810PageFlip( const __DRIdrawable *dPriv )
{
i810ContextPtr imesa;
int tmp, ret;
{
i810ContextPtr imesa;
int tmp, ret;
@@
-500,13
+499,13
@@
int i810_check_copy(int fd)
return(drmCommandNone(fd, DRM_I810_DOCOPY));
}
return(drmCommandNone(fd, DRM_I810_DOCOPY));
}
-static void i810Flush(
GL
context *ctx )
+static void i810Flush(
struct gl_
context *ctx )
{
i810ContextPtr imesa = I810_CONTEXT( ctx );
I810_FIREVERTICES( imesa );
}
{
i810ContextPtr imesa = I810_CONTEXT( ctx );
I810_FIREVERTICES( imesa );
}
-static void i810Finish(
GL
context *ctx )
+static void i810Finish(
struct gl_
context *ctx )
{
i810ContextPtr imesa = I810_CONTEXT( ctx );
i810DmaFinish( imesa );
{
i810ContextPtr imesa = I810_CONTEXT( ctx );
i810DmaFinish( imesa );