diff options
| author | marha <marha@users.sourceforge.net> | 2012-08-03 09:39:10 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-08-03 09:39:10 +0200 |
| commit | e158f8fc4a9cf2f884d156ff2dfc0870facfbcba (patch) | |
| tree | 9642a988d6674f27d6971ec2be7e2cdacc784862 /mesalib/src/mesa/state_tracker/st_cb_blit.c | |
| parent | ebfd1ae8f80dd16f99f9ef89c28a06f809d07f8d (diff) | |
| parent | 18e75aa6ae27a6e44d93babd96afbbe0cd6077c8 (diff) | |
| download | vcxsrv-e158f8fc4a9cf2f884d156ff2dfc0870facfbcba.tar.gz vcxsrv-e158f8fc4a9cf2f884d156ff2dfc0870facfbcba.tar.bz2 vcxsrv-e158f8fc4a9cf2f884d156ff2dfc0870facfbcba.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_cb_blit.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_cb_blit.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_cb_blit.c b/mesalib/src/mesa/state_tracker/st_cb_blit.c index b189cb406..1486779fd 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_blit.c +++ b/mesalib/src/mesa/state_tracker/st_cb_blit.c @@ -80,8 +80,9 @@ st_BlitFramebuffer_resolve(struct gl_context *ctx, info->src.res = srcRb->texture; info->src.layer = srcRb->surface->u.tex.first_layer; - - info->dst.surface = dstRb->surface; + info->dst.res = dstRb->texture; + info->dst.level = dstRb->surface->u.tex.level; + info->dst.layer = dstRb->surface->u.tex.first_layer; st->pipe->resource_resolve(st->pipe, info); } @@ -113,8 +114,9 @@ st_BlitFramebuffer_resolve(struct gl_context *ctx, info->src.res = srcRb->texture; info->src.layer = srcRb->surface->u.tex.first_layer; - - info->dst.surface = dstRb->surface; + info->dst.res = dstRb->texture; + info->dst.level = dstRb->surface->u.tex.level; + info->dst.layer = dstRb->surface->u.tex.first_layer; st->pipe->resource_resolve(st->pipe, info); } @@ -128,8 +130,9 @@ st_BlitFramebuffer_resolve(struct gl_context *ctx, info->src.res = srcRb->texture; info->src.layer = srcRb->surface->u.tex.first_layer; - - info->dst.surface = dstRb->surface; + info->dst.res = dstRb->texture; + info->dst.level = dstRb->surface->u.tex.level; + info->dst.layer = dstRb->surface->u.tex.first_layer; st->pipe->resource_resolve(st->pipe, info); } |