diff options
| author | marha <marha@users.sourceforge.net> | 2012-11-21 09:05:28 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-11-21 09:05:28 +0100 |
| commit | 7fe89ca9151b68386fb6c9da1bd9fc8e9a33a796 (patch) | |
| tree | 0d078a56d8bcd7ffa319c9d6926aef3db5a7052b /mesalib/src/mesa/drivers/dri/common | |
| parent | 589f5feba1e7968b7318b02f4f2bdea81937f0e1 (diff) | |
| parent | 38eb7612c4b39dd69df4baf4450ba512e888effa (diff) | |
| download | vcxsrv-7fe89ca9151b68386fb6c9da1bd9fc8e9a33a796.tar.gz vcxsrv-7fe89ca9151b68386fb6c9da1bd9fc8e9a33a796.tar.bz2 vcxsrv-7fe89ca9151b68386fb6c9da1bd9fc8e9a33a796.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
Git update 21 nov 2012
Diffstat (limited to 'mesalib/src/mesa/drivers/dri/common')
| -rw-r--r-- | mesalib/src/mesa/drivers/dri/common/dri_util.c | 57 |
1 files changed, 30 insertions, 27 deletions
diff --git a/mesalib/src/mesa/drivers/dri/common/dri_util.c b/mesalib/src/mesa/drivers/dri/common/dri_util.c index 983bbea49..917b9465b 100644 --- a/mesalib/src/mesa/drivers/dri/common/dri_util.c +++ b/mesalib/src/mesa/drivers/dri/common/dri_util.c @@ -563,40 +563,43 @@ dri2GetAPIMask(__DRIscreen *screen) /** Core interface */ const __DRIcoreExtension driCoreExtension = { - { __DRI_CORE, __DRI_CORE_VERSION }, - NULL, - driDestroyScreen, - driGetExtensions, - driGetConfigAttrib, - driIndexConfigAttrib, - NULL, - driDestroyDrawable, - NULL, - NULL, - driCopyContext, - driDestroyContext, - driBindContext, - driUnbindContext + .base = { __DRI_CORE, __DRI_CORE_VERSION }, + + .createNewScreen = NULL, + .destroyScreen = driDestroyScreen, + .getExtensions = driGetExtensions, + .getConfigAttrib = driGetConfigAttrib, + .indexConfigAttrib = driIndexConfigAttrib, + .createNewDrawable = NULL, + .destroyDrawable = driDestroyDrawable, + .swapBuffers = NULL, + .createNewContext = NULL, + .copyContext = driCopyContext, + .destroyContext = driDestroyContext, + .bindContext = driBindContext, + .unbindContext = driUnbindContext }; /** DRI2 interface */ const __DRIdri2Extension driDRI2Extension = { - { __DRI_DRI2, 3 }, - dri2CreateNewScreen, - dri2CreateNewDrawable, - dri2CreateNewContext, - dri2GetAPIMask, - dri2CreateNewContextForAPI, - dri2AllocateBuffer, - dri2ReleaseBuffer, - dri2CreateContextAttribs + .base = { __DRI_DRI2, 3 }, + + .createNewScreen = dri2CreateNewScreen, + .createNewDrawable = dri2CreateNewDrawable, + .createNewContext = dri2CreateNewContext, + .getAPIMask = dri2GetAPIMask, + .createNewContextForAPI = dri2CreateNewContextForAPI, + .allocateBuffer = dri2AllocateBuffer, + .releaseBuffer = dri2ReleaseBuffer, + .createContextAttribs = dri2CreateContextAttribs }; const __DRI2configQueryExtension dri2ConfigQueryExtension = { - { __DRI2_CONFIG_QUERY, __DRI2_CONFIG_QUERY_VERSION }, - dri2ConfigQueryb, - dri2ConfigQueryi, - dri2ConfigQueryf, + .base = { __DRI2_CONFIG_QUERY, __DRI2_CONFIG_QUERY_VERSION }, + + .configQueryb = dri2ConfigQueryb, + .configQueryi = dri2ConfigQueryi, + .configQueryf = dri2ConfigQueryf, }; void |