diff options
| author | Dave Airlie <airlied@linux.ie> | 2009-04-22 21:41:57 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2009-04-22 21:41:57 +1000 |
| commit | 466c78c93538f2853449124c06274d538830cd5a (patch) | |
| tree | a6bd88060ba328d8bed1ff2ea1a37ee741a90a17 /include/GL | |
| parent | 65fe0c86ffcff99f9f09606d462bf3731ea0c308 (diff) | |
| parent | f057f6543da469f231d551cb5728d98df8add4fa (diff) | |
Merge remote branch 'origin/master' into radeon-rewrite
Diffstat (limited to 'include/GL')
| -rw-r--r-- | include/GL/internal/dri_interface.h | 15 | ||||
| -rw-r--r-- | include/GL/mesa_wgl.h | 7 |
2 files changed, 14 insertions, 8 deletions
diff --git a/include/GL/internal/dri_interface.h b/include/GL/internal/dri_interface.h index a83602bfd8..335bf62a80 100644 --- a/include/GL/internal/dri_interface.h +++ b/include/GL/internal/dri_interface.h @@ -659,7 +659,7 @@ struct __DRIbufferRec { }; #define __DRI_DRI2_LOADER "DRI_DRI2Loader" -#define __DRI_DRI2_LOADER_VERSION 1 +#define __DRI_DRI2_LOADER_VERSION 2 struct __DRIdri2LoaderExtensionRec { __DRIextension base; @@ -667,6 +667,19 @@ struct __DRIdri2LoaderExtensionRec { int *width, int *height, unsigned int *attachments, int count, int *out_count, void *loaderPrivate); + + /** + * Flush pending front-buffer rendering + * + * Any rendering that has been performed to the + * \c __DRI_BUFFER_FAKE_FRONT_LEFT will be flushed to the + * \c __DRI_BUFFER_FRONT_LEFT. + * + * \param driDrawable Drawable whose front-buffer is to be flushed + * \param loaderPrivate Loader's private data that was previously passed + * into __DRIdri2ExtensionRec::createNewDrawable + */ + void (*flushFrontBuffer)(__DRIdrawable *driDrawable, void *loaderPrivate); }; /** diff --git a/include/GL/mesa_wgl.h b/include/GL/mesa_wgl.h index 57147232b7..ca2e1b875e 100644 --- a/include/GL/mesa_wgl.h +++ b/include/GL/mesa_wgl.h @@ -108,13 +108,6 @@ WGLAPI int GLAPIENTRY GetPixelFormat(HDC); WGLAPI int GLAPIENTRY SetPixelFormat(HDC,int,const PIXELFORMATDESCRIPTOR *); #endif -#ifndef WGL_ARB_extensions_string -#define WGL_ARB_extensions_string 1 - -WGLAPI const char * GLAPIENTRY wglGetExtensionsStringARB(HDC hdc); - -#endif /* WGL_ARB_extensions_string */ - #ifdef _MSC_VER # pragma warning( pop ) |