diff options
Diffstat (limited to 'xc/lib/GL/mesa/src/drv/r128/r128_context.h')
| -rw-r--r-- | xc/lib/GL/mesa/src/drv/r128/r128_context.h | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/xc/lib/GL/mesa/src/drv/r128/r128_context.h b/xc/lib/GL/mesa/src/drv/r128/r128_context.h index a0cd5ca60..0b4dc0e92 100644 --- a/xc/lib/GL/mesa/src/drv/r128/r128_context.h +++ b/xc/lib/GL/mesa/src/drv/r128/r128_context.h @@ -38,16 +38,13 @@ USE OR OTHER DEALINGS IN THE SOFTWARE. #ifdef GLX_DIRECT_RENDERING -#include <X11/Xlibint.h> - #include "dri_util.h" #include "xf86drm.h" -#include "xf86drmR128.h" +#include "r128_common.h" #include "mtypes.h" -#include "r128_sarea.h" #include "r128_reg.h" struct r128_context; @@ -184,7 +181,6 @@ struct r128_context { /* Drawable, cliprect and scissor information */ - GLenum DrawBuffer; /* Optimize draw buffer update */ GLint drawOffset, drawPitch; GLint readOffset, readPitch; @@ -196,13 +192,11 @@ struct r128_context { /* Mirrors of some DRI state */ - Display *display; /* X server display */ - __DRIcontextPrivate *driContext; /* DRI context */ __DRIscreenPrivate *driScreen; /* DRI screen */ __DRIdrawablePrivate *driDrawable; /* DRI drawable bound to this ctx */ - int lastStamp; /* mirror driDrawable->lastStamp */ + unsigned int lastStamp; /* mirror driDrawable->lastStamp */ drmContext hHWContext; drmLock *driHwLock; @@ -220,6 +214,10 @@ struct r128_context { GLuint c_textureSwaps; GLuint c_textureBytes; GLuint c_vertexBuffers; + + /* VBI + */ + GLuint vbl_seq; }; #define R128_CONTEXT(ctx) ((r128ContextPtr)(ctx->DriverCtx)) @@ -232,8 +230,7 @@ struct r128_context { (rmesa->r128Screen->chipset == R128_CARD_TYPE_R128_MOBILITY) -extern GLboolean r128CreateContext( Display *dpy, - const __GLcontextModes *glVisual, +extern GLboolean r128CreateContext( const __GLcontextModes *glVisual, __DRIcontextPrivate *driContextPriv, void *sharedContextPrivate ); |