i915: Complete the screen -> device renaming

diff --git a/src/gallium/winsys/egl_drm/intel/intel_context.c b/src/gallium/winsys/egl_drm/intel/intel_context.c
index c2003f5..927addb 100644 (file)
--- a/src/gallium/winsys/egl_drm/intel/intel_context.c
+++ b/src/gallium/winsys/egl_drm/intel/intel_context.c
@@ -147,13 +147,13 @@ int
 intel_create_context(struct egl_drm_context *egl_context, const __GLcontextModes *visual, void *sharedContextPrivate)
 {
        struct intel_context *intel = CALLOC_STRUCT(intel_context);
-       struct intel_device *screen = (struct intel_device *)egl_context->device->priv;
+       struct intel_device *device = (struct intel_device *)egl_context->device->priv;
        struct pipe_context *pipe;
        struct st_context *st_share = NULL;
 
        egl_context->priv = intel;
 
-       intel->intel_device = screen;
+       intel->intel_device = device;
        intel->egl_context = egl_context;
        intel->egl_device = egl_context->device;
 
@@ -161,19 +161,19 @@ intel_create_context(struct egl_drm_context *egl_context, const __GLcontextModes
        intel->base.hardware_unlock = intel_unlock_hardware;
        intel->base.hardware_locked = intel_locked_hardware;
 
-       intel_be_init_context(&intel->base, &screen->base);
+       intel_be_init_context(&intel->base, &device->base);
 
 #if 0
        pipe = intel_create_softpipe(intel, screen->winsys);
 #else
-       pipe = i915_create_context(screen->pipe, &screen->base.base, &intel->base.base);
+       pipe = i915_create_context(device->pipe, &device->base.base, &intel->base.base);
 #endif
 
        pipe->priv = intel;
 
        intel->st = st_create_context(pipe, visual, st_share);
 
-       screen->dummy = intel;
+       device->dummy = intel;
 
        return TRUE;
 }
@@ -220,7 +220,7 @@ intel_make_current(struct egl_drm_context *context, struct egl_drm_drawable *dra
 void
 intel_bind_frontbuffer(struct egl_drm_drawable *draw, struct egl_drm_frontbuffer *front)
 {
-       struct intel_device *intelScreen = (struct intel_device *)draw->device->priv;
+       struct intel_device *device = (struct intel_device *)draw->device->priv;
        struct intel_framebuffer *draw_fb = (struct intel_framebuffer *)draw->priv;
 
        if (draw_fb->front_buffer)
@@ -235,7 +235,7 @@ intel_bind_frontbuffer(struct egl_drm_drawable *draw, struct egl_drm_frontbuffer
 
        draw_fb->front = front;
 
-       driGenBuffers(intelScreen->base.staticPool, "front", 1, &draw_fb->front_buffer, 0, 0, 0);
+       driGenBuffers(device->base.staticPool, "front", 1, &draw_fb->front_buffer, 0, 0, 0);
        driBOSetReferenced(draw_fb->front_buffer, front->handle);
 
        st_resize_framebuffer(draw_fb->stfb, draw->w, draw->h);

diff --git a/src/gallium/winsys/egl_drm/intel/intel_context.h b/src/gallium/winsys/egl_drm/intel/intel_context.h
index 48f9e21..dfa4720 100644 (file)
--- a/src/gallium/winsys/egl_drm/intel/intel_context.h
+++ b/src/gallium/winsys/egl_drm/intel/intel_context.h
@@ -64,7 +64,7 @@ struct intel_framebuffer
 {
        struct st_framebuffer *stfb;
 
-       struct intel_device *screen;
+       struct intel_device *device;
        struct _DriBufferObject *front_buffer;
        struct egl_drm_frontbuffer *front;
 };

diff --git a/src/gallium/winsys/egl_drm/intel/intel_device.c b/src/gallium/winsys/egl_drm/intel/intel_device.c
index 7496c1b..a601904 100644 (file)
--- a/src/gallium/winsys/egl_drm/intel/intel_device.c
+++ b/src/gallium/winsys/egl_drm/intel/intel_device.c
@@ -88,7 +88,7 @@ intel_create_drawable(struct egl_drm_drawable *drawable,
        if (!intelfb)
                return GL_FALSE;
 
-       intelfb->screen = drawable->device->priv;
+       intelfb->device = drawable->device->priv;
 
        if (visual->redBits == 5)
                colorFormat = PIPE_FORMAT_R5G6B5_UNORM;

diff --git a/src/gallium/winsys/egl_drm/intel/intel_swapbuffers.c b/src/gallium/winsys/egl_drm/intel/intel_swapbuffers.c
index 86e4a0f..2edcbc7 100644 (file)
--- a/src/gallium/winsys/egl_drm/intel/intel_swapbuffers.c
+++ b/src/gallium/winsys/egl_drm/intel/intel_swapbuffers.c
@@ -69,7 +69,7 @@ intel_display_surface(struct egl_drm_drawable *draw,
        //const int srcWidth = surf->width;
        //const int srcHeight = surf->height;
 
-       intel = intel_fb->screen->dummy;
+       intel = intel_fb->device->dummy;
        if (!intel) {
                printf("No dummy context\n");
                return;