i915g: Rename screen field on screen to base

[mesa.git] / src / gallium / drivers / i915simple / i915_screen.h

diff --git a/src/gallium/drivers/i915simple/i915_screen.h b/src/gallium/drivers/i915simple/i915_screen.h
index 73b0ff05ce7df76859ac5013ffc2dd085e98e1ba..7d5f0f05a5bcafd84bbdd5a5f1be9949e50ada69 100644 (file)
--- 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,23 +44,36 @@ extern "C" {
  */
 struct i915_screen
 {
-   struct pipe_screen screen;
+   struct pipe_screen base;
 
    boolean is_i945;
    uint pci_id;
 };
 
 
-/** cast wrapper */
+/**
+ * Subclass of pipe_transfer
+ */
+struct i915_transfer
+{
+   struct pipe_transfer base;
+
+   unsigned offset;
+};
+
+
+/** cast wrappers */
 static INLINE struct i915_screen *
 i915_screen(struct pipe_screen *pscreen)
 {
    return (struct i915_screen *) pscreen;
 }
 
-
-extern struct pipe_screen *
-i915_create_screen(struct pipe_winsys *winsys, uint pci_id);
+static INLINE struct i915_transfer *
+i915_transfer( struct pipe_transfer *transfer )
+{
+   return (struct i915_transfer *)transfer;
+}
 
 
 #ifdef __cplusplus