diff options
author | emersion <contact@emersion.fr> | 2018-06-13 15:37:16 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-13 15:37:16 +0100 |
commit | d643361c48231305b8d8a4d93772d1e2c14382a7 (patch) | |
tree | e9aaa215ca89894eb27149607733d7baf0789d7b /include | |
parent | 5e4af4862e7247528eda0891c11daa1d86786c86 (diff) | |
parent | 6f29db10446662ac6741e4a63bac74380f01199e (diff) |
Merge pull request #1047 from NotKit/gles2fix
Fix GLES2 renderer to use glGetUniformLocations locations
Diffstat (limited to 'include')
-rw-r--r-- | include/render/gles2.h | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/include/render/gles2.h b/include/render/gles2.h index 99beff29..67d4e9f5 100644 --- a/include/render/gles2.h +++ b/include/render/gles2.h @@ -25,6 +25,14 @@ struct wlr_gles2_pixel_format { bool has_alpha; }; +struct wlr_gles2_tex_shader { + GLuint program; + GLint proj; + GLint invert_y; + GLint tex; + GLint alpha; +}; + struct wlr_gles2_renderer { struct wlr_renderer wlr_renderer; @@ -32,11 +40,19 @@ struct wlr_gles2_renderer { const char *exts_str; struct { - GLuint quad; - GLuint ellipse; - GLuint tex_rgba; - GLuint tex_rgbx; - GLuint tex_ext; + struct { + GLuint program; + GLint proj; + GLint color; + } quad; + struct { + GLuint program; + GLint proj; + GLint color; + } ellipse; + struct wlr_gles2_tex_shader tex_rgba; + struct wlr_gles2_tex_shader tex_rgbx; + struct wlr_gles2_tex_shader tex_ext; } shaders; uint32_t viewport_width, viewport_height; |