diff options
| -rw-r--r-- | src/mesa/glapi/glapi.c | 2 | ||||
| -rw-r--r-- | src/mesa/main/imports.c | 2 | ||||
| -rw-r--r-- | src/mesa/tnl/t_context.c | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/glapi/glapi.c b/src/mesa/glapi/glapi.c index 8ed833042b2..f5cd1c6ab38 100644 --- a/src/mesa/glapi/glapi.c +++ b/src/mesa/glapi/glapi.c @@ -87,7 +87,7 @@ _glapi_set_warning_func( _glapi_warning_func func ) static GLboolean warn(void) { - if ((WarnFlag || getenv("MESA_DEBUG") || getenv("LIBGL_DEBUG")) + if ((WarnFlag || _mesa_getenv("MESA_DEBUG") || _mesa_getenv("LIBGL_DEBUG")) && warning_func) { return GL_TRUE; } diff --git a/src/mesa/main/imports.c b/src/mesa/main/imports.c index cee54e526b4..50bc1510b1c 100644 --- a/src/mesa/main/imports.c +++ b/src/mesa/main/imports.c @@ -682,6 +682,8 @@ _mesa_getenv( const char *var ) { #if defined(XFree86LOADER) && defined(IN_MODULE) return xf86getenv(var); +#elif defined(_XBOX) + return NULL; #else return getenv(var); #endif diff --git a/src/mesa/tnl/t_context.c b/src/mesa/tnl/t_context.c index 531e639e845..f76f546b814 100644 --- a/src/mesa/tnl/t_context.c +++ b/src/mesa/tnl/t_context.c @@ -82,7 +82,7 @@ _tnl_CreateContext( GLcontext *ctx ) return GL_FALSE; } - if (getenv("MESA_CODEGEN")) + if (_mesa_getenv("MESA_CODEGEN")) tnl->AllowCodegen = GL_TRUE; /* Initialize the VB. |