Mesa (master): nvc0: use correct resource target to select blit shader

Christoph Bumiller chrisbmr at kemper.freedesktop.org
Tue Jan 8 15:14:36 UTC 2013


Module: Mesa
Branch: master
Commit: b9c8a98e216f4613dc0a40e26d08f2c1cb760e76
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b9c8a98e216f4613dc0a40e26d08f2c1cb760e76

Author: Christoph Bumiller <e0425955 at student.tuwien.ac.at>
Date:   Mon Jan  7 22:12:28 2013 +0100

nvc0: use correct resource target to select blit shader

---

 src/gallium/drivers/nvc0/nvc0_surface.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/nvc0/nvc0_surface.c b/src/gallium/drivers/nvc0/nvc0_surface.c
index 2f81cf5..591f67c 100644
--- a/src/gallium/drivers/nvc0/nvc0_surface.c
+++ b/src/gallium/drivers/nvc0/nvc0_surface.c
@@ -544,7 +544,7 @@ nvc0_blit_select_fp(struct nvc0_blitctx *ctx, const struct pipe_blit_info *info)
    struct nvc0_blitter *blitter = ctx->nvc0->screen->blitter;
 
    const enum pipe_texture_target ptarg =
-      nv50_blit_reinterpret_pipe_texture_target(info->dst.resource->target);
+      nv50_blit_reinterpret_pipe_texture_target(info->src.resource->target);
 
    const unsigned targ = nv50_blit_texture_type(ptarg);
    const unsigned mode = ctx->mode;
@@ -553,7 +553,7 @@ nvc0_blit_select_fp(struct nvc0_blitctx *ctx, const struct pipe_blit_info *info)
       pipe_mutex_lock(blitter->mutex);
       if (!blitter->fp[targ][mode])
          blitter->fp[targ][mode] =
-            nv50_blitter_make_fp(&ctx->nvc0->base.pipe, mode, targ);
+            nv50_blitter_make_fp(&ctx->nvc0->base.pipe, mode, ptarg);
       pipe_mutex_unlock(blitter->mutex);
    }
    ctx->fp = blitter->fp[targ][mode];




More information about the mesa-commit mailing list