From 9220afa47bdc04c4a853849774cec2831239e9f9 Mon Sep 17 00:00:00 2001 From: "jinhyung.jo" Date: Fri, 31 Oct 2014 15:05:55 +0900 Subject: [PATCH] YaGL: Modified the logs when the device is initialized Correct the log position that developers can be recognized as a wrong meaning. Change-Id: I4fa2e9e046913cd0c3cba15072b9dc9dfee67c34 Signed-off-by: Jinhyung Jo --- hw/yagl/yagl_drivers/egl_wgl/yagl_egl_wgl.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/hw/yagl/yagl_drivers/egl_wgl/yagl_egl_wgl.c b/hw/yagl/yagl_drivers/egl_wgl/yagl_egl_wgl.c index ba178d2b13..c900234a14 100644 --- a/hw/yagl/yagl_drivers/egl_wgl/yagl_egl_wgl.c +++ b/hw/yagl/yagl_drivers/egl_wgl/yagl_egl_wgl.c @@ -1227,6 +1227,7 @@ static void *yagl_egl_wgl_extaddr_get(struct yagl_dyn_lib *dyn_lib, if (!wgl_get_procaddr_fn || !wgl_create_context_fn || !wgl_make_current_fn || !wgl_delete_context_fn) { + YAGL_LOG_ERROR_WIN(); goto out; } @@ -1235,25 +1236,30 @@ static void *yagl_egl_wgl_extaddr_get(struct yagl_dyn_lib *dyn_lib, win = yagl_egl_wgl_dummy_win_create(); if (!win) { + YAGL_LOG_ERROR_WIN(); goto out; } dc = GetDC(win); if (!dc) { + YAGL_LOG_ERROR_WIN(); goto out; } /* We need to set pixel format of dc before we can create GL context */ if (!yagl_egl_wgl_dc_set_def_pixfmt(dc)) { + YAGL_LOG_ERROR_WIN(); goto out; } glc = wgl_create_context_fn(dc); if (!glc) { + YAGL_LOG_ERROR_WIN(); goto out; } if (wgl_make_current_fn(dc, glc) == FALSE) { + YAGL_LOG_ERROR_WIN(); wgl_make_current_fn(NULL, NULL); wgl_delete_context_fn(glc); goto out; @@ -1270,10 +1276,6 @@ static void *yagl_egl_wgl_extaddr_get(struct yagl_dyn_lib *dyn_lib, } out: - if (!proc) { - YAGL_LOG_ERROR_WIN(); - } - if (win) { if (dc) { ReleaseDC(win, dc); @@ -1295,14 +1297,18 @@ void *yagl_dyn_lib_get_ogl_procaddr(struct yagl_dyn_lib *dyn_lib, void *proc = NULL; YAGL_LOG_FUNC_ENTER(yagl_egl_wgl_get_procaddr, - "Retrieving %s address", sym); + "Retrieving %s address", sym); proc = yagl_egl_wgl_extaddr_get(dyn_lib, sym); if (!proc) { - YAGL_LOG_TRACE("wglGetProcAddress failed for %s, trying GetProcAddress", - sym); + YAGL_LOG_TRACE("wglGetProcAddress failed for %s, " + "trying GetProcAddress", sym); proc = yagl_dyn_lib_get_sym(dyn_lib, sym); + if (!proc) { + YAGL_LOG_ERROR("wglGetProcAddress & GetProcAddress failed for %s", + sym); + } } YAGL_LOG_FUNC_EXIT("%s address: %p", sym, proc); -- 2.34.1