← Back to branch summary

~ubuntu-branches/ubuntu/precise/mesa-lts-quantal/precise-updates

« back to all changes in this revision

Viewing changes to src/mesa/drivers/dri/nouveau/nouveau_fbo.c

  • Committer: Package Import Robot
  • Author(s): Maarten Lankhorst
  • Date: 2013-03-21 09:25:55 UTC
  • mfrom: (1.1.2)
  • Revision ID: package-import@ubuntu.com-20130321092555-mupc3s4vbgvaeqem
Tags: 9.0.3-0ubuntu0.1~precise1
https://launchpad.net/bugs/1134466
Copy mesa update from quantal. (LP: #1134466)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mesa/drivers/dri/nouveau/nouveau_fbo.c
102
102
}
103
103
 
104
104
static void
105
 
nouveau_renderbuffer_del(struct gl_renderbuffer *rb)
 
105
nouveau_renderbuffer_del(struct gl_context *ctx, struct gl_renderbuffer *rb)
106
106
{
107
107
        struct nouveau_surface *s = &to_nouveau_renderbuffer(rb)->surface;
108
108
 
109
109
        nouveau_surface_ref(NULL, s);
110
 
        FREE(rb);
 
110
        _mesa_delete_renderbuffer(ctx, rb);
111
111
}
112
112
 
113
113
static struct gl_renderbuffer *
195
195
        rb->AllocStorage = nouveau_renderbuffer_dri_storage;
196
196
 
197
197
        if (!set_renderbuffer_format(rb, format)) {
198
 
                nouveau_renderbuffer_del(rb);
 
198
                nouveau_renderbuffer_del(NULL, rb);
199
199
                return NULL;
200
200
        }
201
201