diff options
| author | Luc Verhaegen <libv@skynet.be> | 2010-03-13 04:46:12 +0100 |
|---|---|---|
| committer | Luc Verhaegen <libv@skynet.be> | 2010-03-13 04:46:12 +0100 |
| commit | 87a6ef144f9b38898ec236450a92421f4891ad22 (patch) | |
| tree | 0c1510cd43366a11db6a67c686cc98dfe294e890 | |
| parent | de814ae57b9649f29e34a9414513e11a665a4f00 (diff) | |
DRI SDK headers from mesa 7.4.4.
| -rw-r--r-- | GL/internal/dri_interface.h | 15 | ||||
| -rw-r--r-- | mesa/main/context.h | 3 | ||||
| -rw-r--r-- | mesa/main/glheader.h | 5 | ||||
| -rw-r--r-- | mesa/main/mtypes.h | 2 |
4 files changed, 23 insertions, 2 deletions
diff --git a/GL/internal/dri_interface.h b/GL/internal/dri_interface.h index 27cc1be..09ae940 100644 --- a/GL/internal/dri_interface.h +++ b/GL/internal/dri_interface.h @@ -636,7 +636,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; @@ -644,6 +644,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/mesa/main/context.h b/mesa/main/context.h index 54f1af9..8c1196d 100644 --- a/mesa/main/context.h +++ b/mesa/main/context.h @@ -132,6 +132,9 @@ extern void _mesa_make_current( GLcontext *ctx, GLframebuffer *drawBuffer, GLframebuffer *readBuffer ); +extern void +_mesa_check_init_viewport(GLcontext *ctx, GLuint width, GLuint height); + extern GLboolean _mesa_share_state(GLcontext *ctx, GLcontext *ctxToShare); diff --git a/mesa/main/glheader.h b/mesa/main/glheader.h index 626806d..d17be37 100644 --- a/mesa/main/glheader.h +++ b/mesa/main/glheader.h @@ -145,7 +145,10 @@ #if defined(__linux__) #include <byteswap.h> #define CPU_TO_LE32( x ) bswap_32( x ) -#else /*__linux__*/ +#elif defined(__APPLE__) +#include <CoreFoundation/CFByteOrder.h> +#define CPU_TO_LE32( x ) CFSwapInt32HostToLittle( x ) +#else /*__linux__ __APPLE__*/ #include <sys/endian.h> #define CPU_TO_LE32( x ) bswap32( x ) #endif /*__linux__*/ diff --git a/mesa/main/mtypes.h b/mesa/main/mtypes.h index a9eb248..f5826ca 100644 --- a/mesa/main/mtypes.h +++ b/mesa/main/mtypes.h @@ -3063,6 +3063,8 @@ struct __GLcontextRec GLenum RenderMode; /**< either GL_RENDER, GL_SELECT, GL_FEEDBACK */ GLbitfield NewState; /**< bitwise-or of _NEW_* flags */ + GLboolean ViewportInitialized; /**< has viewport size been initialized? */ + /** \name Derived state */ /*@{*/ /** Bitwise-or of DD_* flags. Note that this bitfield may be used before |