OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i965: Remove spurious casts in copy_image_with_memcpy()

Browse Source 
If a pointer points to raw, untyped memory and is never dereferenced,
then declare it as 'void*' instead of casting it to 'void*'.

Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Chad Versace
2014-11-18 21:11:23 -08:00
committed by Chad Versace
parent 2150db4d5d
commit d11bc9fe8d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/mesa/drivers/dri/i965/intel_copy_image.c
View File

@@ -144,7 +144,7 @@ copy_image_with_memcpy(struct brw_context *brw,
int src_width, int src_height) int src_width, int src_height)
{ {
bool same_slice; bool same_slice;
uint8_t *mapped, *src_mapped, *dst_mapped; void *mapped, *src_mapped, *dst_mapped;
int src_stride, dst_stride, i, cpp; int src_stride, dst_stride, i, cpp;
int map_x1, map_y1, map_x2, map_y2; int map_x1, map_y1, map_x2, map_y2;
GLuint src_bw, src_bh; GLuint src_bw, src_bh;
@@ -176,7 +176,7 @@ copy_image_with_memcpy(struct brw_context *brw,
intel_miptree_map(brw, src_mt, src_level, src_z, intel_miptree_map(brw, src_mt, src_level, src_z,
map_x1, map_y1, map_x2 - map_x1, map_y2 - map_y1, map_x1, map_y1, map_x2 - map_x1, map_y2 - map_y1,
GL_MAP_READ_BIT | GL_MAP_WRITE_BIT, GL_MAP_READ_BIT | GL_MAP_WRITE_BIT,
(void **)&mapped, &src_stride); &mapped, &src_stride);
dst_stride = src_stride; dst_stride = src_stride;
@@ -188,10 +188,10 @@ copy_image_with_memcpy(struct brw_context *brw,
} else { } else {
intel_miptree_map(brw, src_mt, src_level, src_z, intel_miptree_map(brw, src_mt, src_level, src_z,
src_x, src_y, src_width, src_height, src_x, src_y, src_width, src_height,
GL_MAP_READ_BIT, (void **)&src_mapped, &src_stride); GL_MAP_READ_BIT, &src_mapped, &src_stride);
intel_miptree_map(brw, dst_mt, dst_level, dst_z, intel_miptree_map(brw, dst_mt, dst_level, dst_z,
dst_x, dst_y, src_width, src_height, dst_x, dst_y, src_width, src_height,
GL_MAP_WRITE_BIT, (void **)&dst_mapped, &dst_stride); GL_MAP_WRITE_BIT, &dst_mapped, &dst_stride);
} }
src_width /= (int)src_bw; src_width /= (int)src_bw;