diff options
| author | Kristian Høgsberg <[email protected]> | 2011-10-28 15:40:01 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <[email protected]> | 2011-11-02 11:16:00 -0400 |
| commit | d24b81e0e0f4109f3256dc45b0adc5ffd59fb749 (patch) | |
| tree | 69e94f5deef4656cda82c35d71212c6b74a589fc /src/mesa/drivers/dri/r200 | |
| parent | 24002daf011bf05d7d088602dc32e60da1755f44 (diff) | |
dri: Remove cliprect information from __DRIdrawable
Diffstat (limited to 'src/mesa/drivers/dri/r200')
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_state.c | 12 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_swtcl.c | 3 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_state.c b/src/mesa/drivers/dri/r200/r200_state.c index 7f9bc2d9edd..49f66fb6f46 100644 --- a/src/mesa/drivers/dri/r200/r200_state.c +++ b/src/mesa/drivers/dri/r200/r200_state.c @@ -1570,8 +1570,8 @@ void r200UpdateWindow( struct gl_context *ctx ) { r200ContextPtr rmesa = R200_CONTEXT(ctx); __DRIdrawable *dPriv = radeon_get_drawable(&rmesa->radeon); - GLfloat xoffset = dPriv ? (GLfloat) dPriv->x : 0; - GLfloat yoffset = dPriv ? (GLfloat) dPriv->y + dPriv->h : 0; + GLfloat xoffset = 0; + GLfloat yoffset = dPriv ? (GLfloat) dPriv->h : 0; const GLfloat *v = ctx->Viewport._WindowMap.m; const GLboolean render_to_fbo = (ctx->DrawBuffer ? (ctx->DrawBuffer->Name != 0) : 0); const GLfloat depthScale = 1.0F / ctx->DrawBuffer->_DepthMaxF; @@ -1650,8 +1650,8 @@ void r200UpdateViewportOffset( struct gl_context *ctx ) { r200ContextPtr rmesa = R200_CONTEXT(ctx); __DRIdrawable *dPriv = radeon_get_drawable(&rmesa->radeon); - GLfloat xoffset = (GLfloat)dPriv->x; - GLfloat yoffset = (GLfloat)dPriv->y + dPriv->h; + GLfloat xoffset = (GLfloat)0; + GLfloat yoffset = (GLfloat)dPriv->h; const GLfloat *v = ctx->Viewport._WindowMap.m; float_ui32_type tx; @@ -1679,8 +1679,8 @@ void r200UpdateViewportOffset( struct gl_context *ctx ) R200_STIPPLE_Y_OFFSET_MASK); /* add magic offsets, then invert */ - stx = 31 - ((dPriv->x - 1) & R200_STIPPLE_COORD_MASK); - sty = 31 - ((dPriv->y + dPriv->h - 1) + stx = 31 - ((-1) & R200_STIPPLE_COORD_MASK); + sty = 31 - ((dPriv->h - 1) & R200_STIPPLE_COORD_MASK); m |= ((stx << R200_STIPPLE_X_OFFSET_SHIFT) | diff --git a/src/mesa/drivers/dri/r200/r200_swtcl.c b/src/mesa/drivers/dri/r200/r200_swtcl.c index 62034eb0e45..303d3fbe459 100644 --- a/src/mesa/drivers/dri/r200/r200_swtcl.c +++ b/src/mesa/drivers/dri/r200/r200_swtcl.c @@ -850,8 +850,7 @@ r200PointsBitmap( struct gl_context *ctx, GLint px, GLint py, /* Update window height */ - h = radeon_get_drawable(&rmesa->radeon)->h + radeon_get_drawable(&rmesa->radeon)->y; - px += radeon_get_drawable(&rmesa->radeon)->x; + h = radeon_get_drawable(&rmesa->radeon)->h; /* Clipping handled by existing mechansims in r200_ioctl.c? */ |