[core] Reduce number of varyings to 8 or less

For #pragmas, don't generate varyings for attributes that aren't used by the fragment shader. Pack other varyings more tightly.
This commit is contained in:
John Firebaugh
2017-06-12 16:39:59 -07:00
parent 5a2dd1b5df
commit 31bf6719fc
6 changed files with 71 additions and 81 deletions

View File

@@ -35,8 +35,7 @@ uniform lowp float a_stroke_opacity_t;
attribute lowp vec2 a_stroke_opacity;
varying lowp float stroke_opacity;
varying vec2 v_extrude;
varying lowp float v_antialiasblur;
varying vec3 v_data;
void main(void) {
color = unpack_mix_vec4(a_color, a_color_t);
@@ -48,23 +47,24 @@ void main(void) {
stroke_opacity = unpack_mix_vec2(a_stroke_opacity, a_stroke_opacity_t);
// unencode the extrusion vector that we snuck into the a_pos vector
v_extrude = vec2(mod(a_pos, 2.0) * 2.0 - 1.0);
vec2 extrude = vec2(mod(a_pos, 2.0) * 2.0 - 1.0);
vec2 extrude = v_extrude * (radius + stroke_width) * u_extrude_scale;
// multiply a_pos by 0.5, since we had it * 2 in order to sneak
// in extrusion data
gl_Position = u_matrix * vec4(floor(a_pos * 0.5), 0, 1);
if (u_scale_with_map) {
gl_Position.xy += extrude;
gl_Position.xy += extrude * (radius + stroke_width) * u_extrude_scale;
} else {
gl_Position.xy += extrude * gl_Position.w;
gl_Position.xy += extrude * (radius + stroke_width) * u_extrude_scale * gl_Position.w;
}
// This is a minimum blur distance that serves as a faux-antialiasing for
// the circle. since blur is a ratio of the circle's size and the intent is
// to keep the blur at roughly 1px, the two are inversely related.
v_antialiasblur = 1.0 / DEVICE_PIXEL_RATIO / (radius + stroke_width);
lowp float antialiasblur = 1.0 / DEVICE_PIXEL_RATIO / (radius + stroke_width);
v_data = vec3(extrude.x, extrude.y, antialiasblur);
}
)MBGL_SHADER";
@@ -77,8 +77,7 @@ varying highp vec4 stroke_color;
varying mediump float stroke_width;
varying lowp float stroke_opacity;
varying vec2 v_extrude;
varying lowp float v_antialiasblur;
varying vec3 v_data;
void main() {
@@ -89,8 +88,11 @@ void main() {
float extrude_length = length(v_extrude);
float antialiased_blur = -max(blur, v_antialiasblur);
vec2 extrude = v_data.xy;
float extrude_length = length(extrude);
lowp float antialiasblur = v_data.z;
float antialiased_blur = -max(blur, antialiasblur);
float opacity_t = smoothstep(0.0, antialiased_blur, extrude_length - 1.0);