egl: fixes for Windows

This commit is contained in:
Jonathan White
2008-08-06 16:37:49 -06:00
committed by Brian Paul
parent 695fc32503
commit bd953fdd54
2 changed files with 8 additions and 1 deletions

View File

@@ -146,10 +146,12 @@ _eglChooseDriver(_EGLDisplay *dpy)
(void) DefaultDriverName; (void) DefaultDriverName;
#if defined(_EGL_PLATFORM_X)
/* First, if the EGL_DRIVER env var is set, use that */ /* First, if the EGL_DRIVER env var is set, use that */
driverName = getenv("EGL_DRIVER"); driverName = getenv("EGL_DRIVER");
if (driverName) if (driverName)
return _eglstrdup(driverName); return _eglstrdup(driverName);
#endif
#if 0 #if 0
if (!displayString) { if (!displayString) {
@@ -218,6 +220,7 @@ _eglOpenDriver(_EGLDisplay *dpy, const char *driverName, const char *args)
#if defined(_EGL_PLATFORM_WINDOWS) #if defined(_EGL_PLATFORM_WINDOWS)
/* Use static linking on Windows for now */ /* Use static linking on Windows for now */
#ifdef WINDOWS_STATIC_LINK #ifdef WINDOWS_STATIC_LINK
lib = 0;
mainFunc = (_EGLMain_t)_eglMain; mainFunc = (_EGLMain_t)_eglMain;
#else #else
/* XXX untested */ /* XXX untested */

View File

@@ -21,7 +21,11 @@ static EGLint ReportingLevel = -1;
static void static void
log_level_initialize(void) log_level_initialize(void)
{ {
#if defined(_EGL_PLATFORM_X)
char *log_env = getenv("EGL_LOG_LEVEL"); char *log_env = getenv("EGL_LOG_LEVEL");
#else
char *log_env = NULL;
#endif
if (log_env == NULL) { if (log_env == NULL) {
ReportingLevel = FALLBACK_LOG_LEVEL; ReportingLevel = FALLBACK_LOG_LEVEL;