fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 09:00:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r600g: fixup pitch alignment like r600c.

Browse source 
This still needs work, passes tex3d, fbo-scissor-bitmap, scissor-bitmap
This commit is contained in:
Dave Airlie 2010-08-18 11:49:51 +10:00
parent 547e88e70d
commit 03c59e4ab1
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/gallium/drivers/r600/r600_state.c
View file

@ -1217,7 +1217,7 @@ static struct radeon_state *r600_resource(struct r600_context *rctx,
struct r600_resource *rbuffer; struct r600_resource *rbuffer;
struct radeon_state *rstate; struct radeon_state *rstate;
unsigned format; unsigned format;
uint32_t word4 = 0, yuv_format = 0; uint32_t word4 = 0, yuv_format = 0, pitch = 0;
unsigned char swizzle[4]; unsigned char swizzle[4];
swizzle[0] = view->swizzle_r; swizzle[0] = view->swizzle_r;
@ -1248,16 +1248,19 @@ static struct radeon_state *r600_resource(struct r600_context *rctx,
rstate->placement[2] = RADEON_GEM_DOMAIN_GTT; rstate->placement[2] = RADEON_GEM_DOMAIN_GTT;
rstate->placement[3] = RADEON_GEM_DOMAIN_GTT; rstate->placement[3] = RADEON_GEM_DOMAIN_GTT;
pitch = (tmp->pitch[0] / tmp->bpt);
pitch = (pitch + 0x7) & ~0x7;
/* FIXME properly handle first level != 0 */ /* FIXME properly handle first level != 0 */
rstate->states[R600_PS_RESOURCE__RESOURCE0_WORD0] = rstate->states[R600_PS_RESOURCE__RESOURCE0_WORD0] =
S_038000_DIM(r600_tex_dim(view->texture->target)) | S_038000_DIM(r600_tex_dim(view->texture->target)) |
S_038000_PITCH(((tmp->pitch[0] / tmp->bpt) / 8) - 1) | S_038000_PITCH((pitch / 8) - 1) |
S_038000_TEX_WIDTH(view->texture->width0 - 1); S_038000_TEX_WIDTH(view->texture->width0 - 1);
rstate->states[R600_PS_RESOURCE__RESOURCE0_WORD1] = rstate->states[R600_PS_RESOURCE__RESOURCE0_WORD1] =
S_038004_TEX_HEIGHT(view->texture->height0 - 1) | S_038004_TEX_HEIGHT(view->texture->height0 - 1) |
S_038004_TEX_DEPTH(view->texture->depth0 - 1) | S_038004_TEX_DEPTH(view->texture->depth0 - 1) |
S_038004_DATA_FORMAT(format); S_038004_DATA_FORMAT(format);
rstate->states[R600_PS_RESOURCE__RESOURCE0_WORD2] = 0; rstate->states[R600_PS_RESOURCE__RESOURCE0_WORD2] = tmp->offset[0] >> 8;
rstate->states[R600_PS_RESOURCE__RESOURCE0_WORD3] = tmp->offset[1] >> 8; rstate->states[R600_PS_RESOURCE__RESOURCE0_WORD3] = tmp->offset[1] >> 8;
rstate->states[R600_PS_RESOURCE__RESOURCE0_WORD4] = rstate->states[R600_PS_RESOURCE__RESOURCE0_WORD4] =
word4 | word4 |

1
src/gallium/drivers/r600/r600_texture.c
View file

@ -67,6 +67,7 @@ static void r600_setup_miptree(struct r600_screen *rscreen, struct r600_resource
h = u_minify(ptex->height0, i); h = u_minify(ptex->height0, i);
h = util_next_power_of_two(h); h = util_next_power_of_two(h);
pitch = util_format_get_stride(ptex->format, align(w, 64)); pitch = util_format_get_stride(ptex->format, align(w, 64));
pitch = align(pitch, 256);
layer_size = pitch * h; layer_size = pitch * h;
if (ptex->target == PIPE_TEXTURE_CUBE) if (ptex->target == PIPE_TEXTURE_CUBE)
size = layer_size * 6; size = layer_size * 6;