Enable optimizations for ESSL 1.0 code #7358
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Please add a release note line to NEW_RELEASE_NOTES.md. If this PR does not warrant a release note, add the 'internal' label to this PR. |
elizagamedev
force-pushed
the
exv/essl1-optimizations
branch
2 times, most recently
from
b370128 to
0d0ef80
Compare
bejado
reviewed
Nov 13, 2023
| @@ -14977,7 +14977,11 @@ string CompilerGLSL::flags_to_qualifiers_glsl(const SPIRType &type, const Bitset | |||
| { | |||
| auto &execution = get_entry_point(); | |||
|
|
|||
| if (flags.get(DecorationRelaxedPrecision)) | |||
| if (type.basetype == SPIRType::UInt && is_legacy()) { | |||
There was a problem hiding this comment.
Are these changes submitted to spirv-cross upstream? Otherwise, we'll lose these patches when building inside of G3
There was a problem hiding this comment.
Submitted an upstream PR, but I'm not sure they'll like it since it doesn't fix the root of the problem.
pixelflinger
requested changes
Nov 13, 2023
| @@ -460,19 +491,22 @@ io::sstream& CodeGenerator::generateOutput(io::sstream& out, ShaderStage type, | |||
| const char* materialTypeString = getOutputTypeName(materialOutputType); | |||
| const char* typeString = getOutputTypeName(outputType); | |||
|
|
|||
| bool generate_essl3_code = mTargetLanguage == TargetLanguage::SPIRV | |||
There was a problem hiding this comment.
why can't we generate essl1 with target lang spirv?
There was a problem hiding this comment.
I described it a bit above in a comment elsewhere in this file:
// During compilation and optimization, __VERSION__ reflects the shader language version of the
// intermediate code, not the version of the final code. spirv-cross automatically adapts
// certain language features (e.g. fragment output) but leaves others untouched (e.g. sampler
// functions, bit shift operations). Client code may have to make decisions based on this
// information, so define a FILAMENT_EFFECTIVE_VERSION constant.
Since the intermediate code is always ESSL 3.0 even if it eventually becomes ESSL 1.0, we have to sometimes generate ESSL 3.0 stuff like this.
elizagamedev
force-pushed
the
exv/essl1-optimizations
branch
from
0d0ef80 to
d2aac29
Compare
elizagamedev
force-pushed
the
exv/essl1-optimizations
branch
from
d2aac29 to
a6f1206
Compare
pixelflinger
approved these changes
Nov 14, 2023
elizagamedev
force-pushed
the
exv/essl1-optimizations
branch
from
a6f1206 to
85f145e
Compare
Merged
elizagamedev
force-pushed
the
exv/essl1-optimizations
branch
3 times, most recently
from
e4fd636 to
29eb09a
Compare
elizagamedev
added a commit
that referenced
this pull request
Nov 15, 2023
Since #7358 is blocked by an upstream spirv-cross issue, we can at least do a bit of preprocessor optimization for ESSL 1.0 code in the meantime and introduce the FILAMENT_EFFECTIVE_VERSION preprocessor definitions.
elizagamedev
added a commit
that referenced
this pull request
Nov 16, 2023
Since #7358 is blocked by an upstream spirv-cross issue, we can at least do a bit of preprocessor optimization for ESSL 1.0 code in the meantime and introduce the FILAMENT_EFFECTIVE_VERSION preprocessor definitions.
elizagamedev
added a commit
that referenced
this pull request
Nov 16, 2023
Since #7358 is blocked by an upstream spirv-cross issue, we can at least do a bit of preprocessor optimization for ESSL 1.0 code in the meantime and introduce the FILAMENT_EFFECTIVE_VERSION preprocessor definitions.
elizagamedev
force-pushed
the
exv/essl1-optimizations
branch
2 times, most recently
from
a9a6915 to
d064a67
Compare
The CL introducing the ESSL 1.0 chunk in materials inadvertently disabled optimizations for said code. This commit reintroduces those optimizations and fixes associated bugs which manifested. In particular, spirv-cross was generating uints for bools; this has been fixed with a hack. Additionally, spirv-cross is now compiled with exceptions enabled so that matc can gracefully fail and show the code which failed to compile rather than abruptly aborting.
elizagamedev
force-pushed
the
exv/essl1-optimizations
branch
from
d064a67 to
dedaba3
Compare
poweifeng
pushed a commit
that referenced
this pull request
Nov 27, 2023
Since #7358 is blocked by an upstream spirv-cross issue, we can at least do a bit of preprocessor optimization for ESSL 1.0 code in the meantime and introduce the FILAMENT_EFFECTIVE_VERSION preprocessor definitions.
plepers
pushed a commit
to plepers/filament
that referenced
this pull request
Dec 9, 2023
Since google#7358 is blocked by an upstream spirv-cross issue, we can at least do a bit of preprocessor optimization for ESSL 1.0 code in the meantime and introduce the FILAMENT_EFFECTIVE_VERSION preprocessor definitions.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The CL introducing the ESSL 1.0 chunk in materials inadvertently disabled optimizations for said code. This commit reintroduces those optimizations and fixes associated bugs which manifested. In particular, spirv-cross was generating uints for bools; this has been fixed with a hack. Additionally, spirv-cross is now compiled with exceptions enabled so that matc can gracefully fail and show the code which failed to compile rather than abruptly aborting.
Upstream issue for spirv-cross.
Upstream PR for spirv-cross.