diff options
| author | Courtney Goeltzenleuchter <[email protected]> | 2013-10-24 13:13:57 -0600 |
|---|---|---|
| committer | Kenneth Graunke <[email protected]> | 2013-11-21 00:26:20 -0800 |
| commit | f56f875b8b72eda5abf124c8c4203b77b44b9670 (patch) | |
| tree | e950a27950630decade6c83c32e48217215e92aa | |
| parent | 36c3faf4bf41d6618a3b0fcd565f4907a1633a40 (diff) | |
mesa: Update MESA_INFO to eliminate error
If a user set MESA_INFO and the OpenGL application uses a
3.0 or later context then the MESA_INFO debug output will have
an error when it queries for extensions using the deprecated
enum GL_EXTENSIONS. Passing context argument allows code
to return extension list directly regardless of profile.
Commit title updated as recommended by Kenneth Graunke.
Reviewed-by: Brian Paul <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
| -rw-r--r-- | src/mesa/main/context.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/debug.c | 10 | ||||
| -rw-r--r-- | src/mesa/main/debug.h | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index 8cbc9352af3..87a4a35451d 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -1535,7 +1535,7 @@ _mesa_make_current( struct gl_context *newCtx, * information. */ if (_mesa_getenv("MESA_INFO")) { - _mesa_print_info(); + _mesa_print_info(newCtx); } newCtx->FirstTimeCurrent = GL_FALSE; diff --git a/src/mesa/main/debug.c b/src/mesa/main/debug.c index 9434c1ea2dd..99b21478990 100644 --- a/src/mesa/main/debug.c +++ b/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 diff --git a/src/mesa/main/debug.h b/src/mesa/main/debug.h index 8414c5ebd6a..902f59538bd 100644 --- a/src/mesa/main/debug.h +++ b/src/mesa/main/debug.h @@ -43,7 +43,7 @@ struct gl_texture_image; extern void _mesa_print_enable_flags( const char *msg, GLuint flags ); extern void _mesa_print_state( const char *msg, GLuint state ); -extern void _mesa_print_info( void ); +extern void _mesa_print_info( struct gl_context *ctx ); extern void _mesa_init_debug( struct gl_context *ctx ); extern void |