Ver código fonte

Since glcontextmodes.[ch] are no longer used in the DRI drivers, removed the

IN_DRI_DRIVER cruft.  This was suggested by George Fufutos.
tags/mesa_6_3_2
Ian Romanick 20 anos atrás
pai
commit
da0c5b2e2c

+ 4
- 4
src/mesa/drivers/dri/common/glcontextmodes.c Ver arquivo

@@ -31,7 +31,7 @@
* \author Ian Romanick <idr@us.ibm.com>
*/

#if defined(IN_DRI_DRIVER) || defined(IN_MINI_GLX)
#if defined(IN_MINI_GLX)
# include <stdlib.h>
# include <string.h>
# include <GL/gl.h>
@@ -55,11 +55,11 @@ extern void __glXFree( void * ptr );
# define _mesa_malloc(b) Xmalloc(b)
# define _mesa_free(m) Xfree(m)
# endif /* XFree86Server */
#endif /* !defined(IN_DRI_DRIVER) */
#endif /* !defined(IN_MINI_GLX) */

#include "glcontextmodes.h"

#if !defined(IN_DRI_DRIVER) && !defined(IN_MINI_GLX)
#if !defined(IN_MINI_GLX)
#define NUM_VISUAL_TYPES 6

/**
@@ -320,7 +320,7 @@ _gl_get_context_mode_data(const __GLcontextModes *mode, int attribute,
return GLX_BAD_ATTRIBUTE;
}
}
#endif /* !defined(IN_DRI_DRIVER) */
#endif /* !defined(IN_MINI_GLX) */


/**

+ 2
- 2
src/mesa/drivers/dri/common/glcontextmodes.h Ver arquivo

@@ -32,14 +32,14 @@

#include "GL/internal/glcore.h"

#if !defined(IN_DRI_DRIVER) && !defined(IN_MINI_GLX)
#if !defined(IN_MINI_GLX)
extern GLint _gl_convert_from_x_visual_type( int visualType );
extern GLint _gl_convert_to_x_visual_type( int visualType );
extern void _gl_copy_visual_to_context_mode( __GLcontextModes * mode,
const __GLXvisualConfig * config );
extern int _gl_get_context_mode_data( const __GLcontextModes *mode,
int attribute, int *value_return );
#endif /* !defined(IN_DRI_DRIVER) */
#endif /* !defined(IN_MINI_GLX) */

extern __GLcontextModes * _gl_context_modes_create( unsigned count,
size_t minimum_size );

Carregando…
Cancelar
Salvar