diff options
author | marha <marha@users.sourceforge.net> | 2014-08-22 21:57:21 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2014-08-22 21:57:21 +0200 |
commit | 112d89481850102f28b6e7ff4f40b65c41e11f6c (patch) | |
tree | 9e22963aeda3f588d4aa3aa270fdba74922028c7 /mesalib/src/gallium/auxiliary/util/u_blitter.c | |
parent | bcb354180f20f0c410a77bd32cbf2c1e799632d5 (diff) | |
parent | 6c0c95d6045d2d2b4e6a3a2f11457850031c57bc (diff) | |
download | vcxsrv-112d89481850102f28b6e7ff4f40b65c41e11f6c.tar.gz vcxsrv-112d89481850102f28b6e7ff4f40b65c41e11f6c.tar.bz2 vcxsrv-112d89481850102f28b6e7ff4f40b65c41e11f6c.zip |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/gallium/auxiliary/util/u_blitter.c')
-rw-r--r-- | mesalib/src/gallium/auxiliary/util/u_blitter.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/gallium/auxiliary/util/u_blitter.c b/mesalib/src/gallium/auxiliary/util/u_blitter.c index 20fbd80d5..609e02fd1 100644 --- a/mesalib/src/gallium/auxiliary/util/u_blitter.c +++ b/mesalib/src/gallium/auxiliary/util/u_blitter.c @@ -1799,7 +1799,7 @@ void util_blitter_custom_depth_stencil(struct blitter_context *blitter, pipe->bind_blend_state(pipe, cbsurf ? ctx->blend[PIPE_MASK_RGBA] : ctx->blend[0]); pipe->bind_depth_stencil_alpha_state(pipe, dsa_stage); - ctx->bind_fs_state(pipe, ctx->fs_empty); + ctx->bind_fs_state(pipe, cbsurf ? ctx->fs_write_one_cbuf : ctx->fs_empty); pipe->bind_vertex_elements_state(pipe, ctx->velem_state); /* set a framebuffer state */ |