Reviewed-by: Brian Paul <brianp@vmware.com>
/* Copy. */
util_blitter_copy_texture_view(blitter, dst_view, dstx, dsty, src_view,
/* Copy. */
util_blitter_copy_texture_view(blitter, dst_view, dstx, dsty, src_view,
- srcbox, src->width0, src->height0);
+ srcbox, src->width0, src->height0,
+ PIPE_MASK_RGBAZS);
pipe_surface_reference(&dst_view, NULL);
pipe_sampler_view_reference(&src_view, NULL);
pipe_surface_reference(&dst_view, NULL);
pipe_sampler_view_reference(&src_view, NULL);
unsigned dstx, unsigned dsty,
struct pipe_sampler_view *src,
const struct pipe_box *srcbox,
unsigned dstx, unsigned dsty,
struct pipe_sampler_view *src,
const struct pipe_box *srcbox,
- unsigned src_width0, unsigned src_height0)
+ unsigned src_width0, unsigned src_height0,
+ unsigned mask)
{
struct blitter_context_priv *ctx = (struct blitter_context_priv*)blitter;
struct pipe_context *pipe = ctx->base.pipe;
{
struct blitter_context_priv *ctx = (struct blitter_context_priv*)blitter;
struct pipe_context *pipe = ctx->base.pipe;
enum pipe_texture_target src_target = src->texture->target;
unsigned width = srcbox->width;
unsigned height = srcbox->height;
enum pipe_texture_target src_target = src->texture->target;
unsigned width = srcbox->width;
unsigned height = srcbox->height;
- boolean is_stencil, is_depth;
+ boolean blit_stencil, blit_depth;
const struct util_format_description *src_desc =
util_format_description(src->format);
const struct util_format_description *src_desc =
util_format_description(src->format);
- is_depth = util_format_has_depth(src_desc);
- is_stencil = util_format_has_stencil(src_desc);
+ blit_depth = util_format_has_depth(src_desc) && (mask & PIPE_MASK_Z);
+ blit_stencil = util_format_has_stencil(src_desc) && (mask & PIPE_MASK_S);
/* If you want a fallback for stencil copies,
* use util_blitter_copy_texture. */
/* If you want a fallback for stencil copies,
* use util_blitter_copy_texture. */
- if (is_stencil && !ctx->has_stencil_export) {
- is_stencil = FALSE;
+ if (blit_stencil && !ctx->has_stencil_export) {
+ blit_stencil = FALSE;
fb_state.width = dst->width;
fb_state.height = dst->height;
fb_state.width = dst->width;
fb_state.height = dst->height;
- if (is_depth || is_stencil) {
+ if (blit_depth || blit_stencil) {
pipe->bind_blend_state(pipe, ctx->blend_keep_color);
pipe->bind_blend_state(pipe, ctx->blend_keep_color);
- if (is_depth && is_stencil) {
+ if (blit_depth && blit_stencil) {
pipe->bind_depth_stencil_alpha_state(pipe,
ctx->dsa_write_depth_stencil);
pipe->bind_fs_state(pipe,
blitter_get_fs_texfetch_depthstencil(ctx, src_target));
pipe->bind_depth_stencil_alpha_state(pipe,
ctx->dsa_write_depth_stencil);
pipe->bind_fs_state(pipe,
blitter_get_fs_texfetch_depthstencil(ctx, src_target));
+ } else if (blit_depth) {
pipe->bind_depth_stencil_alpha_state(pipe,
ctx->dsa_write_depth_keep_stencil);
pipe->bind_fs_state(pipe,
pipe->bind_depth_stencil_alpha_state(pipe,
ctx->dsa_write_depth_keep_stencil);
pipe->bind_fs_state(pipe,
- if (is_depth && is_stencil) {
+ if (blit_depth && blit_stencil) {
/* Setup two samplers, one for depth and the other one for stencil. */
struct pipe_sampler_view templ;
struct pipe_sampler_view *views[2];
/* Setup two samplers, one for depth and the other one for stencil. */
struct pipe_sampler_view templ;
struct pipe_sampler_view *views[2];
unsigned dstx, unsigned dsty,
struct pipe_sampler_view *src,
const struct pipe_box *srcbox,
unsigned dstx, unsigned dsty,
struct pipe_sampler_view *src,
const struct pipe_box *srcbox,
- unsigned src_width0, unsigned src_height0);
+ unsigned src_width0, unsigned src_height0,
+ unsigned mask);
/**
* Helper function to initialize a view for copy_texture_view.
/**
* Helper function to initialize a view for copy_texture_view.
r300_blitter_begin(r300, R300_COPY);
util_blitter_copy_texture_view(r300->blitter, dst_view, dstx, dsty,
src_view, src_box,
r300_blitter_begin(r300, R300_COPY);
util_blitter_copy_texture_view(r300->blitter, dst_view, dstx, dsty,
src_view, src_box,
- src_width0, src_height0);
+ src_width0, src_height0, PIPE_MASK_RGBAZS);
r300_blitter_end(r300);
pipe_surface_reference(&dst_view, NULL);
r300_blitter_end(r300);
pipe_surface_reference(&dst_view, NULL);