summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/i915simple/i915_screen.h
diff options
context:
space:
mode:
authorJakob Bornecrantz <[email protected]>2009-08-30 21:10:36 +0100
committerJakob Bornecrantz <[email protected]>2009-08-31 16:29:58 +0100
commit1bb3a2c648e0d6feea12bfff7f739159339f034a (patch)
treee291168b5441dd8fb6593048c9e4c61f858afade /src/gallium/drivers/i915simple/i915_screen.h
parent1b5f46a3b8d1d1ffa7cbb60b557deb8c2c448a3a (diff)
i915g: Cleanup i915_screen.[c|h]
Diffstat (limited to 'src/gallium/drivers/i915simple/i915_screen.h')
-rw-r--r--src/gallium/drivers/i915simple/i915_screen.h20
1 files changed, 6 insertions, 14 deletions
diff --git a/src/gallium/drivers/i915simple/i915_screen.h b/src/gallium/drivers/i915simple/i915_screen.h
index 7d5f0f05a5b..757baa76b85 100644
--- a/src/gallium/drivers/i915simple/i915_screen.h
+++ b/src/gallium/drivers/i915simple/i915_screen.h
@@ -25,20 +25,13 @@
*
**************************************************************************/
-
#ifndef I915_SCREEN_H
#define I915_SCREEN_H
-
#include "pipe/p_state.h"
#include "pipe/p_screen.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
/**
* Subclass of pipe_screen
*/
@@ -50,7 +43,6 @@ struct i915_screen
uint pci_id;
};
-
/**
* Subclass of pipe_transfer
*/
@@ -62,7 +54,11 @@ struct i915_transfer
};
-/** cast wrappers */
+/*
+ * Cast wrappers
+ */
+
+
static INLINE struct i915_screen *
i915_screen(struct pipe_screen *pscreen)
{
@@ -70,14 +66,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 */