diff options
Diffstat (limited to 'lib/mesa/src/gallium/drivers/r300/r300_emit.c')
| -rw-r--r-- | lib/mesa/src/gallium/drivers/r300/r300_emit.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/mesa/src/gallium/drivers/r300/r300_emit.c b/lib/mesa/src/gallium/drivers/r300/r300_emit.c index 779c467a1..c91f9851a 100644 --- a/lib/mesa/src/gallium/drivers/r300/r300_emit.c +++ b/lib/mesa/src/gallium/drivers/r300/r300_emit.c @@ -142,9 +142,9 @@ static void get_rc_constant_state( case RC_STATE_R300_TEXSCALE_FACTOR: tex = r300_resource(texstate->sampler_views[constant->u.State[1]]->base.texture); /* Add a small number to the texture size to work around rounding errors in hw. */ - vec[0] = tex->b.b.width0 / (tex->tex.width0 + 0.001f); - vec[1] = tex->b.b.height0 / (tex->tex.height0 + 0.001f); - vec[2] = tex->b.b.depth0 / (tex->tex.depth0 + 0.001f); + vec[0] = tex->b.width0 / (tex->tex.width0 + 0.001f); + vec[1] = tex->b.height0 / (tex->tex.height0 + 0.001f); + vec[2] = tex->b.depth0 / (tex->tex.depth0 + 0.001f); vec[3] = 1; break; @@ -1325,7 +1325,7 @@ validate: r300->rws->cs_add_buffer(&r300->cs, tex->buf, RADEON_USAGE_READWRITE | RADEON_USAGE_SYNCHRONIZED, r300_surface(fb->cbufs[i])->domain, - tex->b.b.nr_samples > 1 ? + tex->b.nr_samples > 1 ? RADEON_PRIO_COLOR_BUFFER_MSAA : RADEON_PRIO_COLOR_BUFFER); } @@ -1336,7 +1336,7 @@ validate: r300->rws->cs_add_buffer(&r300->cs, tex->buf, RADEON_USAGE_READWRITE | RADEON_USAGE_SYNCHRONIZED, r300_surface(fb->zsbuf)->domain, - tex->b.b.nr_samples > 1 ? + tex->b.nr_samples > 1 ? RADEON_PRIO_DEPTH_BUFFER_MSAA : RADEON_PRIO_DEPTH_BUFFER); } @@ -1353,7 +1353,7 @@ validate: if (r300->textures_state.dirty) { /* ...textures... */ for (i = 0; i < texstate->count; i++) { - if (!(texstate->tx_enable & (1 << i))) { + if (!(texstate->tx_enable & (1U << i))) { continue; } |