fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-26 04:10:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

gallium/util: (trivial) fix util_clear_render_target

Browse source 
the format of the rt can be different than the one of the texture, so must
propagate the format explicitly to the helper. Broken since
3f9c5d6244 (but unused by st/mesa).
This commit is contained in:
Roland Scheidegger 2017-02-24 18:40:40 +01:00
parent 9833488974
commit c3a94d9195
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/gallium/auxiliary/util/u_surface.c
View file

@ -423,6 +423,7 @@ util_clear_color_texture_helper(struct pipe_transfer *dst_trans,
static void
util_clear_color_texture(struct pipe_context *pipe,
struct pipe_resource *texture,
enum pipe_format format,
const union pipe_color_union *color,
unsigned level,
unsigned dstx, unsigned dsty, unsigned dstz,
@ -430,7 +431,6 @@ util_clear_color_texture(struct pipe_context *pipe,
{
struct pipe_transfer *dst_trans;
ubyte *dst_map;
enum pipe_format format = texture->format;
dst_map = pipe_transfer_map_3d(pipe,
texture,
@ -491,16 +491,16 @@ util_clear_render_target(struct pipe_context *pipe,
dx, 0, w, 1,
&dst_trans);
if (dst_map) {
util_clear_color_texture_helper(dst_trans, dst_map, dst->format, color,
width, height, 1);
util_clear_color_texture_helper(dst_trans, dst_map, dst->format,
color, width, height, 1);
pipe->transfer_unmap(pipe, dst_trans);
}
}
else {
unsigned depth = dst->u.tex.last_layer - dst->u.tex.first_layer + 1;
util_clear_color_texture(pipe, dst->texture, color, dst->u.tex.level,
dstx, dsty, dst->u.tex.first_layer,
width, height, depth);
util_clear_color_texture(pipe, dst->texture, dst->format, color,
dst->u.tex.level, dstx, dsty,
dst->u.tex.first_layer, width, height, depth);
}
}
@ -674,7 +674,8 @@ util_clear_texture(struct pipe_context *pipe,
else
desc->unpack_rgba_float(color.f, 0, data, 0, 1, 1);
util_clear_color_texture(pipe, tex, &color, level, box->x, box->y, box->z,
util_clear_color_texture(pipe, tex, tex->format, &color, level,
box->x, box->y, box->z,
box->width, box->height, box->depth);
}
}