summaryrefslogtreecommitdiff
path: root/src/gallium
diff options
context:
space:
mode:
authorJosé Fonseca <jrfonseca@tungstengraphics.com>2008-02-27 15:59:09 +0900
committerJosé Fonseca <jrfonseca@tungstengraphics.com>2008-02-27 15:59:09 +0900
commitf81b7a6285455e838adb061dcca90036c9f99522 (patch)
treeba4222132cb96e462d2f9eb3f3815b939ed2188b /src/gallium
parent8902ce06e85f48a436ee3794c77f7abf59f56594 (diff)
gallium: update for new i915_screen.c file; fix some warnings.
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/drivers/i915simple/SConscript1
-rw-r--r--src/gallium/drivers/i915simple/i915_screen.c1
-rw-r--r--src/gallium/drivers/i915simple/i915_screen.h9
-rw-r--r--src/gallium/drivers/i915simple/i915_winsys.h9
4 files changed, 20 insertions, 0 deletions
diff --git a/src/gallium/drivers/i915simple/SConscript b/src/gallium/drivers/i915simple/SConscript
index f5fb96b995..3e1beaea6d 100644
--- a/src/gallium/drivers/i915simple/SConscript
+++ b/src/gallium/drivers/i915simple/SConscript
@@ -15,6 +15,7 @@ i915simple = env.ConvenienceLibrary(
'i915_fpc_translate.c',
'i915_prim_emit.c',
'i915_prim_vbuf.c',
+ 'i915_screen.c',
'i915_state.c',
'i915_state_derived.c',
'i915_state_dynamic.c',
diff --git a/src/gallium/drivers/i915simple/i915_screen.c b/src/gallium/drivers/i915simple/i915_screen.c
index 7e9d971d38..5630440a5a 100644
--- a/src/gallium/drivers/i915simple/i915_screen.c
+++ b/src/gallium/drivers/i915simple/i915_screen.c
@@ -30,6 +30,7 @@
#include "pipe/p_winsys.h"
#include "i915_reg.h"
+#include "i915_context.h"
#include "i915_screen.h"
#include "i915_texture.h"
diff --git a/src/gallium/drivers/i915simple/i915_screen.h b/src/gallium/drivers/i915simple/i915_screen.h
index 8394ddbe89..73b0ff05ce 100644
--- a/src/gallium/drivers/i915simple/i915_screen.h
+++ b/src/gallium/drivers/i915simple/i915_screen.h
@@ -33,6 +33,11 @@
#include "pipe/p_screen.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
/**
* Subclass of pipe_screen
*/
@@ -57,4 +62,8 @@ extern struct pipe_screen *
i915_create_screen(struct pipe_winsys *winsys, uint pci_id);
+#ifdef __cplusplus
+}
+#endif
+
#endif /* I915_SCREEN_H */
diff --git a/src/gallium/drivers/i915simple/i915_winsys.h b/src/gallium/drivers/i915simple/i915_winsys.h
index e6b0ac9c52..aea3003281 100644
--- a/src/gallium/drivers/i915simple/i915_winsys.h
+++ b/src/gallium/drivers/i915simple/i915_winsys.h
@@ -40,6 +40,11 @@
#include "pipe/p_defines.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
/* Pipe drivers are (meant to be!) independent of both GL and the
* window system. The window system provides a buffer manager and a
* set of additional hooks for things like command buffer submission,
@@ -112,4 +117,8 @@ struct pipe_context *i915_create_context( struct pipe_screen *,
struct pipe_winsys *,
struct i915_winsys * );
+#ifdef __cplusplus
+}
+#endif
+
#endif