mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-24 06:59:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1047 from NotKit/gles2fix

Browse source 
Fix GLES2 renderer to use glGetUniformLocations locations
This commit is contained in:
emersion 2018-06-13 15:37:16 +01:00 • committed by GitHub
commit d643361c48
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 84 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

26
include/render/gles2.h
View file

@ -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;