Bug 57746

Summary:	build test failure: nouveau_fbo.c:198:3: error: too few arguments to function 'nouveau_renderbuffer_del'
Product:	Mesa	Reporter:	Darxus <darxus>
Component:	Other	Assignee:	mesa-dev
Status:	VERIFIED FIXED	QA Contact:
Severity:	normal
Priority:	medium	CC:	darxus
Version:	git
Hardware:	Other
OS:	All
Whiteboard:
i915 platform:		i915 features:

Description Darxus 2012-11-30 21:42:04 UTC

c73245882c7ff1277b190b97f093f7b423a22f10 is the first bad commit (according to git bisect run):

Author: Brian Paul <brianp@vmware.com>
Date:   Fri Nov 30 10:04:48 2012 -0700

    mesa: pass context parameter to gl_renderbuffer::Delete()


Output I'm getting:

make[6]: Entering directory `/home/darxus/source.test.master/mesa/src/mesa/drivers/dri/nouveau'
...
  CC     nouveau_state.lo
nouveau_fbo.c: In function 'nouveau_renderbuffer_dri_new':
nouveau_fbo.c:198:3: warning: passing argument 1 of 'nouveau_renderbuffer_del' from incompatible pointer type [enabled by default]
nouveau_fbo.c:105:1: note: expected 'struct gl_context *' but argument is of type 'struct gl_renderbuffer *'
nouveau_fbo.c:198:3: error: too few arguments to function 'nouveau_renderbuffer_del'
nouveau_fbo.c:105:1: note: declared here


I am doing a git clean -xfd for each build.

Building with:  ./autogen.sh --prefix=$installdir --enable-gles2 --disable-gallium-egl --with-egl-platforms=wayland,x11,drm --enable-gbm --enable-shared-glapi --with-gallium-drivers=r300,r600,swrast,nouveau,svga

Comment 1 Brian Paul 2012-11-30 23:55:39 UTC

Can you try this patch:


diff --git a/src/mesa/drivers/dri/nouveau/nouveau_fbo.c b/src/mesa/drivers/dri/no
index c47bce8..156b4a3 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_fbo.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_fbo.c
@@ -195,7 +195,7 @@ nouveau_renderbuffer_dri_new(GLenum format, __DRIdrawable *dr
        rb->AllocStorage = nouveau_renderbuffer_dri_storage;
 
        if (!set_renderbuffer_format(rb, format)) {
-               nouveau_renderbuffer_del(rb);
+               nouveau_renderbuffer_del(NULL, rb);
                return NULL;
        }

Comment 2 Vinson Lee 2012-12-01 03:13:30 UTC

commit a17750b6884939a36947c76a30d3077f1488f943
Author: Brian Paul <brian.e.paul@gmail.com>
Date:   Fri Nov 30 19:11:21 2012 -0800

    nouveau: Fix build.
    
    Fixes nouveau build failure introduced at
    c73245882c7ff1277b190b97f093f7b423a22f10.
    
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=57746
    Signed-off-by: Vinson Lee <vlee@freedesktop.org>

Comment 3 Darxus 2012-12-01 03:39:38 UTC

Verified that commit builds without failure, thanks.

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.