sungmg/mutter-performance-source
1
0
Fork 0
Code Activity

cogl: Provide backwards compat for GLSL version 140 shaders

Browse source 
We still use GLSL 100 syntax which means `varying`, `attribute` and
`gl_FragColor` but GLSL 140 wants us to use `in` and `out`. This
provides some simple `#define`s to make it still look like the GLSL 100
syntax is supported.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3907>
This commit is contained in:
Sebastian Wick 2024-07-30 12:58:08 +02:00 committed by Marge Bot
parent ea696ae4b1
commit c5e9f028b2
2 changed files with 37 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cogl/cogl/cogl-glsl-shader-boilerplate.h
View file

@ -80,3 +80,12 @@
* more appropriate for Cogl. */ * more appropriate for Cogl. */
"#define coglFragCoord gl_FragCoord\n" "#define coglFragCoord gl_FragCoord\n"
#endif #endif
#define _COGL_VERTEX_SHADER_FALLBACK_BOILERPLATE \
"#define attribute in\n" \
"#define varying out\n\n"
#define _COGL_FRAGMENT_SHADER_FALLBACK_BOILERPLATE \
"#define varying in\n" \
"out vec4 _gl_FragColor;\n" \
"#define gl_FragColor _gl_FragColor\n\n"

40
cogl/cogl/driver/gl/cogl-pipeline-vertend-glsl.c
View file

@ -36,6 +36,7 @@
#include <string.h> #include <string.h>
#include "cogl/cogl-context-private.h" #include "cogl/cogl-context-private.h"
#include "cogl/cogl-feature-private.h"
#include "cogl/cogl-pipeline-private.h" #include "cogl/cogl-pipeline-private.h"
#include "cogl/driver/gl/cogl-util-gl-private.h" #include "cogl/driver/gl/cogl-util-gl-private.h"
#include "cogl/driver/gl/cogl-pipeline-opengl-private.h" #include "cogl/driver/gl/cogl-pipeline-opengl-private.h"
@ -199,6 +200,15 @@ glsl_version_string (CoglContext *ctx)
needs_es_annotation ? " es" : ""); needs_es_annotation ? " es" : "");
} }
static gboolean
is_glsl140_syntax (CoglContext *ctx)
{
if (ctx->glsl_es)
return COGL_CHECK_GL_VERSION (ctx->glsl_major, ctx->glsl_minor, 3, 0);
return COGL_CHECK_GL_VERSION (ctx->glsl_major, ctx->glsl_minor, 1, 40);
}
void void
_cogl_glsl_shader_set_source_with_boilerplate (CoglContext *ctx, _cogl_glsl_shader_set_source_with_boilerplate (CoglContext *ctx,
GLuint shader_gl_handle, GLuint shader_gl_handle,
@ -208,20 +218,14 @@ _cogl_glsl_shader_set_source_with_boilerplate (CoglContext *ctx,
const char **strings_in, const char **strings_in,
const GLint *lengths_in) const GLint *lengths_in)
{ {
const char *vertex_boilerplate; const char **strings = g_alloca (sizeof (char *) * (count_in + 5));
const char *fragment_boilerplate; GLint *lengths = g_alloca (sizeof (GLint) * (count_in + 5));
const char **strings = g_alloca (sizeof (char *) * (count_in + 4));
GLint *lengths = g_alloca (sizeof (GLint) * (count_in + 4));
g_autofree char *glsl_version = NULL; g_autofree char *glsl_version = NULL;
g_autofree char *version_string = NULL; g_autofree char *version_string = NULL;
int count = 0; int count = 0;
int n_layers; int n_layers;
g_autoptr (GString) layer_declarations = NULL; g_autoptr (GString) layer_declarations = NULL;
vertex_boilerplate = _COGL_VERTEX_SHADER_BOILERPLATE;
fragment_boilerplate = _COGL_FRAGMENT_SHADER_BOILERPLATE;
glsl_version = glsl_version_string (ctx); glsl_version = glsl_version_string (ctx);
version_string = g_strdup_printf ("#version %s\n\n", glsl_version); version_string = g_strdup_printf ("#version %s\n\n", glsl_version);
@ -238,13 +242,25 @@ _cogl_glsl_shader_set_source_with_boilerplate (CoglContext *ctx,
if (shader_gl_type == GL_VERTEX_SHADER) if (shader_gl_type == GL_VERTEX_SHADER)
{ {
strings[count] = vertex_boilerplate; if (is_glsl140_syntax (ctx))
lengths[count++] = strlen (vertex_boilerplate); {
strings[count] = _COGL_VERTEX_SHADER_FALLBACK_BOILERPLATE;
lengths[count++] = strlen (_COGL_VERTEX_SHADER_FALLBACK_BOILERPLATE);
}
strings[count] = _COGL_VERTEX_SHADER_BOILERPLATE;
lengths[count++] = strlen (_COGL_VERTEX_SHADER_BOILERPLATE);
} }
else if (shader_gl_type == GL_FRAGMENT_SHADER) else if (shader_gl_type == GL_FRAGMENT_SHADER)
{ {
strings[count] = fragment_boilerplate; if (is_glsl140_syntax (ctx))
lengths[count++] = strlen (fragment_boilerplate); {
strings[count] = _COGL_FRAGMENT_SHADER_FALLBACK_BOILERPLATE;
lengths[count++] = strlen (_COGL_FRAGMENT_SHADER_FALLBACK_BOILERPLATE);
}
strings[count] = _COGL_FRAGMENT_SHADER_BOILERPLATE;
lengths[count++] = strlen (_COGL_FRAGMENT_SHADER_BOILERPLATE);
} }
n_layers = cogl_pipeline_get_n_layers (pipeline); n_layers = cogl_pipeline_get_n_layers (pipeline);