diff options
| author | Timm Bäder <mail@baedert.org> | 2020-01-20 11:21:52 +0100 |
|---|---|---|
| committer | Timm Bäder <mail@baedert.org> | 2020-01-23 16:10:13 +0100 |
| commit | d6d5a7d8e03e3598c6534330570f893a8fb2055a (patch) | |
| tree | bd9bf40283aaa6d59fb585197b542ea7b3c7ddc1 | |
| parent | 2f5b41e9f9fc05fae145b5b044ef3f167222d939 (diff) | |
| download | gtk+-d6d5a7d8e03e3598c6534330570f893a8fb2055a.tar.gz | |
gl renderer: Shorten shaders a bit
| -rw-r--r-- | gsk/resources/glsl/preamble.fs.glsl | 8 | ||||
| -rw-r--r-- | gsk/resources/glsl/preamble.vs.glsl | 6 |
2 files changed, 3 insertions, 11 deletions
diff --git a/gsk/resources/glsl/preamble.fs.glsl b/gsk/resources/glsl/preamble.fs.glsl index b5c958ebf1..5107470e00 100644 --- a/gsk/resources/glsl/preamble.fs.glsl +++ b/gsk/resources/glsl/preamble.fs.glsl @@ -77,9 +77,7 @@ rounded_rect_coverage (RoundedRect r, vec2 p) } vec4 Texture(sampler2D sampler, vec2 texCoords) { -#if GSK_GLES - return texture2D(sampler, texCoords); -#elif GSK_LEGACY +#if defined(GSK_GLES) || defined(GSK_LEGACY) return texture2D(sampler, texCoords); #else return texture(sampler, texCoords); @@ -95,9 +93,7 @@ void setOutputColor(vec4 color) { // We do *NOT* transform the clip rect here since we already // need to do that on the CPU. -#if GSK_GLES - gl_FragColor = color * rounded_rect_coverage(create_rect(u_clip_rect), f.xy); -#elif GSK_LEGACY +#if defined(GSK_GLES) || defined(GSK_LEGACY) gl_FragColor = color * rounded_rect_coverage(create_rect(u_clip_rect), f.xy); #else outputColor = color * rounded_rect_coverage(create_rect(u_clip_rect), f.xy); diff --git a/gsk/resources/glsl/preamble.vs.glsl b/gsk/resources/glsl/preamble.vs.glsl index 1dc4a5e7bf..76de2d6561 100644 --- a/gsk/resources/glsl/preamble.vs.glsl +++ b/gsk/resources/glsl/preamble.vs.glsl @@ -2,11 +2,7 @@ uniform mat4 u_projection; uniform mat4 u_modelview; uniform float u_alpha; -#if GSK_GLES -attribute vec2 aPosition; -attribute vec2 aUv; -_OUT_ vec2 vUv; -#elif GSK_LEGACY +#if defined(GSK_GLES) || defined(GSK_LEGACY) attribute vec2 aPosition; attribute vec2 aUv; _OUT_ vec2 vUv; |