summaryrefslogtreecommitdiff
path: root/hw/vigs
diff options
context:
space:
mode:
authorjinhyung.jo <jinhyung.jo@samsung.com>2015-04-15 16:48:46 +0900
committerjinhyung.jo <jinhyung.jo@samsung.com>2015-04-15 17:06:04 +0900
commit6b4a0d32fa382748b8fefcfd48587a80a076aaca (patch)
treed342a542242cd39b650026adeea962e671ae33be /hw/vigs
parent974841a98d22383fef6f097850a100e062af2fa2 (diff)
downloadqemu-6b4a0d32fa382748b8fefcfd48587a80a076aaca.tar.gz
qemu-6b4a0d32fa382748b8fefcfd48587a80a076aaca.tar.bz2
qemu-6b4a0d32fa382748b8fefcfd48587a80a076aaca.zip
display: Added new features to the Qt5 UI
1. Additional parameters to select a rendering mode -display maru_qt,rendering=<onscreen/offscreen> 2. Implemented brightness & rotation, scaling features in the offscreen mode Change-Id: I00169dde7f23ed16acb5426a073a144820d1cb67 Signed-off-by: Jinhyung Jo <jinhyung.jo@samsung.com>
Diffstat (limited to 'hw/vigs')
-rw-r--r--hw/vigs/vigs_qt5.cpp9
-rw-r--r--hw/vigs/vigs_server.c1
2 files changed, 4 insertions, 6 deletions
diff --git a/hw/vigs/vigs_qt5.cpp b/hw/vigs/vigs_qt5.cpp
index 1166c8d561..927d558320 100644
--- a/hw/vigs/vigs_qt5.cpp
+++ b/hw/vigs/vigs_qt5.cpp
@@ -34,6 +34,7 @@
#include <qpa/qplatformnativeinterface.h>
#include <stdio.h>
+extern bool qt5IsOnscreen;
extern QApplication *qt5App;
extern QOpenGLContext *qt5GLContext;
extern QSurfaceFormat qt5GLFormat;
@@ -46,14 +47,10 @@ extern void qt5_process_captured(bool captured, void *pixels,
bool vigs_qt5_onscreen_enabled(void)
{
-#ifndef CONFIG_DARWIN
- /* Qt5 bug, QGLWidget has some problem on MacOS.
- * (scrambled screen when resizing, invalid region masking) */
- if (qt5App != NULL) {
+ // TODO: on Darwin?
+ if (qt5App != NULL && qt5IsOnscreen) {
return true;
}
-#endif
-
return false;
}
diff --git a/hw/vigs/vigs_server.c b/hw/vigs/vigs_server.c
index 5e266295c4..13575b538c 100644
--- a/hw/vigs/vigs_server.c
+++ b/hw/vigs/vigs_server.c
@@ -458,6 +458,7 @@ static void vigs_server_capture_work(struct work_queue_item *wq_item)
if (pixels) {
captured = server->capture(server, root_sfc, pixels);
+ /* TODO: brightness composite to pixels */
}
server->capture_ops->process_captured(captured,