diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-22 08:51:58 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-22 08:51:58 +0100 |
| commit | 7dbaa1cffdf176f803f2c7069fb6810e16a86f72 (patch) | |
| tree | e12bbf56a362758517fa9c26e46eca212448aca7 /mesalib/src/mesa/main/debug.c | |
| parent | 4887502815f54a96dce04c1f503f9e5f6ea7408a (diff) | |
| parent | 697f071e3dcd3b01dba050d6c5316f2a23ee82f8 (diff) | |
| download | vcxsrv-7dbaa1cffdf176f803f2c7069fb6810e16a86f72.tar.gz vcxsrv-7dbaa1cffdf176f803f2c7069fb6810e16a86f72.tar.bz2 vcxsrv-7dbaa1cffdf176f803f2c7069fb6810e16a86f72.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libxtrans mesa git update 22 nov 2013
Diffstat (limited to 'mesalib/src/mesa/main/debug.c')
| -rw-r--r-- | mesalib/src/mesa/main/debug.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/mesalib/src/mesa/main/debug.c b/mesalib/src/mesa/main/debug.c index 9434c1ea2..99b214789 100644 --- a/mesalib/src/mesa/main/debug.c +++ b/mesalib/src/mesa/main/debug.c @@ -103,7 +103,7 @@ _mesa_print_state( const char *msg, GLuint state ) /** * Print information about this Mesa version and build options. */ -void _mesa_print_info( void ) +void _mesa_print_info( struct gl_context *ctx ) { _mesa_debug(NULL, "Mesa GL_VERSION = %s\n", (char *) _mesa_GetString(GL_VERSION)); @@ -111,8 +111,12 @@ void _mesa_print_info( void ) (char *) _mesa_GetString(GL_RENDERER)); _mesa_debug(NULL, "Mesa GL_VENDOR = %s\n", (char *) _mesa_GetString(GL_VENDOR)); - _mesa_debug(NULL, "Mesa GL_EXTENSIONS = %s\n", - (char *) _mesa_GetString(GL_EXTENSIONS)); + + /* use ctx as GL_EXTENSIONS will not work on 3.0 or higher + * core contexts. + */ + _mesa_debug(NULL, "Mesa GL_EXTENSIONS = %s\n", ctx->Extensions.String); + #if defined(THREADS) _mesa_debug(NULL, "Mesa thread-safe: YES\n"); #else |