diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-10-09 17:30:03 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-10-09 17:30:03 +0100 |
| commit | c9003eb4662f44c61be9c8d7d5c9d4a02d58b560 (patch) | |
| tree | f39c06343359cc2d53dee717166329e43e6481e1 /ui/console-gl.c | |
| parent | b37686f7e84b22cfaf7fd01ac5133f2617cc3027 (diff) | |
| parent | 925a04000231ad865770ba227876ba518ac3e479 (diff) | |
| download | hqemu-c9003eb4662f44c61be9c8d7d5c9d4a02d58b560.zip hqemu-c9003eb4662f44c61be9c8d7d5c9d4a02d58b560.tar.gz | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-virgl-20151008-1' into staging
virtio-gpu: add 3d rendering support using virgl, misc fixes.
ui/gtk: add opengl context and scanout support (for virtio-gpu).
# gpg: Signature made Thu 08 Oct 2015 10:35:39 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
* remotes/kraxel/tags/pull-virgl-20151008-1:
gtk/opengl: add opengl context and scanout support (GtkGLArea)
gtk/opengl: add opengl context and scanout support (egl)
opengl: add egl-context.[ch] helpers
virtio-gpu: add cursor update tracepoint
virtio-gpu: add 3d mode and virgl rendering support.
virtio-gpu: update headers for virgl/3d
virtio-gpu: change licence from GPLv2 to GPLv2+
virtio-gpu: move iov free to virtio_gpu_cleanup_mapping_iov
ui/console: add opengl context and scanout support interfaces.
sdl2: stop flickering
shaders: initialize vertexes once
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/console-gl.c')
| -rw-r--r-- | ui/console-gl.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ui/console-gl.c b/ui/console-gl.c index cb45cf8..baf397b 100644 --- a/ui/console-gl.c +++ b/ui/console-gl.c @@ -33,6 +33,7 @@ struct ConsoleGLState { GLint texture_blit_prog; + GLint texture_blit_vao; }; /* ---------------------------------------------------------------------- */ @@ -47,6 +48,9 @@ ConsoleGLState *console_gl_init_context(void) exit(1); } + gls->texture_blit_vao = + qemu_gl_init_texture_blit(gls->texture_blit_prog); + return gls; } @@ -131,7 +135,8 @@ void surface_gl_render_texture(ConsoleGLState *gls, glClearColor(0.1f, 0.1f, 0.1f, 0.0f); glClear(GL_COLOR_BUFFER_BIT); - qemu_gl_run_texture_blit(gls->texture_blit_prog); + qemu_gl_run_texture_blit(gls->texture_blit_prog, + gls->texture_blit_vao); } void surface_gl_destroy_texture(ConsoleGLState *gls, |
