diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-10-19 12:09:53 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-10-19 12:09:53 +0100 |
| commit | ba6f0fc25e3c14fbb36f4b5a616a89cd3f1de6d0 (patch) | |
| tree | 2bbf92549c6a4d29ad93374c1bd57e169ec8d9b0 /include/ui/shader.h | |
| parent | 73b733e6907e1193e562f498272108c95c00868c (diff) | |
| parent | a35179170034b60bcfb997e06bc63258caaf5049 (diff) | |
| download | qemu-ba6f0fc25e3c14fbb36f4b5a616a89cd3f1de6d0.zip qemu-ba6f0fc25e3c14fbb36f4b5a616a89cd3f1de6d0.tar.gz qemu-ba6f0fc25e3c14fbb36f4b5a616a89cd3f1de6d0.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/opengl-20171017-pull-request' into staging
ui: opengl updates for dma-buf support.
# gpg: Signature made Tue 17 Oct 2017 12:13:36 BST
# gpg: using RSA key 0x4CB6D8EED3E87138
# 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>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/opengl-20171017-pull-request:
egl-headless: add dmabuf support
egl-helpers: add egl_texture_blit and egl_texture_blend
egl-helpers: add dmabuf import support
opengl: add flipping vertex shader
opengl: move shader init from console-gl.c to shader.c
console: add support for dmabufs
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/ui/shader.h')
| -rw-r--r-- | include/ui/shader.h | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/include/ui/shader.h b/include/ui/shader.h index f7d8618..4c5acb2 100644 --- a/include/ui/shader.h +++ b/include/ui/shader.h @@ -3,13 +3,11 @@ #include <epoxy/gl.h> -GLuint qemu_gl_init_texture_blit(GLint texture_blit_prog); -void qemu_gl_run_texture_blit(GLint texture_blit_prog, - GLint texture_blit_vao); - -GLuint qemu_gl_create_compile_shader(GLenum type, const GLchar *src); -GLuint qemu_gl_create_link_program(GLuint vert, GLuint frag); -GLuint qemu_gl_create_compile_link_program(const GLchar *vert_src, - const GLchar *frag_src); +typedef struct QemuGLShader QemuGLShader; + +void qemu_gl_run_texture_blit(QemuGLShader *gls, bool flip); + +QemuGLShader *qemu_gl_init_shader(void); +void qemu_gl_fini_shader(QemuGLShader *gls); #endif /* QEMU_SHADER_H */ |