diff options
author | Brian Paul <[email protected]> | 2012-01-16 12:52:21 -0700 |
---|---|---|
committer | Brian Paul <[email protected]> | 2012-01-24 14:12:31 -0700 |
commit | c080202db5363a18a759a9a7c82b40ac558c8abe (patch) | |
tree | 9239d9cfbf0ab829abd1030990e2c0d834fb0a04 /src/mesa/drivers/dri/r200 | |
parent | 9f8ed9d66298e2dc5dff508e3ea723469fe06d93 (diff) |
radeon: derive radeon_renderbuffer from swrast_renderbuffer
Diffstat (limited to 'src/mesa/drivers/dri/r200')
-rw-r--r-- | src/mesa/drivers/dri/r200/r200_state.c | 4 | ||||
-rw-r--r-- | src/mesa/drivers/dri/r200/r200_state_init.c | 2 | ||||
-rw-r--r-- | src/mesa/drivers/dri/r200/r200_texstate.c | 7 |
3 files changed, 7 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_state.c b/src/mesa/drivers/dri/r200/r200_state.c index 49f66fb6f46..5677a9e7b8f 100644 --- a/src/mesa/drivers/dri/r200/r200_state.c +++ b/src/mesa/drivers/dri/r200/r200_state.c @@ -1619,8 +1619,8 @@ void r200_vtbl_update_scissor( struct gl_context *ctx ) rrb = radeon_get_colorbuffer(&r200->radeon); x1 = 0; y1 = 0; - x2 = rrb->base.Width - 1; - y2 = rrb->base.Height - 1; + x2 = rrb->base.Base.Width - 1; + y2 = rrb->base.Base.Height - 1; } R200_SET_STATE(r200, sci, SCI_XY_1, x1 | (y1 << 16)); diff --git a/src/mesa/drivers/dri/r200/r200_state_init.c b/src/mesa/drivers/dri/r200/r200_state_init.c index ab4a188d4c1..bddecaf2c2d 100644 --- a/src/mesa/drivers/dri/r200/r200_state_init.c +++ b/src/mesa/drivers/dri/r200/r200_state_init.c @@ -451,7 +451,7 @@ static void ctx_emit_cs(struct gl_context *ctx, struct radeon_state_atom *atom) atom->cmd[CTX_RB3D_CNTL] &= ~(0xf << 10); if (rrb->cpp == 4) atom->cmd[CTX_RB3D_CNTL] |= RADEON_COLOR_FORMAT_ARGB8888; - else switch (rrb->base.Format) { + else switch (rrb->base.Base.Format) { case MESA_FORMAT_RGB565: atom->cmd[CTX_RB3D_CNTL] |= RADEON_COLOR_FORMAT_RGB565; break; diff --git a/src/mesa/drivers/dri/r200/r200_texstate.c b/src/mesa/drivers/dri/r200/r200_texstate.c index 4624b089327..19e77c57fc3 100644 --- a/src/mesa/drivers/dri/r200/r200_texstate.c +++ b/src/mesa/drivers/dri/r200/r200_texstate.c @@ -807,13 +807,14 @@ void r200SetTexBuffer2(__DRIcontext *pDRICtx, GLint target, GLint texture_format } _mesa_init_teximage_fields(radeon->glCtx, texImage, - rb->base.Width, rb->base.Height, 1, 0, + rb->base.Base.Width, rb->base.Base.Height, + 1, 0, rb->cpp, texFormat); rImage->base.RowStride = rb->pitch / rb->cpp; - t->pp_txsize = ((rb->base.Width - 1) << RADEON_TEX_USIZE_SHIFT) - | ((rb->base.Height - 1) << RADEON_TEX_VSIZE_SHIFT); + t->pp_txsize = ((rb->base.Base.Width - 1) << RADEON_TEX_USIZE_SHIFT) + | ((rb->base.Base.Height - 1) << RADEON_TEX_VSIZE_SHIFT); if (target == GL_TEXTURE_RECTANGLE_NV) { t->pp_txformat |= R200_TXFORMAT_NON_POWER2; |