[staging] glsl: Initial GLSL ES 3.x support. #65
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
Closed
| @@ -485,7 +485,7 @@ static void prepend_glsl_texlod_extensions(Context *ctx) | |||
| // so we'll use them if available. Failing that, we'll just fallback | |||
| // to a regular texture2D call and hope the mipmap it chooses is close | |||
| // enough. | |||
| if (!ctx->glsl_generated_texlod_setup) | |||
| if (!ctx->glsl_generated_texlod_setup && !support_glsles3(ctx)) | |||
There was a problem hiding this comment.
Is this something we should worry about for version 100 as well?
There was a problem hiding this comment.
This should be fine for 100, I'm skipping this due to the syntax being deprecated for GLSL ES 3.00.
profiles/mojoshader_profile_glsl.c
Outdated
| @@ -855,12 +882,20 @@ void emit_GLSL_attribute(Context *ctx, RegisterType regtype, int regnum, | |||
| int flags) | |||
| { | |||
| // !!! FIXME: this function doesn't deal with write masks at all yet! | |||
| const char *qualifier_in = "varying"; | |||
There was a problem hiding this comment.
Should this be attribute?
There was a problem hiding this comment.
Sorta - varying for fragment, attribute for vertex. It's indeed a silly mistake tho, fixed.
| usage_str = "gl_FragColor"; // maybe faster? | ||
| if (support_glsles3(ctx)) | ||
| { | ||
| usage_str = "_gl_FragData"; |
There was a problem hiding this comment.
Might need a quick comment saying why ES3 needs a different path
There was a problem hiding this comment.
Added.
// gl_FragColor/FragData were deprecated in favor of manually
// defining your own output variables, GLSL ES 3.x enforces the new
// syntax, so let's use it.
JohnnyonFlame
force-pushed
the
fna_es3
branch
from
d5d8998 to
3845809
Compare
|
Ooops, sorry, force pushed because something got staged by mistake. |
flibitijibibo
approved these changes
Oct 30, 2023
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.
Started discussion on issue #64 but ended up talking with @flibitijibibo over discord who told me to open a PR and wait for a review.
Thanks again!