diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2017-08-01 13:03:53 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-08-02 09:59:50 -0700 |
| commit | 466728b441308de4bb0579d8b871c587607c76ae (patch) | |
| tree | 097d5117cc4a39567e2a4f80ae2cc4fac18625cc /src/mbgl/shaders/fill.cpp | |
| parent | ae1d9eceadb0c7ab556b76e746af567e0a0b9835 (diff) | |
| download | qtlocation-mapboxgl-466728b441308de4bb0579d8b871c587607c76ae.tar.gz | |
[core] Simplify generate-shaders.js
We moved the #pragma ⇢ #ifndef logic into gl-js.
Diffstat (limited to 'src/mbgl/shaders/fill.cpp')
| -rw-r--r-- | src/mbgl/shaders/fill.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/mbgl/shaders/fill.cpp b/src/mbgl/shaders/fill.cpp index 8f5f304014..3ba00836a2 100644 --- a/src/mbgl/shaders/fill.cpp +++ b/src/mbgl/shaders/fill.cpp @@ -20,6 +20,7 @@ varying highp vec4 color; uniform highp vec4 u_color; #endif + #ifndef HAS_UNIFORM_u_opacity uniform lowp float a_opacity_t; attribute lowp vec2 a_opacity; @@ -28,20 +29,23 @@ varying lowp float opacity; uniform lowp float u_opacity; #endif -void main() { +void main() { + #ifndef HAS_UNIFORM_u_color color = unpack_mix_vec4(a_color, a_color_t); #else highp vec4 color = u_color; #endif + #ifndef HAS_UNIFORM_u_opacity opacity = unpack_mix_vec2(a_opacity, a_opacity_t); #else lowp float opacity = u_opacity; #endif + gl_Position = u_matrix * vec4(a_pos, 0, 1); } @@ -54,22 +58,26 @@ varying highp vec4 color; uniform highp vec4 u_color; #endif + #ifndef HAS_UNIFORM_u_opacity varying lowp float opacity; #else uniform lowp float u_opacity; #endif -void main() { +void main() { + #ifdef HAS_UNIFORM_u_color highp vec4 color = u_color; #endif + #ifdef HAS_UNIFORM_u_opacity lowp float opacity = u_opacity; #endif + gl_FragColor = color * opacity; #ifdef OVERDRAW_INSPECTOR |