qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge some definitions from dri 2.3 needed by xserver 1.13.

Browse Source 
ok mpi@
This commit is contained in:
matthieu 2012-09-16 17:02:37 +00:00
parent 762473fe35
commit 007f491121
2 changed files with 56 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
dist/Mesa/include/GL/internal/dri_interface.h vendored
View File

@ -756,11 +756,45 @@ struct __DRIdri2LoaderExtensionRec {
* constructors for DRI2. * constructors for DRI2.
*/ */
#define __DRI_DRI2 "DRI_DRI2" #define __DRI_DRI2 "DRI_DRI2"
#define __DRI_DRI2_VERSION 2 #define __DRI_DRI2_VERSION 3
#define __DRI_API_OPENGL 0 #define __DRI_API_OPENGL 0 /**< OpenGL compatibility profile */
#define __DRI_API_GLES 1 #define __DRI_API_GLES 1
#define __DRI_API_GLES2 2 #define __DRI_API_GLES2 2
#define __DRI_API_OPENGL_CORE 3 /**< OpenGL 3.2+ core profile */
#define __DRI_CTX_ATTRIB_MAJOR_VERSION 0
#define __DRI_CTX_ATTRIB_MINOR_VERSION 1
#define __DRI_CTX_ATTRIB_FLAGS 2
#define __DRI_CTX_FLAG_DEBUG 0x00000001
#define __DRI_CTX_FLAG_FORWARD_COMPATIBLE 0x00000002
/**
* \name Reasons that __DRIdri2Extension::createContextAttribs might fail
*/
/*@{*/
/** Success! */
#define __DRI_CTX_ERROR_SUCCESS 0
/** Memory allocation failure */
#define __DRI_CTX_ERROR_NO_MEMORY 1
/** Client requested an API (e.g., OpenGL ES 2.0) that the driver can't do. */
#define __DRI_CTX_ERROR_BAD_API 2
/** Client requested an API version that the driver can't do. */
#define __DRI_CTX_ERROR_BAD_VERSION 3
/** Client requested a flag or combination of flags the driver can't do. */
#define __DRI_CTX_ERROR_BAD_FLAG 4
/** Client requested an attribute the driver doesn't understand. */
#define __DRI_CTX_ERROR_UNKNOWN_ATTRIBUTE 5
/** Client requested a flag the driver doesn't understand. */
#define __DRI_CTX_ERROR_UNKNOWN_FLAG 6
/*@}*/
struct __DRIdri2ExtensionRec { struct __DRIdri2ExtensionRec {
__DRIextension base; __DRIextension base;
@ -795,6 +829,20 @@ struct __DRIdri2ExtensionRec {
int height); int height);
void (*releaseBuffer)(__DRIscreen *screen, void (*releaseBuffer)(__DRIscreen *screen,
__DRIbuffer *buffer); __DRIbuffer *buffer);
/**
* Create a context for a particular API with a set of attributes
*
* \since version 3
*/
__DRIcontext *(*createContextAttribs)(__DRIscreen *screen,
int api,
const __DRIconfig *config,
__DRIcontext *shared,
unsigned num_attribs,
const uint32_t *attribs,
unsigned *error,
void *loaderPrivate);
}; };

8
dist/Mesa/src/mesa/drivers/dri/common/dri_util.c vendored
View File

@ -941,14 +941,18 @@ const __DRIlegacyExtension driLegacyExtension = {
/** DRI2 interface */ /** DRI2 interface */
const __DRIdri2Extension driDRI2Extension = { const __DRIdri2Extension driDRI2Extension = {
{ __DRI_DRI2, __DRI_DRI2_VERSION }, /* Force the version to 2 because the underlying drivers don't (can't!)
* support the extra requirements of CreateContextAttribs.
*/
{ __DRI_DRI2, 2 },
dri2CreateNewScreen, dri2CreateNewScreen,
dri2CreateNewDrawable, dri2CreateNewDrawable,
dri2CreateNewContext, dri2CreateNewContext,
dri2GetAPIMask, dri2GetAPIMask,
dri2CreateNewContextForAPI, dri2CreateNewContextForAPI,
dri2AllocateBuffer, dri2AllocateBuffer,
dri2ReleaseBuffer dri2ReleaseBuffer,
NULL
}; };
const __DRI2configQueryExtension dri2ConfigQueryExtension = { const __DRI2configQueryExtension dri2ConfigQueryExtension = {