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

WebGLProgram: Simplify encodings checks. #19637

Merged
merged 1 commit into from
Jun 12, 2020
Merged

WebGLProgram: Simplify encodings checks. #19637

merged 1 commit into from
Jun 12, 2020

Conversation

Mugen87
Copy link
Collaborator

@Mugen87 Mugen87 commented Jun 12, 2020

When working at #19634, I've realized that the encoding checks in WebGLProgram can be improved.

Since parameters.outputEncoding is always set, encodings_pars_fragment can always be included. Besides, since parameters.mapEncoding always has a value, it's more correct to test parameters.map(which can be true or false depending on whether a diffuse texture is used or not). This is also true for the other texture types.

@mrdoob
Copy link
Owner

mrdoob commented Jun 12, 2020

Much nicer!

@mrdoob mrdoob added this to the r118 milestone Jun 12, 2020
@mrdoob mrdoob merged commit 2d5fceb into mrdoob:dev Jun 12, 2020
@mrdoob
Copy link
Owner

mrdoob commented Jun 12, 2020

Thanks!

@Mugen87
Copy link
Collaborator Author

Mugen87 commented Jun 12, 2020

It seems webgl_postprocessing_unreal_bloom_selective is broken. Investigating...

@Mugen87
Copy link
Collaborator Author

Mugen87 commented Jun 12, 2020

Fixed #19638.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants