nv50: fix a typo and a thinko

diff --git a/src/gallium/drivers/nv50/nv50_miptree.c b/src/gallium/drivers/nv50/nv50_miptree.c
index 415080bc98d6626a4e4c961bd65a6ce849b67737..430e75a4116ab7e6b332a94057b5ef640ecc59c2 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_miptree.c
+++ b/src/gallium/drivers/nv50/nv50_miptree.c
@@ -124,7 +124,7 @@ nv50_miptree_sync(struct pipe_screen *pscreen, struct nv50_miptree *mt,
        struct pipe_surface *dst, *src;
        unsigned face = 0, zslice = 0;
 
-       if (!lvl->image_dirty_cpu & (1 << image))
+       if (!(lvl->image_dirty_cpu & (1 << image)))
                return;
 
        if (mt->base.target == PIPE_TEXTURE_CUBE)
@@ -138,14 +138,15 @@ nv50_miptree_sync(struct pipe_screen *pscreen, struct nv50_miptree *mt,
         */
        lvl->image_dirty_cpu &= ~(1 << image);
 
-       dst = pscreen->get_tex_surface(pscreen, &mt->base, face, level, zslice,
-                                      PIPE_BUFFER_USAGE_GPU_WRITE);
        /* Pretend we're doing CPU access so we get the backing pipe_surface
         * and not a view into the larger miptree.
         */
        src = pscreen->get_tex_surface(pscreen, &mt->base, face, level, zslice,
                                       PIPE_BUFFER_USAGE_CPU_READ);
 
+       dst = pscreen->get_tex_surface(pscreen, &mt->base, face, level, zslice,
+                                      PIPE_BUFFER_USAGE_GPU_WRITE);
+
        nvws->surface_copy(nvws, dst, 0, 0, src, 0, 0, dst->width, dst->height);
 
        pscreen->tex_surface_release(pscreen, &dst);