BitHeaven
/
picom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gl_common: bump GL to 3.30 

Signed-off-by: Yuxuan Shui <yshuiv7@gmail.com>
This commit is contained in:
Yuxuan Shui 2019-04-01 19:59:54 +01:00
parent 6e8a86d415
commit 3935e97e69
No known key found for this signature in database
GPG Key ID: 37C999F617EA1A47
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/backend/gl/gl_common.c
View File

@ -489,7 +489,7 @@ static GLint glGetUniformLocationChecked(GLuint p, const char *name) {
} }
// clang-format off // clang-format off
const char *vertex_shader = GLSL(130, const char *vertex_shader = GLSL(330,
uniform mat4 projection; uniform mat4 projection;
uniform vec2 orig; uniform vec2 orig;
in vec2 coord; in vec2 coord;
@ -577,14 +577,14 @@ void gl_resize(struct gl_data *gd, int width, int height) {
} }
// clang-format off // clang-format off
static const char fill_frag[] = GLSL(120, static const char fill_frag[] = GLSL(330,
uniform vec4 color; uniform vec4 color;
void main() { void main() {
gl_FragColor = color; gl_FragColor = color;
} }
); );
static const char fill_vert[] = GLSL(130, static const char fill_vert[] = GLSL(330,
in vec2 in_coord; in vec2 in_coord;
uniform mat4 projection; uniform mat4 projection;
void main() { void main() {
@ -656,7 +656,7 @@ static bool gl_init_blur(struct gl_data *gd, conv *const *const kernels) {
setlocale(LC_NUMERIC, "C"); setlocale(LC_NUMERIC, "C");
// clang-format off // clang-format off
static const char *FRAG_SHADER_BLUR = GLSL(130, static const char *FRAG_SHADER_BLUR = GLSL(330,
%s\n // other extension pragmas %s\n // other extension pragmas
uniform float offset_x; uniform float offset_x;
uniform float offset_y; uniform float offset_y;
@ -774,7 +774,7 @@ err:
} }
// clang-format off // clang-format off
const char *win_shader_glsl = GLSL(130, const char *win_shader_glsl = GLSL(330,
uniform float opacity; uniform float opacity;
uniform float dim; uniform float dim;
uniform bool invert_color; uniform bool invert_color;

4
src/backend/gl/glx.c
View File

@ -290,7 +290,9 @@ static backend_t *glx_init(session_t *ps) {
GLX_CONTEXT_MAJOR_VERSION_ARB, GLX_CONTEXT_MAJOR_VERSION_ARB,
3, 3,
GLX_CONTEXT_MINOR_VERSION_ARB, GLX_CONTEXT_MINOR_VERSION_ARB,
0, 3,
GLX_CONTEXT_PROFILE_MASK_ARB,
GLX_CONTEXT_CORE_PROFILE_BIT_ARB,
0, 0,
}); });
free(cfg); free(cfg);