diff options
Diffstat (limited to 'opengl/libs/EGL')
| -rw-r--r-- | opengl/libs/EGL/eglApi.cpp | 8 | ||||
| -rw-r--r-- | opengl/libs/EGL/trace.cpp | 19 |
2 files changed, 5 insertions, 22 deletions
diff --git a/opengl/libs/EGL/eglApi.cpp b/opengl/libs/EGL/eglApi.cpp index 22990f3..6e77e45 100644 --- a/opengl/libs/EGL/eglApi.cpp +++ b/opengl/libs/EGL/eglApi.cpp @@ -408,9 +408,11 @@ EGLSurface eglCreateWindowSurface( EGLDisplay dpy, EGLConfig config, if (dp) { EGLDisplay iDpy = dp->disp.dpy; - if (native_window_api_connect(window, NATIVE_WINDOW_API_EGL) != OK) { - ALOGE("EGLNativeWindowType %p already connected to another API", - window); + int result = native_window_api_connect(window, NATIVE_WINDOW_API_EGL); + if (result != OK) { + ALOGE("eglCreateWindowSurface: native_window_api_connect (win=%p) " + "failed (%#x) (already connected to another API?)", + window, result); return setError(EGL_BAD_ALLOC, EGL_NO_SURFACE); } diff --git a/opengl/libs/EGL/trace.cpp b/opengl/libs/EGL/trace.cpp index 3e228e4..4f07053 100644 --- a/opengl/libs/EGL/trace.cpp +++ b/opengl/libs/EGL/trace.cpp @@ -360,25 +360,6 @@ EGLAPI gl_hooks_t gHooksTrace = { #undef TRACE_GL_VOID #undef TRACE_GL -// define the ES 1.0 Debug_gl* functions as Tracing_gl functions -#define TRACE_GL_VOID(_api, _args, _argList, ...) \ -static void Debug_ ## _api _args { \ - TraceGL(#_api, __VA_ARGS__); \ - gl_hooks_t::gl_t const * const _c = &getGLTraceThreadSpecific()->gl; \ - _c->_api _argList; \ -} - -#define TRACE_GL(_type, _api, _args, _argList, ...) \ -static _type Debug_ ## _api _args { \ - TraceGL(#_api, __VA_ARGS__); \ - gl_hooks_t::gl_t const * const _c = &getGLTraceThreadSpecific()->gl; \ - return _c->_api _argList; \ -} - -extern "C" { -#include "../debug.in" -} - /////////////////////////////////////////////////////////////////////////// // Systrace /////////////////////////////////////////////////////////////////////////// |