diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/gallium/drivers/r300/r300_blit.c | 8 | ||||
| -rw-r--r-- | src/gallium/drivers/r300/r300_context.h | 3 | ||||
| -rw-r--r-- | src/gallium/drivers/r300/r300_state_derived.c | 6 | ||||
| -rw-r--r-- | src/gallium/drivers/r300/r300_texture.c | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/r300/r300_texture.h | 1 |
5 files changed, 6 insertions, 16 deletions
diff --git a/src/gallium/drivers/r300/r300_blit.c b/src/gallium/drivers/r300/r300_blit.c index 3c1b3648a24..f0743d503d0 100644 --- a/src/gallium/drivers/r300/r300_blit.c +++ b/src/gallium/drivers/r300/r300_blit.c @@ -545,17 +545,17 @@ static void r300_resource_copy_region(struct pipe_context *pipe, } if (old_src.format != new_src.format) - r300_resource_set_properties(pipe->screen, src, 0, &new_src); + r300_resource_set_properties(pipe->screen, src, &new_src); if (old_dst.format != new_dst.format) - r300_resource_set_properties(pipe->screen, dst, 0, &new_dst); + r300_resource_set_properties(pipe->screen, dst, &new_dst); r300_hw_copy_region(pipe, dst, dst_level, dstx, dsty, dstz, src, src_level, src_box); if (old_src.format != new_src.format) - r300_resource_set_properties(pipe->screen, src, 0, &old_src); + r300_resource_set_properties(pipe->screen, src, &old_src); if (old_dst.format != new_dst.format) - r300_resource_set_properties(pipe->screen, dst, 0, &old_dst); + r300_resource_set_properties(pipe->screen, dst, &old_dst); } void r300_init_blit_functions(struct r300_context *r300) diff --git a/src/gallium/drivers/r300/r300_context.h b/src/gallium/drivers/r300/r300_context.h index d8638fc1764..b89d6ecce17 100644 --- a/src/gallium/drivers/r300/r300_context.h +++ b/src/gallium/drivers/r300/r300_context.h @@ -402,9 +402,6 @@ struct r300_resource /* Only format-independent bits should be filled in. */ struct r300_texture_format_state tx_format; - /* Where the texture starts in the buffer. */ - unsigned tex_offset; - /* This is the level tiling flags were last time set for. * It's used to prevent redundant tiling-flags changes from happening.*/ unsigned surface_level; diff --git a/src/gallium/drivers/r300/r300_state_derived.c b/src/gallium/drivers/r300/r300_state_derived.c index daeb4d716d0..9ba6397084a 100644 --- a/src/gallium/drivers/r300/r300_state_derived.c +++ b/src/gallium/drivers/r300/r300_state_derived.c @@ -782,17 +782,13 @@ static void r300_merge_textures_and_samplers(struct r300_context* r300) * an i-th mipmap level as the zero level. */ base_level += min_level; } - offset = tex->tex_offset + - tex->tex.offset_in_bytes[base_level]; + offset = tex->tex.offset_in_bytes[base_level]; r300_texture_setup_format_state(r300->screen, tex, base_level, &texstate->format); texstate->format.tile_config |= offset & 0xffffffe0; assert((offset & 0x1f) == 0); - } else { - texstate->format.tile_config |= tex->tex_offset & 0xffffffe0; - assert((tex->tex_offset & 0x1f) == 0); } /* Assign a texture cache region. */ diff --git a/src/gallium/drivers/r300/r300_texture.c b/src/gallium/drivers/r300/r300_texture.c index 11442864c71..864dbc2e7bb 100644 --- a/src/gallium/drivers/r300/r300_texture.c +++ b/src/gallium/drivers/r300/r300_texture.c @@ -814,7 +814,6 @@ static void r300_texture_setup_fb_state(struct r300_surface *surf) boolean r300_resource_set_properties(struct pipe_screen *screen, struct pipe_resource *tex, - unsigned offset, const struct pipe_resource *new_properties) { struct r300_screen *rscreen = r300_screen(screen); @@ -829,7 +828,6 @@ boolean r300_resource_set_properties(struct pipe_screen *screen, fprintf(stderr, "r300: ERROR: Cannot set texture properties.\n"); return FALSE; } - res->tex_offset = offset; r300_texture_setup_format_state(rscreen, res, 0, &res->tx_format); return TRUE; @@ -899,7 +897,7 @@ r300_texture_create_object(struct r300_screen *rscreen, tex->tex.stride_in_bytes_override = stride_in_bytes_override; tex->buf = buffer; - if (!r300_resource_set_properties(&rscreen->screen, &tex->b.b.b, 0, base)) { + if (!r300_resource_set_properties(&rscreen->screen, &tex->b.b.b, base)) { if (buffer) pb_reference(&buffer, NULL); FREE(tex); diff --git a/src/gallium/drivers/r300/r300_texture.h b/src/gallium/drivers/r300/r300_texture.h index 158a387478f..0da07235a69 100644 --- a/src/gallium/drivers/r300/r300_texture.h +++ b/src/gallium/drivers/r300/r300_texture.h @@ -48,7 +48,6 @@ uint32_t r500_tx_format_msb_bit(enum pipe_format format); boolean r300_resource_set_properties(struct pipe_screen *screen, struct pipe_resource *tex, - unsigned offset, const struct pipe_resource *new_properties); boolean r300_is_colorbuffer_format_supported(enum pipe_format format); |