Mesa (gallium-context-transfers): mesa/st: fix compilation after merge

Keith Whitwell keithw at kemper.freedesktop.org
Thu Mar 11 12:31:41 UTC 2010


Module: Mesa
Branch: gallium-context-transfers
Commit: 5c8e880ab4dc020358c08728b8adb1637d2dc5bc
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5c8e880ab4dc020358c08728b8adb1637d2dc5bc

Author: Keith Whitwell <keithw at vmware.com>
Date:   Thu Mar 11 12:31:21 2010 +0000

mesa/st: fix compilation after merge

---

 src/mesa/state_tracker/st_cb_drawpixels.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c
index 0e0ee70..3fa6d12 100644
--- a/src/mesa/state_tracker/st_cb_drawpixels.c
+++ b/src/mesa/state_tracker/st_cb_drawpixels.c
@@ -349,7 +349,6 @@ make_texture(struct st_context *st,
 {
    GLcontext *ctx = st->ctx;
    struct pipe_context *pipe = st->pipe;
-   struct pipe_screen *screen = pipe->screen;
    gl_format mformat;
    struct pipe_texture *pt;
    enum pipe_format pipeFormat;
@@ -1083,8 +1082,8 @@ st_CopyPixels(GLcontext *ctx, GLint srcx, GLint srcy,
 
       if (0) {
          /* debug */
-         debug_dump_surface("copypixsrcsurf", psRead);
-         debug_dump_surface("copypixtemptex", psTex);
+         debug_dump_surface(pipe, "copypixsrcsurf", psRead);
+         debug_dump_surface(pipe, "copypixtemptex", psTex);
       }
 
       pipe_surface_reference(&psRead, NULL); 




More information about the mesa-commit mailing list