diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-02-29 13:24:31 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-02-29 13:24:31 +1100 |
| commit | 8c77e6f674206ef34ab15026b08e495209dcd4ea (patch) | |
| tree | 7d21d99eee6970b340bc7a3afedeadfc99dd5745 /src/gallium/drivers/i915simple/i915_winsys.h | |
| parent | 68ef52886263690632552ae187a4673945c2ab74 (diff) | |
| parent | ebe3b34ad225e320a09bb4069ce4d24808386327 (diff) | |
Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/gallium/drivers/i915simple/i915_winsys.h')
| -rw-r--r-- | src/gallium/drivers/i915simple/i915_winsys.h | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/gallium/drivers/i915simple/i915_winsys.h b/src/gallium/drivers/i915simple/i915_winsys.h index fe49710852..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, @@ -52,6 +57,7 @@ struct pipe_buffer; struct pipe_winsys; +struct pipe_screen; /** @@ -107,9 +113,12 @@ struct i915_winsys { #define I915_BUFFER_USAGE_LIT_VERTEX (PIPE_BUFFER_USAGE_CUSTOM << 0) -struct pipe_context *i915_create( struct pipe_winsys *, - struct i915_winsys *, - unsigned pci_id ); +struct pipe_context *i915_create_context( struct pipe_screen *, + struct pipe_winsys *, + struct i915_winsys * ); +#ifdef __cplusplus +} +#endif #endif |