[core] add texture bindings to draw call instead of Context member fn

2019-03-07 17:50:02 +01:00
parent cb64c380fb
commit e27f330629
50 changed files with 374 additions and 237 deletions
--- a/src/mbgl/programs/fill_program.cpp
+++ b/src/mbgl/programs/fill_program.cpp
@@ -30,7 +30,6 @@ FillPatternProgram::uniformValues(mat4 matrix,
        uniforms::u_texsize::Value( atlasSize ),
        uniforms::u_scale::Value({ {pixelRatio, tileRatio, crossfade.fromScale, crossfade.toScale} } ),
        uniforms::u_fade::Value( crossfade.t ),
-        uniforms::u_image::Value( 0 ),
        uniforms::u_pixel_coord_upper::Value( std::array<float, 2> {{ float(pixelX >> 16), float(pixelY >> 16) }}),
        uniforms::u_pixel_coord_lower::Value( std::array<float, 2> {{ float(pixelX & 0xFFFF), float(pixelY & 0xFFFF) }} )
    };