Merge branch 'gallium-0.1' into gallium-tex-surfaces

3 files changed, 6 insertions, 1 deletions

diff --git a/src/gallium/auxiliary/util/p_debug.c b/src/gallium/auxiliary/util/p_debug.c
index f1fb07bf5b..4ec1746662 100644
--- a/src/gallium/auxiliary/util/p_debug.c
+++ b/src/gallium/auxiliary/util/p_debug.c
@@ -422,4 +422,4 @@ void debug_print_format(const char *msg, unsigned fmt )
 
    debug_printf("%s: %s\n", msg, fmtstr); 
 }
-#endif
\ No newline at end of file
+#endif
diff --git a/src/gallium/auxiliary/util/u_blit.c b/src/gallium/auxiliary/util/u_blit.c
index 257473ab26..b70bcbfa66 100644
--- a/src/gallium/auxiliary/util/u_blit.c
+++ b/src/gallium/auxiliary/util/u_blit.c
@@ -296,6 +296,8 @@ util_blit_pixels(struct blit_state *ctx,
                       src, srcLeft, srcTop, /* src */
                       srcW, srcH);     /* size */
 
+   pipe->texture_update(pipe, tex, 0, 1 << 0);
+
    /* save state (restored below) */
    cso_save_blend(ctx->cso);
    cso_save_depth_stencil_alpha(ctx->cso);
diff --git a/src/gallium/auxiliary/util/u_gen_mipmap.c b/src/gallium/auxiliary/util/u_gen_mipmap.c
index 6ed5503c9a..056ae829ae 100644
--- a/src/gallium/auxiliary/util/u_gen_mipmap.c
+++ b/src/gallium/auxiliary/util/u_gen_mipmap.c
@@ -505,6 +505,9 @@ format_to_type_comps(enum pipe_format pformat,
       return;
    default:
       assert(0);
+      *datatype = UBYTE;
+      *comps = 0;
+      break;
    }
 }