From: Pekka Paalanen <pq@iki.fi>
Date: Sat, 24 Jan 2009 17:56:13 +0000 (+0200)
Subject: nouveau: fix st_get_framebuffer_surface() breakage
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3af89cd3dec09b8cc5733cd45e2af05b689d0374;p=mesa.git

nouveau: fix st_get_framebuffer_surface() breakage

Someone changed the st_get_framebuffer_surface() signature, and did not
update the users in Nouveau winsys. Surface is returned via a pointer
now instead of returning it from the function. No semantic changes.

Signed-off-by: Pekka Paalanen <pq@iki.fi>
---

diff --git a/src/gallium/winsys/drm/nouveau/dri/nouveau_swapbuffers.c b/src/gallium/winsys/drm/nouveau/dri/nouveau_swapbuffers.c
index 38461b2b0cd..e111eec9327 100644
--- a/src/gallium/winsys/drm/nouveau/dri/nouveau_swapbuffers.c
+++ b/src/gallium/winsys/drm/nouveau/dri/nouveau_swapbuffers.c
@@ -58,7 +58,7 @@ nouveau_copy_sub_buffer(__DRIdrawablePrivate *dPriv, int x, int y, int w, int h)
 	struct nouveau_framebuffer *nvfb = dPriv->driverPrivate;
 	struct pipe_surface *surf;
 
-	surf = st_get_framebuffer_surface(nvfb->stfb, ST_SURFACE_BACK_LEFT);
+	st_get_framebuffer_surface(nvfb->stfb, ST_SURFACE_BACK_LEFT, &surf);
 	if (surf) {
 		drm_clip_rect_t rect;
 		rect.x1 = x;
@@ -77,7 +77,7 @@ nouveau_swap_buffers(__DRIdrawablePrivate *dPriv)
 	struct nouveau_framebuffer *nvfb = dPriv->driverPrivate;
 	struct pipe_surface *surf;
 
-	surf = st_get_framebuffer_surface(nvfb->stfb, ST_SURFACE_BACK_LEFT);
+	st_get_framebuffer_surface(nvfb->stfb, ST_SURFACE_BACK_LEFT, &surf);
 	if (surf) {
 		st_notify_swapbuffers(nvfb->stfb);
 		nouveau_copy_buffer(dPriv, surf, NULL);