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.

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

Shader include with pragmas doesn't translate to ES3 correctly #7812

Merged
merged 3 commits into from Jul 19, 2023

Conversation

Jhonnyg
Copy link
Contributor

@Jhonnyg Jhonnyg commented Jul 19, 2023

Fixed an issue where using header guards in shader includes produces the wrong output.

Fixes #7809

PR checklist

  • Code
    • Add engine and/or editor unit tests.
    • New and changed code follows the overall code style of existing code
    • Add comments where needed
  • Documentation
    • Make sure that API documentation is updated in code comments
    • Make sure that manuals are updated (in github.com/defold/doc)
  • Prepare pull request and affected issue for automatic release notes generator
    • Pull request - Write a message that explains what this pull request does. What was the problem? How was it solved? What are the changes to APIs or the new APIs introduced? This message will be used in the generated release notes. Make sure it is well written and understandable for a user of Defold.
    • Pull request - Write a pull request title that in a sentence summarises what the pull request does. Do not include "Issue-1234 ..." in the title. This text will be used in the generated release notes.
    • Pull request - Link the pull request to the issue(s) it is closing. Use on of the approved closing keywords.
    • Affected issue - Assign the issue to a project. Do not assign the pull request to a project if there is an issue which the pull request closes.
    • Affected issue - Assign the "breaking change" label to the issue if introducing a breaking change.
    • Affected issue - Assign the "skip release notes" is the issue should not be included in the generated release notes.

@Jhonnyg Jhonnyg added bug Something is not working as expected bob Issues related to the bob command line build tool labels Jul 19, 2023
@Jhonnyg Jhonnyg merged commit af9b165 into dev Jul 19, 2023
21 checks passed
@Jhonnyg Jhonnyg deleted the issue-7809-shader-includes-with-pragma-guards branch July 19, 2023 15:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bob Issues related to the bob command line build tool bug Something is not working as expected
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

Bundle for Windows not worked with shader include
2 participants