OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: Update MESA_INFO to eliminate error

Browse Source 
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 <brianp@vmware.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Courtney Goeltzenleuchter
2013-10-24 13:13:57 -06:00
committed by Kenneth Graunke
parent 36c3faf4bf
commit f56f875b8b
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/mesa/main/context.c
View File

@@ -1535,7 +1535,7 @@ _mesa_make_current( struct gl_context *newCtx,
* information. * information.
*/ */
if (_mesa_getenv("MESA_INFO")) { if (_mesa_getenv("MESA_INFO")) {
_mesa_print_info(); _mesa_print_info(newCtx);
} }
newCtx->FirstTimeCurrent = GL_FALSE; newCtx->FirstTimeCurrent = GL_FALSE;

10
src/mesa/main/debug.c
View File

@@ -103,7 +103,7 @@ _mesa_print_state( const char *msg, GLuint state )
/** /**
* Print information about this Mesa version and build options. * 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", _mesa_debug(NULL, "Mesa GL_VERSION = %s\n",
(char *) _mesa_GetString(GL_VERSION)); (char *) _mesa_GetString(GL_VERSION));
@@ -111,8 +111,12 @@ void _mesa_print_info( void )
(char *) _mesa_GetString(GL_RENDERER)); (char *) _mesa_GetString(GL_RENDERER));
_mesa_debug(NULL, "Mesa GL_VENDOR = %s\n", _mesa_debug(NULL, "Mesa GL_VENDOR = %s\n",
(char *) _mesa_GetString(GL_VENDOR)); (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) #if defined(THREADS)
_mesa_debug(NULL, "Mesa thread-safe: YES\n"); _mesa_debug(NULL, "Mesa thread-safe: YES\n");
#else #else

2
src/mesa/main/debug.h
View File

@@ -43,7 +43,7 @@ struct gl_texture_image;
extern void _mesa_print_enable_flags( const char *msg, GLuint flags ); 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_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 _mesa_init_debug( struct gl_context *ctx );
extern void extern void