diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-12-04 21:45:33 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-12-04 21:45:33 +0100 |
| commit | c893ad65ca612962e59697b0174c74afb89cbe78 (patch) | |
| tree | 90906f572923256f08220d6c6d34286832dfba40 /nx-X11/extras/Mesa/src/mesa/drivers | |
| parent | b38d5b97dbd6c6b61c3ef0d046a4ba1c183a74f9 (diff) | |
| parent | 4e33fd4bef7c3254d53eb04a0d8f4312622f2092 (diff) | |
| download | nx-libs-c893ad65ca612962e59697b0174c74afb89cbe78.tar.gz nx-libs-c893ad65ca612962e59697b0174c74afb89cbe78.tar.bz2 nx-libs-c893ad65ca612962e59697b0174c74afb89cbe78.zip | |
Merge branch 'sunweaver-pr/drop-glx-ansic' into 3.6.x
Attributes GH PR #270: https://github.com/ArcticaProject/nx-libs/pull/270
Diffstat (limited to 'nx-X11/extras/Mesa/src/mesa/drivers')
| -rw-r--r-- | nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c | 26 | ||||
| -rw-r--r-- | nx-X11/extras/Mesa/src/mesa/drivers/x11/glxheader.h | 1 | ||||
| -rw-r--r-- | nx-X11/extras/Mesa/src/mesa/drivers/x11/xmesaP.h | 1 |
3 files changed, 6 insertions, 22 deletions
diff --git a/nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c b/nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c index bb1c82794..7d4d06ab8 100644 --- a/nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c +++ b/nx-X11/extras/Mesa/src/mesa/drivers/dri/common/glcontextmodes.c @@ -31,31 +31,17 @@ * \author Ian Romanick <idr@us.ibm.com> */ -#if defined(IN_MINI_GLX) # include <stdlib.h> # include <string.h> + +#if defined(IN_MINI_GLX) # include <GL/gl.h> # include "GL/internal/dri_interface.h" # include "imports.h" -# define __glXMemset memset #else # include <nx-X11/X.h> # include <GL/glx.h> # include "GL/glxint.h" - -# ifdef XFree86Server -void *memset( void * ptr, int val, size_t size); -# include "GL/glx_ansic.h" -extern void * __glXMalloc( size_t size ); -extern void __glXFree( void * ptr ); -# define _mesa_malloc(b) __glXMalloc(b) -# define _mesa_free(m) __glXFree(m) -# else -# include <nx-X11/Xlibint.h> -# define __glXMemset memset -# define _mesa_malloc(b) Xmalloc(b) -# define _mesa_free(m) Xfree(m) -# endif /* XFree86Server */ #endif /* !defined(IN_MINI_GLX) */ #include "glcontextmodes.h" @@ -127,7 +113,7 @@ _gl_copy_visual_to_context_mode( __GLcontextModes * mode, { __GLcontextModes * const next = mode->next; - (void) __glXMemset( mode, 0, sizeof( __GLcontextModes ) ); + (void) memset( mode, 0, sizeof( __GLcontextModes ) ); mode->next = next; mode->visualID = config->vid; @@ -361,14 +347,14 @@ _gl_context_modes_create( unsigned count, size_t minimum_size ) next = & base; for ( i = 0 ; i < count ; i++ ) { - *next = (__GLcontextModes *) _mesa_malloc( size ); + *next = (__GLcontextModes *) malloc( size ); if ( *next == NULL ) { _gl_context_modes_destroy( base ); base = NULL; break; } - (void) __glXMemset( *next, 0, size ); + (void) memset( *next, 0, size ); (*next)->visualID = GLX_DONT_CARE; (*next)->visualType = GLX_DONT_CARE; (*next)->visualRating = GLX_NONE; @@ -402,7 +388,7 @@ _gl_context_modes_destroy( __GLcontextModes * modes ) while ( modes != NULL ) { __GLcontextModes * const next = modes->next; - _mesa_free( modes ); + free( modes ); modes = next; } } diff --git a/nx-X11/extras/Mesa/src/mesa/drivers/x11/glxheader.h b/nx-X11/extras/Mesa/src/mesa/drivers/x11/glxheader.h index 33d937f1c..6a1f2ed20 100644 --- a/nx-X11/extras/Mesa/src/mesa/drivers/x11/glxheader.h +++ b/nx-X11/extras/Mesa/src/mesa/drivers/x11/glxheader.h @@ -38,7 +38,6 @@ # include "resource.h" # include "windowstr.h" # include "gcstruct.h" -# include "GL/xf86glx.h" # include "xf86glx_util.h" #else diff --git a/nx-X11/extras/Mesa/src/mesa/drivers/x11/xmesaP.h b/nx-X11/extras/Mesa/src/mesa/drivers/x11/xmesaP.h index 26255ae56..c5037e619 100644 --- a/nx-X11/extras/Mesa/src/mesa/drivers/x11/xmesaP.h +++ b/nx-X11/extras/Mesa/src/mesa/drivers/x11/xmesaP.h @@ -28,7 +28,6 @@ #ifdef XFree86Server -# include "GL/xf86glx.h" # include "xf86glx_util.h" #elif defined(USE_XSHM) # include <X11/extensions/XShm.h> |