diff options
| author | Thomas Hellstrom <thellstrom-at-vmware-dot-com> | 2009-04-28 11:49:39 +0200 |
|---|---|---|
| committer | Thomas Hellstrom <thellstrom-at-vmware-dot-com> | 2009-04-28 11:50:40 +0200 |
| commit | ca1f5f7e6c05e34cfe8ef10f29aa19f5547311e6 (patch) | |
| tree | a363f9f7b0cfe8b140f20e5cf91b4fcfbd0f606e /src/gallium/state_trackers/dri/dri_screen.h | |
| parent | a70c4f352e8e7aea0b130fd1285352bbf89503b5 (diff) | |
| download | external_mesa3d-ca1f5f7e6c05e34cfe8ef10f29aa19f5547311e6.zip external_mesa3d-ca1f5f7e6c05e34cfe8ef10f29aa19f5547311e6.tar.gz external_mesa3d-ca1f5f7e6c05e34cfe8ef10f29aa19f5547311e6.tar.bz2 | |
gallium: Update the dri2 state tracker to support dri1.
Signed-off-by: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
Diffstat (limited to 'src/gallium/state_trackers/dri/dri_screen.h')
| -rw-r--r-- | src/gallium/state_trackers/dri/dri_screen.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/gallium/state_trackers/dri/dri_screen.h b/src/gallium/state_trackers/dri/dri_screen.h index 3751ec6..c358c35 100644 --- a/src/gallium/state_trackers/dri/dri_screen.h +++ b/src/gallium/state_trackers/dri/dri_screen.h @@ -37,6 +37,8 @@ #include "pipe/p_compiler.h" +#include "state_tracker/dri1_api.h" + struct dri_screen { /* dri */ @@ -55,6 +57,7 @@ struct dri_screen /* drm */ int fd; + drmLock *drmLock; /* gallium */ struct pipe_winsys *pipe_winsys; @@ -73,15 +76,8 @@ dri_screen(__DRIscreenPrivate *sPriv) /*********************************************************************** * dri_screen.c */ -const __DRIconfig ** -dri_init_screen2(__DRIscreenPrivate *sPriv); - -void -dri_destroy_screen(__DRIscreenPrivate * sPriv); -int -dri_get_swap_info(__DRIdrawablePrivate * dPriv, - __DRIswapInfo * sInfo); +extern struct dri1_api *__dri1_api_hooks; #endif |