← Back to branch summary

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

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Robert Hooker
  • Date: 2012-02-02 12:05:48 UTC
  • mfrom: (1.7.1) (3.3.27 sid)
  • Revision ID: package-import@ubuntu.com-20120202120548-nvkma85jq0h4coix
Tags: 8.0~rc2-0ubuntu4
Drop drisearchdir handling, it is no longer needed with multiarch
and dri-alternates being removed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/mesa/drivers/dri/nouveau/nouveau_screen.c
35
35
 
36
36
#include "main/framebuffer.h"
37
37
#include "main/renderbuffer.h"
 
38
#include "swrast/s_renderbuffer.h"
38
39
 
39
40
static const __DRIextension *nouveau_screen_extensions[];
40
41
 
97
98
        if (!screen)
98
99
                return NULL;
99
100
 
100
 
        dri_screen->private = screen;
 
101
        dri_screen->driverPrivate = screen;
101
102
        dri_screen->extensions = nouveau_screen_extensions;
102
103
        screen->dri_screen = dri_screen;
103
104
 
138
139
static void
139
140
nouveau_destroy_screen(__DRIscreen *dri_screen)
140
141
{
141
 
        struct nouveau_screen *screen = dri_screen->private;
 
142
        struct nouveau_screen *screen = dri_screen->driverPrivate;
142
143
 
143
144
        if (!screen)
144
145
                return;
147
148
                nouveau_device_close(&screen->device);
148
149
 
149
150
        FREE(screen);
150
 
        dri_screen->private = NULL;
 
151
        dri_screen->driverPrivate = NULL;
151
152
}
152
153
 
153
154
static GLboolean
200
201
        }
201
202
 
202
203
        /* Software renderbuffers. */
203
 
        _mesa_add_soft_renderbuffers(fb, GL_FALSE, GL_FALSE, GL_FALSE,
204
 
                                     visual->accumRedBits > 0,
205
 
                                     GL_FALSE, GL_FALSE);
 
204
        _swrast_add_soft_renderbuffers(fb, GL_FALSE, GL_FALSE, GL_FALSE,
 
205
                                       visual->accumRedBits > 0,
 
206
                                       GL_FALSE, GL_FALSE);
206
207
 
207
208
        drawable->driverPrivate = fb;
208
209
 
241
242
};
242
243
 
243
244
const struct __DriverAPIRec driDriverAPI = {
244
 
        .InitScreen2     = nouveau_init_screen2,
 
245
        .InitScreen      = nouveau_init_screen2,
245
246
        .DestroyScreen   = nouveau_destroy_screen,
246
247
        .CreateBuffer    = nouveau_create_buffer,
247
248
        .DestroyBuffer   = nouveau_destroy_buffer,