SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

gtk: use framebuffer helper functions.

Browse Source 
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20170614084149.31314-5-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2017-06-14 10:41:49 +02:00
parent 371c4ef637
commit a4f113fd69
3 changed files with 16 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/ui/gtk.h
View File

@ -52,8 +52,8 @@ typedef struct VirtualGfxConsole {
EGLSurface esurface; EGLSurface esurface;
int glupdates; int glupdates;
int x, y, w, h; int x, y, w, h;
GLuint tex_id; egl_fb guest_fb;
GLuint fbo_id; egl_fb win_fb;
bool y0_top; bool y0_top;
bool scanout_mode; bool scanout_mode;
#endif #endif

36
ui/gtk-egl.c
View File

@ -30,14 +30,7 @@ static void gtk_egl_set_scanout_mode(VirtualConsole *vc, bool scanout)
vc->gfx.scanout_mode = scanout; vc->gfx.scanout_mode = scanout;
if (!vc->gfx.scanout_mode) { if (!vc->gfx.scanout_mode) {
if (vc->gfx.fbo_id) { egl_fb_destroy(&vc->gfx.guest_fb);
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) { if (vc->gfx.surface) {
surface_gl_destroy_texture(vc->gfx.gls, vc->gfx.ds); surface_gl_destroy_texture(vc->gfx.gls, vc->gfx.ds);
surface_gl_create_texture(vc->gfx.gls, vc->gfx.ds); surface_gl_create_texture(vc->gfx.gls, vc->gfx.ds);
@ -176,7 +169,6 @@ void gd_egl_scanout_disable(DisplayChangeListener *dcl)
vc->gfx.w = 0; vc->gfx.w = 0;
vc->gfx.h = 0; vc->gfx.h = 0;
vc->gfx.tex_id = 0;
gtk_egl_set_scanout_mode(vc, false); gtk_egl_set_scanout_mode(vc, false);
} }
@ -192,20 +184,14 @@ void gd_egl_scanout_texture(DisplayChangeListener *dcl,
vc->gfx.y = y; vc->gfx.y = y;
vc->gfx.w = w; vc->gfx.w = w;
vc->gfx.h = h; vc->gfx.h = h;
vc->gfx.tex_id = backing_id;
vc->gfx.y0_top = backing_y_0_top; vc->gfx.y0_top = backing_y_0_top;
eglMakeCurrent(qemu_egl_display, vc->gfx.esurface, eglMakeCurrent(qemu_egl_display, vc->gfx.esurface,
vc->gfx.esurface, vc->gfx.ectx); vc->gfx.esurface, vc->gfx.ectx);
gtk_egl_set_scanout_mode(vc, true); gtk_egl_set_scanout_mode(vc, true);
if (!vc->gfx.fbo_id) { egl_fb_create_for_tex(&vc->gfx.guest_fb, backing_width, backing_height,
glGenFramebuffers(1, &vc->gfx.fbo_id); backing_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, void gd_egl_scanout_flush(DisplayChangeListener *dcl,
@ -213,30 +199,22 @@ void gd_egl_scanout_flush(DisplayChangeListener *dcl,
{ {
VirtualConsole *vc = container_of(dcl, VirtualConsole, gfx.dcl); VirtualConsole *vc = container_of(dcl, VirtualConsole, gfx.dcl);
GdkWindow *window; GdkWindow *window;
int ww, wh, y1, y2; int ww, wh;
if (!vc->gfx.scanout_mode) { if (!vc->gfx.scanout_mode) {
return; return;
} }
if (!vc->gfx.fbo_id) { if (!vc->gfx.guest_fb.framebuffer) {
return; return;
} }
eglMakeCurrent(qemu_egl_display, vc->gfx.esurface, eglMakeCurrent(qemu_egl_display, vc->gfx.esurface,
vc->gfx.esurface, vc->gfx.ectx); 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); window = gtk_widget_get_window(vc->gfx.drawing_area);
gdk_drawable_get_size(window, &ww, &wh); gdk_drawable_get_size(window, &ww, &wh);
glViewport(0, 0, ww, wh); egl_fb_setup_default(&vc->gfx.win_fb, ww, wh);
y1 = vc->gfx.y0_top ? 0 : vc->gfx.h; egl_fb_blit(&vc->gfx.win_fb, &vc->gfx.guest_fb, !vc->gfx.y0_top);
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); eglSwapBuffers(qemu_egl_display, vc->gfx.esurface);
} }

26
ui/gtk-gl-area.c
View File

@ -26,14 +26,7 @@ static void gtk_gl_area_set_scanout_mode(VirtualConsole *vc, bool scanout)
vc->gfx.scanout_mode = scanout; vc->gfx.scanout_mode = scanout;
if (!vc->gfx.scanout_mode) { if (!vc->gfx.scanout_mode) {
if (vc->gfx.fbo_id) { egl_fb_destroy(&vc->gfx.guest_fb);
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) { if (vc->gfx.surface) {
surface_gl_destroy_texture(vc->gfx.gls, vc->gfx.ds); surface_gl_destroy_texture(vc->gfx.gls, vc->gfx.ds);
surface_gl_create_texture(vc->gfx.gls, vc->gfx.ds); surface_gl_create_texture(vc->gfx.gls, vc->gfx.ds);
@ -56,11 +49,11 @@ void gd_gl_area_draw(VirtualConsole *vc)
wh = gtk_widget_get_allocated_height(vc->gfx.drawing_area); wh = gtk_widget_get_allocated_height(vc->gfx.drawing_area);
if (vc->gfx.scanout_mode) { if (vc->gfx.scanout_mode) {
if (!vc->gfx.fbo_id) { if (!vc->gfx.guest_fb.framebuffer) {
return; return;
} }
glBindFramebuffer(GL_READ_FRAMEBUFFER, vc->gfx.fbo_id); glBindFramebuffer(GL_READ_FRAMEBUFFER, vc->gfx.guest_fb.framebuffer);
/* GtkGLArea sets GL_DRAW_FRAMEBUFFER for us */ /* GtkGLArea sets GL_DRAW_FRAMEBUFFER for us */
glViewport(0, 0, ww, wh); glViewport(0, 0, ww, wh);
@ -181,24 +174,19 @@ void gd_gl_area_scanout_texture(DisplayChangeListener *dcl,
vc->gfx.y = y; vc->gfx.y = y;
vc->gfx.w = w; vc->gfx.w = w;
vc->gfx.h = h; vc->gfx.h = h;
vc->gfx.tex_id = backing_id;
vc->gfx.y0_top = backing_y_0_top; vc->gfx.y0_top = backing_y_0_top;
gtk_gl_area_make_current(GTK_GL_AREA(vc->gfx.drawing_area)); gtk_gl_area_make_current(GTK_GL_AREA(vc->gfx.drawing_area));
if (vc->gfx.tex_id == 0 || vc->gfx.w == 0 || vc->gfx.h == 0) { if (vc->gfx.guest_fb.framebuffer == 0 ||
vc->gfx.w == 0 || vc->gfx.h == 0) {
gtk_gl_area_set_scanout_mode(vc, false); gtk_gl_area_set_scanout_mode(vc, false);
return; return;
} }
gtk_gl_area_set_scanout_mode(vc, true); gtk_gl_area_set_scanout_mode(vc, true);
if (!vc->gfx.fbo_id) { egl_fb_create_for_tex(&vc->gfx.guest_fb, backing_width, backing_height,
glGenFramebuffers(1, &vc->gfx.fbo_id); backing_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_gl_area_scanout_flush(DisplayChangeListener *dcl, void gd_gl_area_scanout_flush(DisplayChangeListener *dcl,