[Mesa-dev] [RFC 06/13] intel: treat mip-tree as constant when resolving offsets
Topi Pohjolainen
topi.pohjolainen at intel.com
Tue Feb 26 05:18:57 PST 2013
Signed-off-by: Topi Pohjolainen <topi.pohjolainen at intel.com>
---
src/mesa/drivers/dri/intel/intel_mipmap_tree.c | 4 ++--
src/mesa/drivers/dri/intel/intel_mipmap_tree.h | 2 +-
src/mesa/drivers/dri/intel/intel_regions.c | 2 +-
src/mesa/drivers/dri/intel/intel_regions.h | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
index 306cbbe..02bf028 100644
--- a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c
@@ -688,12 +688,12 @@ intel_miptree_get_image_offset(struct intel_mipmap_tree *mt,
}
void
-intel_miptree_get_tile_offsets(struct intel_mipmap_tree *mt,
+intel_miptree_get_tile_offsets(const struct intel_mipmap_tree *mt,
GLuint level, GLuint slice,
uint32_t *tile_x,
uint32_t *tile_y)
{
- struct intel_region *region = mt->region;
+ const struct intel_region *region = mt->region;
uint32_t mask_x, mask_y;
intel_region_get_tile_masks(region, &mask_x, &mask_y, false);
diff --git a/src/mesa/drivers/dri/intel/intel_mipmap_tree.h b/src/mesa/drivers/dri/intel/intel_mipmap_tree.h
index 27540bc..778810b 100644
--- a/src/mesa/drivers/dri/intel/intel_mipmap_tree.h
+++ b/src/mesa/drivers/dri/intel/intel_mipmap_tree.h
@@ -468,7 +468,7 @@ intel_miptree_get_dimensions_for_image(struct gl_texture_image *image,
int *width, int *height, int *depth);
void
-intel_miptree_get_tile_offsets(struct intel_mipmap_tree *mt,
+intel_miptree_get_tile_offsets(const struct intel_mipmap_tree *mt,
GLuint level, GLuint slice,
uint32_t *tile_x,
uint32_t *tile_y);
diff --git a/src/mesa/drivers/dri/intel/intel_regions.c b/src/mesa/drivers/dri/intel/intel_regions.c
index 89d91b0..e0b9217 100644
--- a/src/mesa/drivers/dri/intel/intel_regions.c
+++ b/src/mesa/drivers/dri/intel/intel_regions.c
@@ -401,7 +401,7 @@ intel_region_copy(struct intel_context *intel,
* untiled, the masks are set to 0.
*/
void
-intel_region_get_tile_masks(struct intel_region *region,
+intel_region_get_tile_masks(const struct intel_region *region,
uint32_t *mask_x, uint32_t *mask_y,
bool map_stencil_as_y_tiled)
{
diff --git a/src/mesa/drivers/dri/intel/intel_regions.h b/src/mesa/drivers/dri/intel/intel_regions.h
index 28d581c..543b3a7 100644
--- a/src/mesa/drivers/dri/intel/intel_regions.h
+++ b/src/mesa/drivers/dri/intel/intel_regions.h
@@ -134,7 +134,7 @@ void _mesa_copy_rect(GLubyte * dst,
GLuint src_pitch, GLuint src_x, GLuint src_y);
void
-intel_region_get_tile_masks(struct intel_region *region,
+intel_region_get_tile_masks(const struct intel_region *region,
uint32_t *mask_x, uint32_t *mask_y,
bool map_stencil_as_y_tiled);
--
1.7.9.5
More information about the mesa-dev
mailing list