summaryrefslogtreecommitdiff
path: root/src/gallium/drivers/r300/r300_state_derived.c
diff options
context:
space:
mode:
authorMarek Olšák <maraeo@gmail.com>2011-10-08 01:06:36 +0200
committerMarek Olšák <maraeo@gmail.com>2011-10-08 02:21:24 +0200
commit20788a908b23362ca2804010f6ac8504894ed32c (patch)
tree4d73b8d3f3d68a94826a336f1e49712813fc19eb /src/gallium/drivers/r300/r300_state_derived.c
parent93c26d8baf5294b77e019b90d9995b5da565ea3c (diff)
r300g: remove unused r300_resource::tex_offset
Diffstat (limited to 'src/gallium/drivers/r300/r300_state_derived.c')
-rw-r--r--src/gallium/drivers/r300/r300_state_derived.c6
1 files changed, 1 insertions, 5 deletions
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. */