Message ID | 1467876563-1351-1-git-send-email-kraxel@redhat.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 7 July 2016 at 08:29, Gerd Hoffmann <kraxel@redhat.com> wrote: > Commit "9d8256e virgl: pass whole GL scanout dimensions" missed the > opengl code path for gtk versions >= 3.16. Update that one too and > fix the build with recent gtk versions. > > Reported-by: Dr. David Alan Gilbert <dgilbert@redhat.com> > Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> > --- > include/ui/gtk.h | 1 + > ui/gtk-gl-area.c | 1 + > 2 files changed, 2 insertions(+) > > diff --git a/include/ui/gtk.h b/include/ui/gtk.h > index a764404..42ca0fe 100644 > --- a/include/ui/gtk.h > +++ b/include/ui/gtk.h > @@ -124,6 +124,7 @@ void gd_gl_area_destroy_context(DisplayChangeListener *dcl, > QEMUGLContext ctx); > void gd_gl_area_scanout(DisplayChangeListener *dcl, > uint32_t backing_id, bool backing_y_0_top, > + uint32_t backing_width, uint32_t backing_height, > uint32_t x, uint32_t y, > uint32_t w, uint32_t h); > void gd_gl_area_scanout_flush(DisplayChangeListener *dcl, > diff --git a/ui/gtk-gl-area.c b/ui/gtk-gl-area.c > index b86ff3c..0df5a36 100644 > --- a/ui/gtk-gl-area.c > +++ b/ui/gtk-gl-area.c > @@ -169,6 +169,7 @@ void gd_gl_area_destroy_context(DisplayChangeListener *dcl, QEMUGLContext ctx) > > void gd_gl_area_scanout(DisplayChangeListener *dcl, > uint32_t backing_id, bool backing_y_0_top, > + uint32_t backing_width, uint32_t backing_height, > uint32_t x, uint32_t y, > uint32_t w, uint32_t h) > { > -- > 1.8.3.1 Thanks; applied to master as a build fix. -- PMM
diff --git a/include/ui/gtk.h b/include/ui/gtk.h index a764404..42ca0fe 100644 --- a/include/ui/gtk.h +++ b/include/ui/gtk.h @@ -124,6 +124,7 @@ void gd_gl_area_destroy_context(DisplayChangeListener *dcl, QEMUGLContext ctx); void gd_gl_area_scanout(DisplayChangeListener *dcl, uint32_t backing_id, bool backing_y_0_top, + uint32_t backing_width, uint32_t backing_height, uint32_t x, uint32_t y, uint32_t w, uint32_t h); void gd_gl_area_scanout_flush(DisplayChangeListener *dcl, diff --git a/ui/gtk-gl-area.c b/ui/gtk-gl-area.c index b86ff3c..0df5a36 100644 --- a/ui/gtk-gl-area.c +++ b/ui/gtk-gl-area.c @@ -169,6 +169,7 @@ void gd_gl_area_destroy_context(DisplayChangeListener *dcl, QEMUGLContext ctx) void gd_gl_area_scanout(DisplayChangeListener *dcl, uint32_t backing_id, bool backing_y_0_top, + uint32_t backing_width, uint32_t backing_height, uint32_t x, uint32_t y, uint32_t w, uint32_t h) {
Commit "9d8256e virgl: pass whole GL scanout dimensions" missed the opengl code path for gtk versions >= 3.16. Update that one too and fix the build with recent gtk versions. Reported-by: Dr. David Alan Gilbert <dgilbert@redhat.com> Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- include/ui/gtk.h | 1 + ui/gtk-gl-area.c | 1 + 2 files changed, 2 insertions(+)