diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-08 16:53:17 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-08 16:53:17 +0100 |
| commit | 3ef320ddf5d23b4e69cc7d44a17f902e245f6426 (patch) | |
| tree | 93613bf53ec448c47fade975f70c4ec6b0051cb6 /mesalib/src/mesa | |
| parent | f707ea3ce065f0ce40f586c40283fab42059b485 (diff) | |
| download | vcxsrv-3ef320ddf5d23b4e69cc7d44a17f902e245f6426.tar.gz vcxsrv-3ef320ddf5d23b4e69cc7d44a17f902e245f6426.tar.bz2 vcxsrv-3ef320ddf5d23b4e69cc7d44a17f902e245f6426.zip | |
Solved compilation and run-time problems after latest merge
Diffstat (limited to 'mesalib/src/mesa')
| -rw-r--r-- | mesalib/src/mesa/drivers/dri/common/dri_util.c | 12 | ||||
| -rw-r--r-- | mesalib/src/mesa/drivers/dri/swrast/swrast.c | 3 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/imports.h | 1 |
3 files changed, 9 insertions, 7 deletions
diff --git a/mesalib/src/mesa/drivers/dri/common/dri_util.c b/mesalib/src/mesa/drivers/dri/common/dri_util.c index 6c5878452..75dc645ff 100644 --- a/mesalib/src/mesa/drivers/dri/common/dri_util.c +++ b/mesalib/src/mesa/drivers/dri/common/dri_util.c @@ -868,11 +868,11 @@ driImageFormatToGLFormat(uint32_t image_format) /** Image driver interface */ const __DRIimageDriverExtension driImageDriverExtension = { - .base = { __DRI_IMAGE_DRIVER, __DRI_IMAGE_DRIVER_VERSION }, + /*.base = */{ __DRI_IMAGE_DRIVER, __DRI_IMAGE_DRIVER_VERSION }, - .createNewScreen2 = driCreateNewScreen2, - .createNewDrawable = driCreateNewDrawable, - .createNewContext = driCreateNewContext, - .getAPIMask = driGetAPIMask, - .createContextAttribs = driCreateContextAttribs, + /*.createNewScreen2 =*/ driCreateNewScreen2, + /*.createNewDrawable =*/ driCreateNewDrawable, + /*.createNewContext =*/ driCreateNewContext, + /*.createContextAttribs =*/ driCreateContextAttribs, + /*.getAPIMask =*/ driGetAPIMask, }; diff --git a/mesalib/src/mesa/drivers/dri/swrast/swrast.c b/mesalib/src/mesa/drivers/dri/swrast/swrast.c index 6e76b1493..f6570a5df 100644 --- a/mesalib/src/mesa/drivers/dri/swrast/swrast.c +++ b/mesalib/src/mesa/drivers/dri/swrast/swrast.c @@ -669,6 +669,7 @@ dri_create_context(gl_api api, unsigned major_version, unsigned minor_version, uint32_t flags, + bool notify_reset, unsigned *error, void *sharedContextPrivate) { @@ -835,6 +836,8 @@ static const struct __DriverAPIRec swrast_driver_api = { /*.SwapBuffers = */dri_swap_buffers, /*.MakeCurrent = */dri_make_current, /*.UnbindContext = */dri_unbind_context, + /*.AllocateBuffer = */NULL, + /*.ReleaseBuffer = */NULL }; static const struct __DRIDriverVtableExtensionRec swrast_vtable = { diff --git a/mesalib/src/mesa/main/imports.h b/mesalib/src/mesa/main/imports.h index d79e2a339..53e40b445 100644 --- a/mesalib/src/mesa/main/imports.h +++ b/mesalib/src/mesa/main/imports.h @@ -141,7 +141,6 @@ static inline float acoshf(float x) { return logf(x + sqrtf(x * x - 1.0f)); } static inline float atanhf(float x) { return (logf(1.0f + x) - logf(1.0f - x)) / 2.0f; } static inline int isblank(int ch) { return ch == ' ' || ch == '\t'; } #define strtoll(p, e, b) _strtoi64(p, e, b) -#define strcasecmp(s1, s2) _stricmp(s1, s2) #endif /*@}*/ |