From bb756eebdac6fd24e8919e2c43f7d2c8c4091f59 Mon Sep 17 00:00:00 2001 From: RajithaY Date: Tue, 25 Apr 2017 03:31:15 -0700 Subject: Adding qemu as a submodule of KVMFORNFV This Patch includes the changes to add qemu as a submodule to kvmfornfv repo and make use of the updated latest qemu for the execution of all testcase Change-Id: I1280af507a857675c7f81d30c95255635667bdd7 Signed-off-by:RajithaY --- qemu/ui/gtk-egl.c | 257 ------------------------------------------------------ 1 file changed, 257 deletions(-) delete mode 100644 qemu/ui/gtk-egl.c (limited to 'qemu/ui/gtk-egl.c') diff --git a/qemu/ui/gtk-egl.c b/qemu/ui/gtk-egl.c deleted file mode 100644 index 431457c74..000000000 --- a/qemu/ui/gtk-egl.c +++ /dev/null @@ -1,257 +0,0 @@ -/* - * GTK UI -- egl opengl code. - * - * Note that gtk 3.16+ (released 2015-03-23) has a GtkGLArea widget, - * which is GtkDrawingArea like widget with opengl rendering support. - * - * This code handles opengl support on older gtk versions, using egl - * to get a opengl context for the X11 window. - * - * This work is licensed under the terms of the GNU GPL, version 2 or later. - * See the COPYING file in the top-level directory. - */ - -#include "qemu/osdep.h" -#include "qemu-common.h" - -#include "trace.h" - -#include "ui/console.h" -#include "ui/gtk.h" -#include "ui/egl-helpers.h" - -#include "sysemu/sysemu.h" - -static void gtk_egl_set_scanout_mode(VirtualConsole *vc, bool scanout) -{ - if (vc->gfx.scanout_mode == scanout) { - return; - } - - vc->gfx.scanout_mode = scanout; - if (!vc->gfx.scanout_mode) { - if (vc->gfx.fbo_id) { - glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, - GL_COLOR_ATTACHMENT0_EXT, - GL_TEXTURE_2D, 0, 0); - glBindFramebuffer(GL_FRAMEBUFFER_EXT, 0); - glDeleteFramebuffers(1, &vc->gfx.fbo_id); - vc->gfx.fbo_id = 0; - } - if (vc->gfx.surface) { - surface_gl_destroy_texture(vc->gfx.gls, vc->gfx.ds); - surface_gl_create_texture(vc->gfx.gls, vc->gfx.ds); - } - } -} - -/** DisplayState Callbacks (opengl version) **/ - -void gd_egl_init(VirtualConsole *vc) -{ - GdkWindow *gdk_window = gtk_widget_get_window(vc->gfx.drawing_area); - if (!gdk_window) { - return; - } - -#if GTK_CHECK_VERSION(3, 0, 0) - Window x11_window = gdk_x11_window_get_xid(gdk_window); -#else - Window x11_window = gdk_x11_drawable_get_xid(gdk_window); -#endif - if (!x11_window) { - return; - } - - vc->gfx.ectx = qemu_egl_init_ctx(); - vc->gfx.esurface = qemu_egl_init_surface_x11(vc->gfx.ectx, x11_window); - - assert(vc->gfx.esurface); -} - -void gd_egl_draw(VirtualConsole *vc) -{ - GdkWindow *window; - int ww, wh; - - if (!vc->gfx.gls) { - return; - } - - if (vc->gfx.scanout_mode) { - gd_egl_scanout_flush(&vc->gfx.dcl, 0, 0, vc->gfx.w, vc->gfx.h); - } else { - if (!vc->gfx.ds) { - return; - } - eglMakeCurrent(qemu_egl_display, vc->gfx.esurface, - vc->gfx.esurface, vc->gfx.ectx); - - window = gtk_widget_get_window(vc->gfx.drawing_area); - gdk_drawable_get_size(window, &ww, &wh); - surface_gl_setup_viewport(vc->gfx.gls, vc->gfx.ds, ww, wh); - surface_gl_render_texture(vc->gfx.gls, vc->gfx.ds); - - eglSwapBuffers(qemu_egl_display, vc->gfx.esurface); - } -} - -void gd_egl_update(DisplayChangeListener *dcl, - int x, int y, int w, int h) -{ - VirtualConsole *vc = container_of(dcl, VirtualConsole, gfx.dcl); - - if (!vc->gfx.gls || !vc->gfx.ds) { - return; - } - - eglMakeCurrent(qemu_egl_display, vc->gfx.esurface, - vc->gfx.esurface, vc->gfx.ectx); - surface_gl_update_texture(vc->gfx.gls, vc->gfx.ds, x, y, w, h); - vc->gfx.glupdates++; -} - -void gd_egl_refresh(DisplayChangeListener *dcl) -{ - VirtualConsole *vc = container_of(dcl, VirtualConsole, gfx.dcl); - - if (!vc->gfx.esurface) { - gd_egl_init(vc); - if (!vc->gfx.esurface) { - return; - } - vc->gfx.gls = console_gl_init_context(); - if (vc->gfx.ds) { - surface_gl_create_texture(vc->gfx.gls, vc->gfx.ds); - } - } - - graphic_hw_update(dcl->con); - - if (vc->gfx.glupdates) { - vc->gfx.glupdates = 0; - gtk_egl_set_scanout_mode(vc, false); - gd_egl_draw(vc); - } -} - -void gd_egl_switch(DisplayChangeListener *dcl, - DisplaySurface *surface) -{ - VirtualConsole *vc = container_of(dcl, VirtualConsole, gfx.dcl); - bool resized = true; - - trace_gd_switch(vc->label, surface_width(surface), surface_height(surface)); - - if (vc->gfx.ds && - surface_width(vc->gfx.ds) == surface_width(surface) && - surface_height(vc->gfx.ds) == surface_height(surface)) { - resized = false; - } - - surface_gl_destroy_texture(vc->gfx.gls, vc->gfx.ds); - vc->gfx.ds = surface; - if (vc->gfx.gls) { - surface_gl_create_texture(vc->gfx.gls, vc->gfx.ds); - } - - if (resized) { - gd_update_windowsize(vc); - } -} - -QEMUGLContext gd_egl_create_context(DisplayChangeListener *dcl, - QEMUGLParams *params) -{ - VirtualConsole *vc = container_of(dcl, VirtualConsole, gfx.dcl); - - eglMakeCurrent(qemu_egl_display, vc->gfx.esurface, - vc->gfx.esurface, vc->gfx.ectx); - return qemu_egl_create_context(dcl, params); -} - -void gd_egl_scanout(DisplayChangeListener *dcl, - uint32_t backing_id, bool backing_y_0_top, - uint32_t x, uint32_t y, - uint32_t w, uint32_t h) -{ - VirtualConsole *vc = container_of(dcl, VirtualConsole, gfx.dcl); - - vc->gfx.x = x; - vc->gfx.y = y; - vc->gfx.w = w; - vc->gfx.h = h; - vc->gfx.tex_id = backing_id; - vc->gfx.y0_top = backing_y_0_top; - - eglMakeCurrent(qemu_egl_display, vc->gfx.esurface, - vc->gfx.esurface, vc->gfx.ectx); - - if (vc->gfx.tex_id == 0 || vc->gfx.w == 0 || vc->gfx.h == 0) { - gtk_egl_set_scanout_mode(vc, false); - return; - } - - gtk_egl_set_scanout_mode(vc, true); - if (!vc->gfx.fbo_id) { - glGenFramebuffers(1, &vc->gfx.fbo_id); - } - - glBindFramebuffer(GL_FRAMEBUFFER_EXT, vc->gfx.fbo_id); - glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, - GL_TEXTURE_2D, vc->gfx.tex_id, 0); -} - -void gd_egl_scanout_flush(DisplayChangeListener *dcl, - uint32_t x, uint32_t y, uint32_t w, uint32_t h) -{ - VirtualConsole *vc = container_of(dcl, VirtualConsole, gfx.dcl); - GdkWindow *window; - int ww, wh, y1, y2; - - if (!vc->gfx.scanout_mode) { - return; - } - if (!vc->gfx.fbo_id) { - return; - } - - eglMakeCurrent(qemu_egl_display, vc->gfx.esurface, - vc->gfx.esurface, vc->gfx.ectx); - - glBindFramebuffer(GL_READ_FRAMEBUFFER, vc->gfx.fbo_id); - glBindFramebuffer(GL_DRAW_FRAMEBUFFER, 0); - - window = gtk_widget_get_window(vc->gfx.drawing_area); - gdk_drawable_get_size(window, &ww, &wh); - glViewport(0, 0, ww, wh); - y1 = vc->gfx.y0_top ? 0 : vc->gfx.h; - y2 = vc->gfx.y0_top ? vc->gfx.h : 0; - glBlitFramebuffer(0, y1, vc->gfx.w, y2, - 0, 0, ww, wh, - GL_COLOR_BUFFER_BIT, GL_NEAREST); - glBindFramebuffer(GL_FRAMEBUFFER_EXT, vc->gfx.fbo_id); - - eglSwapBuffers(qemu_egl_display, vc->gfx.esurface); -} - -void gtk_egl_init(void) -{ - GdkDisplay *gdk_display = gdk_display_get_default(); - Display *x11_display = gdk_x11_display_get_xdisplay(gdk_display); - - if (qemu_egl_init_dpy(x11_display, false, false) < 0) { - return; - } - - display_opengl = 1; -} - -int gd_egl_make_current(DisplayChangeListener *dcl, - QEMUGLContext ctx) -{ - VirtualConsole *vc = container_of(dcl, VirtualConsole, gfx.dcl); - - return eglMakeCurrent(qemu_egl_display, vc->gfx.esurface, - vc->gfx.esurface, ctx); -} -- cgit 1.2.3-korg