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

util/surface: Always use the surface format when clearing.

Browse source 
Not the texture format, as they might differ.

Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
José Fonseca 2012-11-15 14:19:55 +00:00
parent 64f9916314
commit c0e4ee9b27
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

@ -266,13 +266,14 @@ util_clear_depth_stencil(struct pipe_context *pipe,
unsigned dstx, unsigned dsty,
unsigned width, unsigned height)
{
enum pipe_format format = dst->format;
struct pipe_transfer *dst_trans;
ubyte *dst_map;
boolean need_rmw = FALSE;
if ((clear_flags & PIPE_CLEAR_DEPTHSTENCIL) &&
((clear_flags & PIPE_CLEAR_DEPTHSTENCIL) != PIPE_CLEAR_DEPTHSTENCIL) &&
util_format_is_depth_and_stencil(dst->format))
util_format_is_depth_and_stencil(format))
need_rmw = TRUE;
assert(dst->texture);
@ -289,14 +290,14 @@ util_clear_depth_stencil(struct pipe_context *pipe,
if (dst_map) {
unsigned dst_stride = dst_trans->stride;
uint64_t zstencil = util_pack64_z_stencil(dst->texture->format,
uint64_t zstencil = util_pack64_z_stencil(format,
depth, stencil);
unsigned i, j;
assert(dst_trans->stride > 0);
switch (util_format_get_blocksize(dst->format)) {
switch (util_format_get_blocksize(format)) {
case 1:
assert(dst->format == PIPE_FORMAT_S8_UINT);
assert(format == PIPE_FORMAT_S8_UINT);
if(dst_stride == width)
memset(dst_map, (uint8_t) zstencil, height * width);
else {
@ -307,7 +308,7 @@ util_clear_depth_stencil(struct pipe_context *pipe,
}
break;
case 2:
assert(dst->format == PIPE_FORMAT_Z16_UNORM);
assert(format == PIPE_FORMAT_Z16_UNORM);
for (i = 0; i < height; i++) {
uint16_t *row = (uint16_t *)dst_map;
for (j = 0; j < width; j++)
@ -326,10 +327,10 @@ util_clear_depth_stencil(struct pipe_context *pipe,
}
else {
uint32_t dst_mask;
if (dst->format == PIPE_FORMAT_Z24_UNORM_S8_UINT)
if (format == PIPE_FORMAT_Z24_UNORM_S8_UINT)
dst_mask = 0xffffff00;
else {
assert(dst->format == PIPE_FORMAT_S8_UINT_Z24_UNORM);
assert(format == PIPE_FORMAT_S8_UINT_Z24_UNORM);
dst_mask = 0xffffff;
}
if (clear_flags & PIPE_CLEAR_DEPTH)