AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use _eglLog()

Browse Source
This commit is contained in:
Brian Paul
2005-11-23 01:38:12 +00:00
parent f049ca4e33
commit b711eb793b
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/egl/main/eglconfig.c
+7 -4
View File
@@ -11,6 +11,7 @@
#include "egldisplay.h"
#include "egldriver.h"
#include "eglglobals.h"
#include "egllog.h"
#define MIN2(A, B) (((A) < (B)) ? (A) : (B))
@@ -515,8 +516,9 @@ _eglFillInConfigs(_EGLConfig * configs,
unsigned k;
if ( bytes_per_pixel[index] == 0 ) {
fprintf(stderr, "[%s:%u] Framebuffer type 0x%04x has 0 bytes per pixel.\n",
__FUNCTION__, __LINE__, fb_type);
_eglLog(_EGL_INFO,
"[%s:%u] Framebuffer type 0x%04x has 0 bytes per pixel.",
__FUNCTION__, __LINE__, fb_type);
return GL_FALSE;
}
@@ -547,8 +549,9 @@ _eglFillInConfigs(_EGLConfig * configs,
break;
default:
fprintf(stderr, "[%s:%u] Framebuffer format 0x%04x is not GL_RGB, GL_RGBA, GL_BGR, or GL_BGRA.\n",
__FUNCTION__, __LINE__, fb_format);
_eglLog(_EGL_WARNING,
"[%s:%u] Framebuffer format 0x%04x is not GL_RGB, GL_RGBA, GL_BGR, or GL_BGRA.",
__FUNCTION__, __LINE__, fb_format);
return GL_FALSE;
}
src/egl/main/egldriver.c
+10 -6
View File
@@ -7,6 +7,7 @@
#include "egldisplay.h"
#include "egldriver.h"
#include "eglglobals.h"
#include "egllog.h"
#include "eglmode.h"
#include "eglscreen.h"
#include "eglsurface.h"
@@ -43,20 +44,20 @@ _eglChooseDriver(EGLDisplay display)
/* use default */
}
else if (name[0] == ':' && (name[1] >= '0' && name[1] <= '9') && !name[2]) {
printf("EGL: Use driver for screen: %s\n", name);
/* XXX probe hardware here to determine which driver to open */
driverName = "libEGLdri";
}
else if (name[0] == '!') {
/* use specified driver name */
driverName = name + 1;
printf("EGL: Use driver named %s\n", driverName);
}
else {
/* Maybe display was returned by XOpenDisplay? */
printf("EGL: can't parse display pointer\n");
_eglLog(_EGL_FATAL, "eglChooseDriver() bad name");
}
_eglLog(_EGL_INFO, "eglChooseDriver() choosing %s", driverName);
drv = _eglOpenDriver(dpy, driverName);
dpy->Driver = drv;
@@ -79,15 +80,17 @@ _eglOpenDriver(_EGLDisplay *dpy, const char *driverName)
/* XXX also prepend a directory path??? */
sprintf(driverFilename, "%s.so", driverName);
_eglLog(_EGL_DEBUG, "dlopen(%s)", driverFilename);
lib = dlopen(driverFilename, RTLD_NOW);
if (!lib) {
fprintf(stderr, "EGLdebug: Error opening %s: %s\n", driverFilename, dlerror());
_eglLog(_EGL_WARNING, "Could not open %s (%s)",
driverFilename, dlerror());
return NULL;
}
mainFunc = (_EGLMain_t) dlsym(lib, "_eglMain");
if (!mainFunc) {
fprintf(stderr, "_eglMain not found in %s", (char *) driverFilename);
_eglLog(_EGL_WARNING, "_eglMain not found in %s", driverFilename);
dlclose(lib);
return NULL;
}
@@ -113,7 +116,8 @@ _eglCloseDriver(_EGLDriver *drv, EGLDisplay dpy)
{
void *handle = drv->LibHandle;
EGLBoolean b;
fprintf(stderr, "EGL debug: Closing driver\n");
_eglLog(_EGL_INFO, "Closing driver");
/*
* XXX check for currently bound context/surfaces and delete them?