Skip to content

Update with up to date patches from upstream PRs #2

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
Open
bwrsandman wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update with up to date patches from upstream PRs #2

bwrsandman wants to merge 2 commits into from

Conversation

@bwrsandman
Copy link
Member

@bwrsandman bwrsandman commented Feb 4, 2020 •
edited
Loading

This is not a merge request but rather a reset request.

Please test and reset master to this branch.

This branch is rebased on upstream master with fixes from

After the reset, the master branch should have two commits ahead of upstream

d24077d19 shaderc_glsl: Fix error when mixing SamplerArray and `flat` keyword
198471432 shaderc_glsl: skip interp params when parsing glslopt output

@bwrsandman bwrsandman changed the title Update with better patches Update with up to date patches from upstream PRs Feb 4, 2020
@bwrsandman
shaderc_glsl: skip interp params when parsing glslopt output
e9802f0 
Keywords like `flat` qualify type names. Without skipping them, the parser
will not find the type used and fail.
@bwrsandman
shaderc_glsl: Fix error when mixing SamplerArray and flat keyword
af4ef32 
Use of the `flat` keyword will have `glslopt_optimize` run with glsl
version 130. In this mode, it will change calls of `texture2DArray` to
the more general `textureArray`. However, this call results in an error
when reading the compiled shader:

```
bgfx/src/renderer_gl.cpp:5904: BGFX Failed to compile shader.
0: 0(45) : error C1503: undefined variable "textureArray"
```
Defining this call to be `texture` avoids this error.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@handsomematt handsomematt

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@bwrsandman @handsomematt