fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-04 20:38:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

llvmpipe: (trivial) rename linear_mip_offsets to mip_offsets

Browse source 
Since switching to non-swizzled rendering we only have "normal", aka linear,
offsets.

Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Roland Scheidegger 2014-07-01 01:54:30 +02:00
parent 188ba1d6ec
commit b4c3246e7b
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/drivers/llvmpipe/lp_setup.c
View file

@ -854,7 +854,7 @@ lp_setup_set_fragment_sampler_views(struct lp_setup_context *setup,
* could get mip offset directly but need call above to * could get mip offset directly but need call above to
* invoke tiled->linear conversion. * invoke tiled->linear conversion.
*/ */
assert(lp_tex->linear_mip_offsets[j] == jit_tex->mip_offsets[j]); assert(lp_tex->mip_offsets[j] == jit_tex->mip_offsets[j]);
jit_tex->row_stride[j] = lp_tex->row_stride[j]; jit_tex->row_stride[j] = lp_tex->row_stride[j];
jit_tex->img_stride[j] = lp_tex->img_stride[j]; jit_tex->img_stride[j] = lp_tex->img_stride[j];
} }

2
src/gallium/drivers/llvmpipe/lp_state_sampler.c
View file

@ -254,7 +254,7 @@ prepare_shader_sampling(
* could get mip offset directly but need call above to * could get mip offset directly but need call above to
* invoke tiled->linear conversion. * invoke tiled->linear conversion.
*/ */
assert(lp_tex->linear_mip_offsets[j] == mip_offsets[j]); assert(lp_tex->mip_offsets[j] == mip_offsets[j]);
row_stride[j] = lp_tex->row_stride[j]; row_stride[j] = lp_tex->row_stride[j];
img_stride[j] = lp_tex->img_stride[j]; img_stride[j] = lp_tex->img_stride[j];
} }

6
src/gallium/drivers/llvmpipe/lp_texture.c
View file

@ -730,7 +730,7 @@ llvmpipe_get_texture_image_address(struct llvmpipe_resource *lpr,
unsigned offset; unsigned offset;
img = &lpr->linear_img; img = &lpr->linear_img;
offset = lpr->linear_mip_offsets[level]; offset = lpr->mip_offsets[level];
if (face_slice > 0) if (face_slice > 0)
offset += face_slice * tex_image_face_size(lpr, level); offset += face_slice * tex_image_face_size(lpr, level);
@ -771,7 +771,7 @@ alloc_image_data(struct llvmpipe_resource *lpr)
*/ */
for (level = 0; level <= lpr->base.last_level; level++) { for (level = 0; level <= lpr->base.last_level; level++) {
uint buffer_size = tex_image_size(lpr, level); uint buffer_size = tex_image_size(lpr, level);
lpr->linear_mip_offsets[level] = offset; lpr->mip_offsets[level] = offset;
offset += align(buffer_size, alignment); offset += align(buffer_size, alignment);
} }
lpr->linear_img.data = align_malloc(offset, alignment); lpr->linear_img.data = align_malloc(offset, alignment);
@ -809,7 +809,7 @@ llvmpipe_get_texture_image(struct llvmpipe_resource *lpr,
} }
target_img = &lpr->linear_img; target_img = &lpr->linear_img;
target_off_ptr = lpr->linear_mip_offsets; target_off_ptr = lpr->mip_offsets;
target_data = target_img->data; target_data = target_img->data;
if (!target_data) { if (!target_data) {

2
src/gallium/drivers/llvmpipe/lp_texture.h
View file

@ -74,7 +74,7 @@ struct llvmpipe_resource
/** Number of 3D slices or cube faces per level */ /** Number of 3D slices or cube faces per level */
unsigned num_slices_faces[LP_MAX_TEXTURE_LEVELS]; unsigned num_slices_faces[LP_MAX_TEXTURE_LEVELS];
/** Offset to start of mipmap level, in bytes */ /** Offset to start of mipmap level, in bytes */
unsigned linear_mip_offsets[LP_MAX_TEXTURE_LEVELS]; unsigned mip_offsets[LP_MAX_TEXTURE_LEVELS];
/** /**
* Display target, for textures with the PIPE_BIND_DISPLAY_TARGET * Display target, for textures with the PIPE_BIND_DISPLAY_TARGET