Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add shader define to distinguish Tangram implementation #2158

Merged
merged 1 commit into from
May 4, 2020
Merged

Add shader define to distinguish Tangram implementation #2158

merged 1 commit into from
May 4, 2020

Conversation

matteblair
Copy link
Member

Resolves #2154

All shader sources will now include the line

#define TANGRAM_IS_ES

in the preamble of all vertex and fragment shaders. This allows style authors to enable shader code conditionally based on the engine platform ("ES" or "JS").

tallytalwar
tallytalwar approved these changes May 4, 2020
View reviewed changes
Copy link
Member

@tallytalwar tallytalwar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@tallytalwar tallytalwar merged commit 73ad80b into master May 4, 2020
@tallytalwar tallytalwar deleted the shader-define-tangram-es branch May 4, 2020 22:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tallytalwar tallytalwar tallytalwar approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Add a shader define to indicate Tangram JS vs. ES
2 participants
@matteblair @tallytalwar