From: Mateusz Majewski Date: Wed, 26 Jun 2024 10:43:29 +0000 (+0200) Subject: Fix init X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=699c85a7a8526bf204c7677bd3ff2ff85be0572a;p=sdk%2Femulator%2Fqemu.git Fix init Change-Id: Ibce304a7422e0eff5da9421154ad2cf015a41098 --- diff --git a/tizen/src/ui/qt5.c b/tizen/src/ui/qt5.c index f1739b5837..cbec6f8e7a 100644 --- a/tizen/src/ui/qt5.c +++ b/tizen/src/ui/qt5.c @@ -391,21 +391,18 @@ void maru_qt5_display_init(DisplayState *ds, int full_screen) QemuConsole *con = qemu_console_lookup_by_index(i); #ifdef CONFIG_OPENGL qt5_console[i].dcl.ops = display_opengl ? &dcl_gl_ops : &dcl_ops; -#else - qt5_console[i].dcl.ops = &dcl_ops; -#endif - qt5_console[i].dcl.con = con; - register_displaychangelistener(&qt5_console[i].dcl); - qt5_console[i].idx = i; - -#ifdef CONFIG_OPENGL qt5_console[i].gen = 0; qt5_console[i].updated = false; qt5_console[i].gls = NULL; qt5_console[i].ctx = display_opengl ? qt5_gl_create_context_internal(3, 3) : NULL; qt5_console[i].is_scanout = false; qt5_console[i].scanout_fbs[0] = 0; +#else + qt5_console[i].dcl.ops = &dcl_ops; #endif + qt5_console[i].dcl.con = con; + register_displaychangelistener(&qt5_console[i].dcl); + qt5_console[i].idx = i; } if (full_screen) { diff --git a/tizen/src/ui/qt5_supplement.cpp b/tizen/src/ui/qt5_supplement.cpp index 35354c2cfa..9c6314e114 100644 --- a/tizen/src/ui/qt5_supplement.cpp +++ b/tizen/src/ui/qt5_supplement.cpp @@ -629,7 +629,7 @@ uint32_t qt5_gl_refresh_internal(uint32_t tex, uint32_t width, uint32_t height, bool ok = dpy_item_gen[item_id] == 0 || item->available; if (ok) { ret = item->tex; - if (dpy_item_gen[item_id] != gen || /* HACK HACK HACK */ item->tex < 25) { + if (dpy_item_gen[item_id] != gen) { /* This tells the caller that the texture should not be used anymore. * Preferably we could handle this right here, but the caller can do it * conveniently and I couldn't get compilation to work. */