frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glamor: Don't require EXT_gpu_shader4 unconditionally 

It causes a shader compilation error on systems without EXT_gpu_shader4.

Fixes: ee107cd4
This commit is contained in:
Balló György 2023-10-11 16:01:13 +02:00 committed by Martin Roukala
parent 5fdd3125b4
commit 910847f452
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glamor/glamor_render.c
View File

@ -242,7 +242,11 @@ glamor_create_composite_fs(glamor_screen_private *glamor_priv, struct shader_key
const char *mask_fetch = ""; const char *mask_fetch = "";
const char *in; const char *in;
const char *header; const char *header;
const char *header_norm = glamor_priv->glsl_version > 120 ? "#version 130\n" : "#version 120\n#extension GL_EXT_gpu_shader4 : require\n" GLAMOR_COMPAT_DEFINES_FS; const char *header_norm = glamor_priv->glsl_version > 120 ?
"#version 130\n" :
glamor_priv->use_gpu_shader4 ?
"#version 120\n#extension GL_EXT_gpu_shader4 : require\n" GLAMOR_COMPAT_DEFINES_FS :
"#version 120\n" GLAMOR_COMPAT_DEFINES_FS;
const char *header_es = glamor_priv->glsl_version > 100 ? "#version 300 es\n" : "#version 100\n" GLAMOR_COMPAT_DEFINES_FS; const char *header_es = glamor_priv->glsl_version > 100 ? "#version 300 es\n" : "#version 100\n" GLAMOR_COMPAT_DEFINES_FS;
const char *dest_swizzle; const char *dest_swizzle;
GLuint prog; GLuint prog;