diff options
author | Chia-I Wu <olv@lunarg.com> | 2010-03-21 16:32:34 +0800 |
---|---|---|
committer | Chia-I Wu <olv@lunarg.com> | 2010-03-21 16:32:34 +0800 |
commit | 12deb9e6ca76d222badf71c8643e84640673e86d (patch) | |
tree | b11fef6689da399c661e8291d15ba938a6d88ab2 /src/gallium/state_trackers/dri/dri_screen.h | |
parent | 162bc831c93bf8632b25c11f116a1405b93a1704 (diff) | |
parent | fe5f070ef94219f12196bff6cb3274756ea03660 (diff) |
Merge remote branch 'origin/gallium-st-api-dri'
Diffstat (limited to 'src/gallium/state_trackers/dri/dri_screen.h')
-rw-r--r-- | src/gallium/state_trackers/dri/dri_screen.h | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/src/gallium/state_trackers/dri/dri_screen.h b/src/gallium/state_trackers/dri/dri_screen.h index 75a0ee4250..e9944e0f63 100644 --- a/src/gallium/state_trackers/dri/dri_screen.h +++ b/src/gallium/state_trackers/dri/dri_screen.h @@ -36,8 +36,9 @@ #include "xmlconfig.h" #include "pipe/p_compiler.h" - -#include "state_tracker/dri1_api.h" +#include "pipe/p_context.h" +#include "pipe/p_state.h" +#include "state_tracker/st_api.h" struct dri_screen { @@ -60,6 +61,11 @@ struct dri_screen boolean d_depth_bits_last; boolean sd_depth_bits_last; boolean auto_fake_front; + + struct st_manager *smapi; + + /* used only by DRI1 */ + struct pipe_context *dri1_pipe; }; /** cast wrapper */ @@ -69,11 +75,14 @@ dri_screen(__DRIscreen * sPriv) return (struct dri_screen *)sPriv->private; } -/*********************************************************************** - * dri_screen.c - */ +extern const uint __driNConfigOptions; + +const __DRIconfig ** +dri_fill_in_modes(struct dri_screen *screen, unsigned pixel_bits); -extern struct dri1_api *__dri1_api_hooks; +void +dri_fill_st_visual(struct st_visual *stvis, struct dri_screen *screen, + const __GLcontextModes *mode); #endif |