r600g: fix depth hw resource copies.

With the previous fixes we can now enabled hw depth copies

Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie 2011-02-01 17:20:53 +10:00
parent 5730d56549
commit 417cfa60b2
2 changed files with 2 additions and 18 deletions

View File

@ -208,15 +208,8 @@ static void r600_resource_copy_region(struct pipe_context *ctx,
unsigned src_level,
const struct pipe_box *src_box)
{
boolean is_depth;
/* there is something wrong with depth resource copies at the moment so avoid them for now */
is_depth = util_format_get_component_bits(src->format, UTIL_FORMAT_COLORSPACE_ZS, 0) != 0;
if (is_depth)
util_resource_copy_region(ctx, dst, dst_level, dstx, dsty, dstz,
src, src_level, src_box);
else
r600_hw_copy_region(ctx, dst, dst_level, dstx, dsty, dstz,
src, src_level, src_box);
r600_hw_copy_region(ctx, dst, dst_level, dstx, dsty, dstz,
src, src_level, src_box);
}
void r600_init_blit_functions(struct r600_pipe_context *rctx)

View File

@ -291,15 +291,6 @@ static boolean permit_hardware_blit(struct pipe_screen *screen,
else
bind = PIPE_BIND_RENDER_TARGET;
/* See r600_resource_copy_region: there is something wrong
* with depth resource copies at the moment so avoid them for
* now.
*/
if (util_format_get_component_bits(res->format,
UTIL_FORMAT_COLORSPACE_ZS,
0) != 0)
return FALSE;
if (!screen->is_format_supported(screen,
res->format,
res->target,