From ad25d450ec2a0f04f628c58f89fe9f2c7b4d3bf3 Mon Sep 17 00:00:00 2001 From: Jakob Bornecrantz Date: Sat, 29 Aug 2009 11:32:32 +0100 Subject: [PATCH] i915g: Rename screen field on screen to base --- src/gallium/drivers/i915simple/i915_screen.c | 28 ++++++++++---------- src/gallium/drivers/i915simple/i915_screen.h | 3 ++- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/src/gallium/drivers/i915simple/i915_screen.c b/src/gallium/drivers/i915simple/i915_screen.c index a3de38d5860..c9a9e90f0e6 100644 --- a/src/gallium/drivers/i915simple/i915_screen.c +++ b/src/gallium/drivers/i915simple/i915_screen.c @@ -328,22 +328,22 @@ i915_create_screen(struct pipe_winsys *winsys, uint pci_id) i915screen->pci_id = pci_id; - i915screen->screen.winsys = winsys; + i915screen->base.winsys = winsys; - i915screen->screen.destroy = i915_destroy_screen; + i915screen->base.destroy = i915_destroy_screen; - i915screen->screen.get_name = i915_get_name; - i915screen->screen.get_vendor = i915_get_vendor; - i915screen->screen.get_param = i915_get_param; - i915screen->screen.get_paramf = i915_get_paramf; - i915screen->screen.is_format_supported = i915_is_format_supported; - i915screen->screen.get_tex_transfer = i915_get_tex_transfer; - i915screen->screen.tex_transfer_destroy = i915_tex_transfer_destroy; - i915screen->screen.transfer_map = i915_transfer_map; - i915screen->screen.transfer_unmap = i915_transfer_unmap; + i915screen->base.get_name = i915_get_name; + i915screen->base.get_vendor = i915_get_vendor; + i915screen->base.get_param = i915_get_param; + i915screen->base.get_paramf = i915_get_paramf; + i915screen->base.is_format_supported = i915_is_format_supported; + i915screen->base.get_tex_transfer = i915_get_tex_transfer; + i915screen->base.tex_transfer_destroy = i915_tex_transfer_destroy; + i915screen->base.transfer_map = i915_transfer_map; + i915screen->base.transfer_unmap = i915_transfer_unmap; - i915_init_screen_texture_functions(&i915screen->screen); - u_simple_screen_init(&i915screen->screen); + i915_init_screen_texture_functions(&i915screen->base); + u_simple_screen_init(&i915screen->base); - return &i915screen->screen; + return &i915screen->base; } diff --git a/src/gallium/drivers/i915simple/i915_screen.h b/src/gallium/drivers/i915simple/i915_screen.h index 5284c325951..7d5f0f05a5b 100644 --- a/src/gallium/drivers/i915simple/i915_screen.h +++ b/src/gallium/drivers/i915simple/i915_screen.h @@ -30,6 +30,7 @@ #define I915_SCREEN_H +#include "pipe/p_state.h" #include "pipe/p_screen.h" @@ -43,7 +44,7 @@ extern "C" { */ struct i915_screen { - struct pipe_screen screen; + struct pipe_screen base; boolean is_i945; uint pci_id; -- 2.30.2