From 1d85974fb7eb14a1f65e8837d772f6e3c24b3317 Mon Sep 17 00:00:00 2001 From: Sangjin Kim Date: Wed, 12 Sep 2012 16:36:07 +0900 Subject: [PATCH] [Title] Fix Windows build error and modify to check context more safe. [Type] bug fix [Module] opengl [Priority] [CQ#] [Redmine#] [Problem] [Cause] [Solution] [TestCase] --- package/pkginfo.manifest | 2 +- tizen/src/hw/gloffscreen_glx.c | 2 +- tizen/src/hw/gloffscreen_wgl.c | 2 +- tizen/src/hw/gloffscreen_xcomposite.c | 2 +- tizen/src/hw/opengl_exec.c | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest index 788fe9e..80401f4 100644 --- a/package/pkginfo.manifest +++ b/package/pkginfo.manifest @@ -1,4 +1,4 @@ -Version: 1.3.51 +Version: 1.3.52 Maintainer: Yeong-Kyoon Lee Source: emulator diff --git a/tizen/src/hw/gloffscreen_glx.c b/tizen/src/hw/gloffscreen_glx.c index e3d9887..6580dea 100644 --- a/tizen/src/hw/gloffscreen_glx.c +++ b/tizen/src/hw/gloffscreen_glx.c @@ -234,7 +234,7 @@ int glo_surface_update_context(GloSurface *surface, GloContext *context) if ( !prev_context_valid ) /* light-weight context */ g_free(surface->context); } - surface->context = context; + surface->context = context; return prev_context_valid; } diff --git a/tizen/src/hw/gloffscreen_wgl.c b/tizen/src/hw/gloffscreen_wgl.c index af0a5f0..9c211d2 100644 --- a/tizen/src/hw/gloffscreen_wgl.c +++ b/tizen/src/hw/gloffscreen_wgl.c @@ -804,7 +804,7 @@ int glo_surface_update_context(GloSurface *surface, GloContext *context) if ( surface->context ) { - prev_context_valid = (surface->context->context != 0); + prev_context_valid = (surface->context->hContext != 0); if ( !prev_context_valid ) /* light-weight context */ g_free(surface->context); } diff --git a/tizen/src/hw/gloffscreen_xcomposite.c b/tizen/src/hw/gloffscreen_xcomposite.c index 18af192..18e5cb3 100644 --- a/tizen/src/hw/gloffscreen_xcomposite.c +++ b/tizen/src/hw/gloffscreen_xcomposite.c @@ -269,7 +269,7 @@ int glo_surface_update_context(GloSurface *surface, GloContext *context) if ( !prev_context_valid ) /* light-weight context */ g_free(surface->context); } - surface->context = context; + surface->context = context; return prev_context_valid; } diff --git a/tizen/src/hw/opengl_exec.c b/tizen/src/hw/opengl_exec.c index f0f6a93..f886f2b 100644 --- a/tizen/src/hw/opengl_exec.c +++ b/tizen/src/hw/opengl_exec.c @@ -616,8 +616,8 @@ static void unbind_qsurface(GLState *state, QTAILQ_REMOVE(&state->qsurfaces, qsurface, next); - /*XXX: need this?*/ - state->current_qsurface = NULL; + if ( state->current_qsurface == qsurface ) + state->current_qsurface = NULL; } /* Find the qsurface with required drawable in active & pending qsurfaces */ -- 2.7.4