diff options
author | Roland Scheidegger <sroland@vmware.com> | 2010-03-30 01:52:13 +0200 |
---|---|---|
committer | Roland Scheidegger <sroland@vmware.com> | 2010-03-30 01:52:13 +0200 |
commit | 733df0059f04e3fd7e3265d3c80dd8029f939c60 (patch) | |
tree | 5073edcb41611b86c9a62fa75c2c089fd2babf48 /src/gallium/state_trackers/dri/drm/dri1.c | |
parent | 6fb364a1717858d8201b2caf234076ce5d4832ac (diff) | |
parent | 5fa09846618ed702493f054a1d4b0ec2a28fbbd0 (diff) | |
download | external_mesa3d-733df0059f04e3fd7e3265d3c80dd8029f939c60.zip external_mesa3d-733df0059f04e3fd7e3265d3c80dd8029f939c60.tar.gz external_mesa3d-733df0059f04e3fd7e3265d3c80dd8029f939c60.tar.bz2 |
Merge branch 'master' into gallium-new-formats
Conflicts:
src/gallium/auxiliary/util/u_format.csv
Diffstat (limited to 'src/gallium/state_trackers/dri/drm/dri1.c')
-rw-r--r-- | src/gallium/state_trackers/dri/drm/dri1.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/gallium/state_trackers/dri/drm/dri1.c b/src/gallium/state_trackers/dri/drm/dri1.c index aad098b..9b5842b 100644 --- a/src/gallium/state_trackers/dri/drm/dri1.c +++ b/src/gallium/state_trackers/dri/drm/dri1.c @@ -404,6 +404,19 @@ dri1_allocate_textures(struct dri_drawable *drawable, drawable->old_h = height; } +/* + * Backend function for init_screen. + */ + +static const __DRIextension *dri1_screen_extensions[] = { + &driReadDrawableExtension, + &driCopySubBufferExtension.base, + &driSwapControlExtension.base, + &driFrameTrackingExtension.base, + &driMediaStreamCounterExtension.base, + NULL +}; + static void st_dri_lock(struct pipe_context *pipe) { @@ -442,21 +455,6 @@ static struct dri1_api_lock_funcs dri1_lf = { .clear_lost_lock = st_dri_clear_lost_lock }; -/* - * Backend function for init_screen. - */ - -static const __DRIextension *dri1_screen_extensions[] = { - &driReadDrawableExtension, - &driCopySubBufferExtension.base, - &driSwapControlExtension.base, - &driFrameTrackingExtension.base, - &driMediaStreamCounterExtension.base, - NULL -}; - -struct dri1_api *__dri1_api_hooks = NULL; - static INLINE void dri1_copy_version(struct dri1_api_version *dst, const struct __DRIversionRec *src) @@ -466,6 +464,8 @@ dri1_copy_version(struct dri1_api_version *dst, dst->patch_level = src->patch; } +struct dri1_api *__dri1_api_hooks = NULL; + const __DRIconfig ** dri1_init_screen(__DRIscreen * sPriv) { |