From: Mateusz Majewski Date: Wed, 19 Jun 2024 08:28:47 +0000 (+0200) Subject: cleanup X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=08c0300094037b03d16fc76832f2f0ef9ca77834;p=sdk%2Femulator%2Fqemu.git cleanup Change-Id: Ie7f6473687b9704e0d597b5ed3514e1c0171c857 --- diff --git a/tizen/src/ui/displayglwidget.cpp b/tizen/src/ui/displayglwidget.cpp index e6af18541f..ea28d03d52 100644 --- a/tizen/src/ui/displayglwidget.cpp +++ b/tizen/src/ui/displayglwidget.cpp @@ -226,7 +226,9 @@ DisplayGLWidget::DisplayGLWidget(QWidget *parent, mVAO = NULL; mVBO = NULL; +#ifdef CONFIG_OPENGL offscreen = NULL; +#endif } void DisplayGLWidget::changedTexture(struct dpy_item *item) @@ -244,6 +246,7 @@ void DisplayGLWidget::changedTexture(struct dpy_item *item) this->update(); } +#ifdef CONFIG_OPENGL QOpenGLContext *DisplayGLWidget::createSharedContext(int major, int minor) { auto glob = context(); @@ -276,7 +279,7 @@ QOpenGLContext *DisplayGLWidget::createSharedContext(int major, int minor) if (!ctx->create()) return nullptr; - + return ctx; } @@ -285,6 +288,7 @@ bool DisplayGLWidget::activateSharedContext(QOpenGLContext *ctx) // TODO: Context loss??? return ctx->makeCurrent(offscreen); } +#endif float DisplayGLWidget::getBrightness() { @@ -620,10 +624,12 @@ DisplayGLWidget::~DisplayGLWidget() if (maskTexture) { mFuncs->glDeleteTextures(1, &maskTexture); } +#ifdef CONFIG_OPENGL if (offscreen) { offscreen->destroy(); delete offscreen; } +#endif mVAO->destroy(); mVBO->destroy(); texProgram->removeAllShaders(); diff --git a/tizen/src/ui/displayglwidget.h b/tizen/src/ui/displayglwidget.h index 0ac1f4be28..6042b88ee2 100644 --- a/tizen/src/ui/displayglwidget.h +++ b/tizen/src/ui/displayglwidget.h @@ -54,6 +54,8 @@ struct dpy_item { }; } +// TODO: This probably should not be included directly. +#include "config-host.h" class QOpenGLFunctions; class QOpenGLShaderProgram; @@ -73,8 +75,10 @@ public: void changedTexture(struct dpy_item *tex); +#ifdef CONFIG_OPENGL QOpenGLContext *createSharedContext(int major, int minor); bool activateSharedContext(QOpenGLContext *ctx); +#endif protected: void initializeGL(); @@ -117,7 +121,9 @@ private: QOpenGLShaderProgram *texProgram; QOpenGLShaderProgram *scaleProgram; +#ifdef CONFIG_OPENGL QOffscreenSurface *offscreen; +#endif }; #endif // DISPLAYGLWIDGET_H diff --git a/tizen/src/ui/qt5.c b/tizen/src/ui/qt5.c index 931c5a6ce2..55c570e731 100644 --- a/tizen/src/ui/qt5.c +++ b/tizen/src/ui/qt5.c @@ -121,6 +121,26 @@ static void qt5_refresh(DisplayChangeListener *dcl) qt5_refresh_internal(); } +static void qt5_mouse_warp(DisplayChangeListener *dcl, + int x, int y, int on) +{ +} + +static void qt5_mouse_define(DisplayChangeListener *dcl, + QEMUCursor *c) +{ +} + +static const DisplayChangeListenerOps dcl_ops = { + .dpy_name = "qt5", + .dpy_gfx_update = qt5_update, + .dpy_gfx_switch = qt5_switch, + .dpy_refresh = qt5_refresh, + .dpy_mouse_set = qt5_mouse_warp, + .dpy_cursor_define = qt5_mouse_define, +}; + +#ifdef CONFIG_OPENGL static void qt5_gl_update(DisplayChangeListener *dcl, int x, int y, int w, int h) { @@ -182,16 +202,6 @@ static void qt5_gl_refresh(DisplayChangeListener *dcl) } } -static void qt5_mouse_warp(DisplayChangeListener *dcl, - int x, int y, int on) -{ -} - -static void qt5_mouse_define(DisplayChangeListener *dcl, - QEMUCursor *c) -{ -} - static QEMUGLContext qt5_gl_create_context(DisplayChangeListener *dcl, QEMUGLParams *params) { @@ -206,7 +216,7 @@ static void qt5_gl_destroy_context(DisplayChangeListener *dcl, QEMUGLContext ctx static int qt5_gl_make_context_current(DisplayChangeListener *dcl, QEMUGLContext ctx) { - qt5_gl_make_context_current_internal(ctx); + return qt5_gl_make_context_current_internal(ctx); } static QEMUGLContext qt5_gl_get_current_context(DisplayChangeListener *dcl) @@ -270,15 +280,6 @@ static void qt5_gl_scanout_flush(DisplayChangeListener *dcl, } } -static const DisplayChangeListenerOps dcl_ops = { - .dpy_name = "qt5", - .dpy_gfx_update = qt5_update, - .dpy_gfx_switch = qt5_switch, - .dpy_refresh = qt5_refresh, - .dpy_mouse_set = qt5_mouse_warp, - .dpy_cursor_define = qt5_mouse_define, -}; - static const DisplayChangeListenerOps dcl_gl_ops = { .dpy_name = "qt5-gl", .dpy_gfx_update = qt5_gl_update, @@ -295,6 +296,7 @@ static const DisplayChangeListenerOps dcl_gl_ops = { .dpy_gl_scanout = qt5_gl_scanout, .dpy_gl_update = qt5_gl_scanout_flush, }; +#endif void maru_early_qt5_display_init(enum maru_display_type display_type) { @@ -379,17 +381,23 @@ void maru_qt5_display_init(DisplayState *ds, int full_screen) qt5_console = g_new0(struct qt5_state, qt5_num_outputs); for (i = 0; i < qt5_num_outputs; i++) { 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 = qt5_gl_create_context_internal(3, 3); qt5_console[i].is_scanout = false; qt5_console[i].scanout_fbs[0] = 0; +#endif } if (full_screen) { diff --git a/tizen/src/ui/qt5_supplement.cpp b/tizen/src/ui/qt5_supplement.cpp index fb450fd1c5..e2cbfe214e 100644 --- a/tizen/src/ui/qt5_supplement.cpp +++ b/tizen/src/ui/qt5_supplement.cpp @@ -76,10 +76,6 @@ static void (*captureRequestHandler)(void *); static MainWindow *mainwindow; static UiInformation *uiInfo; -#define DPY_ITEM_NO 5 -static dpy_item dpy_item_pool[DPY_ITEM_NO]; -static uint64_t dpy_item_gen[DPY_ITEM_NO]; - class ConFile { public: QFile *formFile; @@ -614,6 +610,11 @@ void qt5_update_texture(void *dpy_item) } } +#ifdef CONFIG_OPENGL +#define DPY_ITEM_NO 5 +static dpy_item dpy_item_pool[DPY_ITEM_NO]; +static uint64_t dpy_item_gen[DPY_ITEM_NO]; + uint32_t qt5_gl_refresh_internal(uint32_t tex, uint32_t width, uint32_t height, uint64_t gen) { uint32_t ret = tex; @@ -683,3 +684,4 @@ void *qt5_gl_get_current_context_internal() { return QOpenGLContext::currentContext(); } +#endif diff --git a/tizen/src/ui/qt5_supplement.h b/tizen/src/ui/qt5_supplement.h index 75362b48cd..8c5878e0de 100644 --- a/tizen/src/ui/qt5_supplement.h +++ b/tizen/src/ui/qt5_supplement.h @@ -63,11 +63,13 @@ const char* qt5_get_version(void); void qt5_set_force_legacy(bool isLegacy); +#ifdef CONFIG_OPENGL uint32_t qt5_gl_refresh_internal(uint32_t tex, uint32_t width, uint32_t height, uint64_t gen); void *qt5_gl_create_context_internal(int major, int minor); void qt5_gl_destroy_context_internal(void *); int qt5_gl_make_context_current_internal(void *_ctx); -void *qt5_gl_get_current_context_internal(); +void *qt5_gl_get_current_context_internal(void); +#endif #ifdef __cplusplus }