diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-12 11:22:24 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-12 11:22:24 +0100 |
| commit | f1b679a372274041aa3e7a02f979390b17eb1ab5 (patch) | |
| tree | f5bad38b25c1e5bf69cb06b4236cccb4310f769f /mesalib/src/mesa/drivers/dri | |
| parent | 3ef320ddf5d23b4e69cc7d44a17f902e245f6426 (diff) | |
| parent | b73c544c61712f7bd57f3c9a0f6046481f58038b (diff) | |
| download | vcxsrv-f1b679a372274041aa3e7a02f979390b17eb1ab5.tar.gz vcxsrv-f1b679a372274041aa3e7a02f979390b17eb1ab5.tar.bz2 vcxsrv-f1b679a372274041aa3e7a02f979390b17eb1ab5.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
pixman mesa fontconfig git update 12 nov 2013
Conflicts:
mesalib/src/mesa/drivers/dri/swrast/swrast.c
Diffstat (limited to 'mesalib/src/mesa/drivers/dri')
| -rwxr-xr-x[-rw-r--r--] | mesalib/src/mesa/drivers/dri/swrast/swrast.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/mesa/drivers/dri/swrast/swrast.c b/mesalib/src/mesa/drivers/dri/swrast/swrast.c index f6570a5df..136a76fd9 100644..100755 --- a/mesalib/src/mesa/drivers/dri/swrast/swrast.c +++ b/mesalib/src/mesa/drivers/dri/swrast/swrast.c @@ -669,7 +669,7 @@ dri_create_context(gl_api api, unsigned major_version, unsigned minor_version, uint32_t flags, - bool notify_reset, + bool notify_reset, unsigned *error, void *sharedContextPrivate) { @@ -836,7 +836,7 @@ static const struct __DriverAPIRec swrast_driver_api = { /*.SwapBuffers = */dri_swap_buffers, /*.MakeCurrent = */dri_make_current, /*.UnbindContext = */dri_unbind_context, - /*.AllocateBuffer = */NULL, + /*.AllocateBuffer = */NULL, /*.ReleaseBuffer = */NULL }; |