6 files changed, 23 insertions, 23 deletions

diff --git a/src/gallium/winsys/egl_drm/intel/Makefile b/src/gallium/winsys/egl_drm/intel/Makefile
index 9c7ff065ff..e67b49f3ad 100644
--- a/src/gallium/winsys/egl_drm/intel/Makefile
+++ b/src/gallium/winsys/egl_drm/intel/Makefile
@@ -12,7 +12,7 @@ PIPE_DRIVERS = \
 DRIVER_SOURCES = \
 	intel_swapbuffers.c \
 	intel_context.c \
-	intel_screen.c \
+	intel_device.c \
 	intel_egl.c
 
 C_SOURCES = \
diff --git a/src/gallium/winsys/egl_drm/intel/intel_context.c b/src/gallium/winsys/egl_drm/intel/intel_context.c
index 7513f3feef..c2003f5e0e 100644
--- a/src/gallium/winsys/egl_drm/intel/intel_context.c
+++ b/src/gallium/winsys/egl_drm/intel/intel_context.c
@@ -27,7 +27,7 @@
 
 #include "i915simple/i915_screen.h"
 
-#include "intel_screen.h"
+#include "intel_device.h"
 #include "intel_context.h"
 #include "intel_batchbuffer.h"
 
@@ -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_screen *screen = (struct intel_screen *)egl_context->device->priv;
+	struct intel_device *screen = (struct intel_device *)egl_context->device->priv;
 	struct pipe_context *pipe;
 	struct st_context *st_share = NULL;
 
 	egl_context->priv = intel;
 
-	intel->intel_screen = screen;
+	intel->intel_device = screen;
 	intel->egl_context = egl_context;
 	intel->egl_device = egl_context->device;
 
@@ -183,8 +183,8 @@ intel_destroy_context(struct egl_drm_context *egl_context)
 {
 	struct intel_context *intel = egl_context->priv;
 
-	if (intel->intel_screen->dummy == intel)
-		intel->intel_screen->dummy = NULL;
+	if (intel->intel_device->dummy == intel)
+		intel->intel_device->dummy = NULL;
 
 	st_destroy_context(intel->st);
 	intel_be_destroy_context(&intel->base);
@@ -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_screen *intelScreen = (struct intel_screen *)draw->device->priv;
+	struct intel_device *intelScreen = (struct intel_device *)draw->device->priv;
 	struct intel_framebuffer *draw_fb = (struct intel_framebuffer *)draw->priv;
 
 	if (draw_fb->front_buffer)
diff --git a/src/gallium/winsys/egl_drm/intel/intel_context.h b/src/gallium/winsys/egl_drm/intel/intel_context.h
index f05a213ff0..48f9e21b5d 100644
--- a/src/gallium/winsys/egl_drm/intel/intel_context.h
+++ b/src/gallium/winsys/egl_drm/intel/intel_context.h
@@ -47,7 +47,7 @@ struct intel_context
 
 	struct st_context *st;
 
-	struct intel_screen *intel_screen;
+	struct intel_device *intel_device;
 
 	/* new egl stuff */
 	struct egl_drm_device *egl_device;
@@ -64,7 +64,7 @@ struct intel_framebuffer
 {
 	struct st_framebuffer *stfb;
 
-	struct intel_screen *screen;
+	struct intel_device *screen;
 	struct _DriBufferObject *front_buffer;
 	struct egl_drm_frontbuffer *front;
 };
diff --git a/src/gallium/winsys/egl_drm/intel/intel_screen.c b/src/gallium/winsys/egl_drm/intel/intel_device.c
index 8e6d184440..7496c1bb30 100644
--- a/src/gallium/winsys/egl_drm/intel/intel_screen.c
+++ b/src/gallium/winsys/egl_drm/intel/intel_device.c
@@ -32,7 +32,7 @@
 #include "i915simple/i915_screen.h"
 
 #include "intel_context.h"
-#include "intel_screen.h"
+#include "intel_device.h"
 #include "intel_batchbuffer.h"
 #include "intel_egl.h"
 
@@ -43,21 +43,21 @@ extern const struct dri_extension card_extensions[];
 int
 intel_create_device(struct egl_drm_device *device)
 {
-	struct intel_screen *intel_screen;
+	struct intel_device *intel_device;
 
 	/* Allocate the private area */
-	intel_screen = CALLOC_STRUCT(intel_screen);
-	if (!intel_screen)
+	intel_device = CALLOC_STRUCT(intel_device);
+	if (!intel_device)
 		return FALSE;
 
-	device->priv = (void *)intel_screen;
-	intel_screen->device = device;
+	device->priv = (void *)intel_device;
+	intel_device->device = device;
 
-	intel_screen->deviceID = device->deviceID;
+	intel_device->deviceID = device->deviceID;
 
-	intel_be_init_device(&intel_screen->base, device->drmFD, PCI_CHIP_I945_GM);
+	intel_be_init_device(&intel_device->base, device->drmFD, PCI_CHIP_I945_GM);
 
-	intel_screen->pipe = i915_create_screen(&intel_screen->base.base, intel_screen->deviceID);
+	intel_device->pipe = i915_create_screen(&intel_device->base.base, intel_device->deviceID);
 
 	/* hack */
 	driInitExtensions(NULL, card_extensions, GL_FALSE);
@@ -68,11 +68,11 @@ intel_create_device(struct egl_drm_device *device)
 int
 intel_destroy_device(struct egl_drm_device *device)
 {
-	struct intel_screen *intel_screen = (struct intel_screen *)device->priv;
+	struct intel_device *intel_device = (struct intel_device *)device->priv;
 	
-	intel_be_destroy_device(&intel_screen->base);
+	intel_be_destroy_device(&intel_device->base);
 
-	free(intel_screen);
+	free(intel_device);
 	device->priv = NULL;
 
 	return TRUE;
diff --git a/src/gallium/winsys/egl_drm/intel/intel_screen.h b/src/gallium/winsys/egl_drm/intel/intel_device.h
index 9b990b48e7..2f9d4f887e 100644
--- a/src/gallium/winsys/egl_drm/intel/intel_screen.h
+++ b/src/gallium/winsys/egl_drm/intel/intel_device.h
@@ -36,7 +36,7 @@ struct pipe_screen;
 struct egl_drm_device;
 struct intel_context;
 
-struct intel_screen
+struct intel_device
 {
 	struct intel_be_device base;
 	struct pipe_screen *pipe;
diff --git a/src/gallium/winsys/egl_drm/intel/intel_swapbuffers.c b/src/gallium/winsys/egl_drm/intel/intel_swapbuffers.c
index bfff6f935f..86e4a0f92a 100644
--- a/src/gallium/winsys/egl_drm/intel/intel_swapbuffers.c
+++ b/src/gallium/winsys/egl_drm/intel/intel_swapbuffers.c
@@ -25,7 +25,7 @@
  *
  **************************************************************************/
 
-#include "intel_screen.h"
+#include "intel_device.h"
 #include "intel_context.h"
 #include "intel_batchbuffer.h"
 #include "intel_reg.h"