Module: Mesa Branch: gallium-array-textures Commit: f433b7f7f552720e5eade0b4078db94590ee85e1 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f433b7f7f552720e5eade0b4078db94590ee85e1
Author: Roland Scheidegger <[email protected]> Date: Mon Jun 14 11:35:52 2010 +0100 gallium: fix a couple of bugs in interface chnage fixes --- .../state_trackers/dri/common/dri1_helper.c | 1 - .../state_trackers/egl/common/native_helper.c | 2 +- src/gallium/state_trackers/glx/xlib/xm_st.c | 3 ++- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gallium/state_trackers/dri/common/dri1_helper.c b/src/gallium/state_trackers/dri/common/dri1_helper.c index 45885ff..fca7977 100644 --- a/src/gallium/state_trackers/dri/common/dri1_helper.c +++ b/src/gallium/state_trackers/dri/common/dri1_helper.c @@ -86,7 +86,6 @@ dri1_swap_fences_clear(struct dri_drawable *drawable) struct pipe_surface * dri1_get_pipe_surface(struct dri_drawable *drawable, struct pipe_resource *ptex) { - struct pipe_screen *pipe_screen = dri_screen(drawable->sPriv)->base.screen; struct pipe_surface *psurf = drawable->dri1_surface; if (!psurf || psurf->texture != ptex) { diff --git a/src/gallium/state_trackers/egl/common/native_helper.c b/src/gallium/state_trackers/egl/common/native_helper.c index 01969c2..f961933 100644 --- a/src/gallium/state_trackers/egl/common/native_helper.c +++ b/src/gallium/state_trackers/egl/common/native_helper.c @@ -212,7 +212,7 @@ resource_surface_present(struct resource_surface *rsurf, return TRUE; rsurf->screen->flush_frontbuffer(rsurf->screen, - psurf, 0, 0, winsys_drawable_handle); + pres, 0, 0, winsys_drawable_handle); return TRUE; } diff --git a/src/gallium/state_trackers/glx/xlib/xm_st.c b/src/gallium/state_trackers/glx/xlib/xm_st.c index aca3eb9..6061470 100644 --- a/src/gallium/state_trackers/glx/xlib/xm_st.c +++ b/src/gallium/state_trackers/glx/xlib/xm_st.c @@ -70,6 +70,7 @@ xmesa_st_framebuffer_display(struct st_framebuffer_iface *stfbi, /* (re)allocate the surface for the texture to be displayed */ if (!pres || pres != ptex) { pipe_resource_reference(&xstfb->display_resource, ptex); + pres = xstfb->display_resource; } xstfb->screen->flush_frontbuffer(xstfb->screen, pres, 0, 0, &xstfb->buffer->ws); @@ -90,7 +91,7 @@ xmesa_st_framebuffer_copy_textures(struct st_framebuffer_iface *stfbi, struct xmesa_st_framebuffer *xstfb = xmesa_st_framebuffer(stfbi); struct pipe_resource *src_ptex = xstfb->textures[src_statt]; struct pipe_resource *dst_ptex = xstfb->textures[dst_statt]; - struct pipe_box *src_box; + struct pipe_box src_box; struct pipe_context *pipe; if (!src_ptex || !dst_ptex) _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
