Fix defines for tessellation, fix macro soup ate my shader#917
Merged
Conversation
First problem: missing include for header defining tessellation support macros; GraphicsObjectFactoryOpenGl returned null object, which led to crash. Fixed by including the correct header, obviously. Also changed the checks from #ifdef HARDWARE_TESSELLATION_SUPPORTED to #if, so that a missing include can be caught with newly enabled -Wundef. - move and rename header - enable -Wundef, and fix misc. #if DEBUG to #ifdef DEBUG - set warning flags and system include headers in web build also Second problem: when OMMVersionedGlesShaderCodeWithFrameUBO() is used without specifying two versions, it silently truncates the shader code. This accidentally occurred in the tessellation shaders; this was missed when merging the tessellation feature with the WASM support.
matzf
force-pushed
the
bugfix/tessellation-defines
branch
from
8ee79b8 to
207cccc
Compare
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
First problem: missing include for header defining tessellation support macros; GraphicsObjectFactoryOpenGl returned null object, which led to crash. Fixed by including the correct header, obviously. Also changed the checks from #ifdef HARDWARE_TESSELLATION_SUPPORTED to #if, so that a missing include can be caught with newly enabled -Wundef.
Second problem: when OMMVersionedGlesShaderCodeWithFrameUBO() is used without specifying two versions, it silently truncates the shader code. This accidentally occurred in the tessellation shaders; this was missed when merging the tessellation feature with the WASM support.