Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Enable property functions for line-width #9250

Merged
merged 2 commits into from
Jun 19, 2017
Merged

Conversation

lbud
Copy link
Contributor

@lbud lbud commented Jun 12, 2017

Supersedes #9214 — this version uses no special case code generation. Instead it evaluates LineFloorwidth with a bool useIntegerZoom = true parameter, which is passed on to its function members, although I'm not sure if this might be sketchy (particularly in the spot where it copies parameters.useIntegerZoom to a copy of a const function argument here) … ?

@lbud lbud requested a review from jfirebaugh June 12, 2017 23:11
@lbud
Copy link
Contributor Author

lbud commented Jun 12, 2017

This is passing render tests but fails to compile on several builds, e.g. https://circleci.com/gh/mapbox/mapbox-gl-native/4747 😕

@kkaefer kkaefer added the Core The cross-platform C++ core, aka mbgl label Jun 13, 2017
@jfirebaugh
Copy link
Contributor

Does it work if you add an explicit constructor?

    evaluated = RenderLinePaintProperties::PossiblyEvaluated(
        unevaluated.evaluate(parameters).concat(extra.evaluate(dashArrayParams)));

@jfirebaugh jfirebaugh force-pushed the jfirebaugh-dds-line-width branch 3 times, most recently from 5e06ed0 to c29d679 Compare June 16, 2017 18:26
@lbud lbud force-pushed the jfirebaugh-dds-line-width branch from 7ad0dca to e51ea63 Compare June 19, 2017 20:17
@lbud
Copy link
Contributor Author

lbud commented Jun 19, 2017

A few tiny platform-specific docs changes snuck in as collateral damage ( here and here ) but they look like harmless docs improvements that weren't generated in a prior commit.

@lbud lbud merged commit 87a70c4 into master Jun 19, 2017
@lbud lbud deleted the jfirebaugh-dds-line-width branch June 19, 2017 21:27
lbud pushed a commit that referenced this pull request Jun 29, 2017
…ute limits (#9373)

Introducing two new attributes to enable property functions for line-width (#9250) pushed the attribute count over GL_MAX_VERTEX_ATTRIBS on some devices. Now we selectively bind only attributes that are used, making it unlikely to surpass GL_MAX_VERTEX_ATTRIBS.
jfirebaugh pushed a commit that referenced this pull request Jul 6, 2017
…ute limits (#9373)

Introducing two new attributes to enable property functions for line-width (#9250) pushed the attribute count over GL_MAX_VERTEX_ATTRIBS on some devices. Now we selectively bind only attributes that are used, making it unlikely to surpass GL_MAX_VERTEX_ATTRIBS.
jfirebaugh pushed a commit that referenced this pull request Jul 17, 2017
…ute limits (#9373)

Introducing two new attributes to enable property functions for line-width (#9250) pushed the attribute count over GL_MAX_VERTEX_ATTRIBS on some devices. Now we selectively bind only attributes that are used, making it unlikely to surpass GL_MAX_VERTEX_ATTRIBS.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Core The cross-platform C++ core, aka mbgl
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants