Merge branch 'master' into r300-compiler

Conflicts:
	src/gallium/drivers/r300/r300_tgsi_to_rc.c

1 files changed, 11 insertions, 13 deletions

diff --git a/src/gallium/drivers/i915simple/i915_screen.h b/src/gallium/drivers/i915simple/i915_screen.h
index 5284c325951..5126485caa7 100644
--- a/src/gallium/drivers/i915simple/i915_screen.h
+++ b/src/gallium/drivers/i915simple/i915_screen.h
@@ -25,17 +25,14 @@
  * 
  **************************************************************************/
 
-
 #ifndef I915_SCREEN_H
 #define I915_SCREEN_H
 
-
+#include "pipe/p_state.h"
 #include "pipe/p_screen.h"
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+struct intel_winsys;
 
 
 /**
@@ -43,13 +40,14 @@ extern "C" {
  */
 struct i915_screen
 {
-   struct pipe_screen screen;
+   struct pipe_screen base;
+
+   struct intel_winsys *iws;
 
    boolean is_i945;
    uint pci_id;
 };
 
-
 /**
  * Subclass of pipe_transfer
  */
@@ -61,7 +59,11 @@ struct i915_transfer
 };
 
 
-/** cast wrappers */
+/*
+ * Cast wrappers
+ */
+
+
 static INLINE struct i915_screen *
 i915_screen(struct pipe_screen *pscreen)
 {
@@ -69,14 +71,10 @@ i915_screen(struct pipe_screen *pscreen)
 }
 
 static INLINE struct i915_transfer *
-i915_transfer( struct pipe_transfer *transfer )
+i915_transfer(struct pipe_transfer *transfer)
 {
    return (struct i915_transfer *)transfer;
 }
 
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* I915_SCREEN_H */