PBR #1401
Merged
PBR #1401
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
- Add iris.pbr.debug property to control dumping of PBR atlases
- Combine all texture tracking into a single TextureTracker - Split atlas size calculation into AtlasInfoGatherer - Tweak PBR code to match these changes - Organize classes and packages
- PBR textures will automatically be bound if the texture implements PBRTextureHolder.Provider - Bound PBR textures are now reset to default if the last bound texture isn't a PBRTextureHolder.Provider - Remove PBR fields from ShadowRenderer - Rename some classes
- Scale sprites if their width does not match the parent sprite's width - Simplify PBR sprite loading - Fix saving of non-zero mip level textures - Rename TextureSaveUtil -> TextureSavingUtil
Conflicts: src/main/java/net/coderbot/iris/mixin/vertices/MixinBufferBuilder.java src/main/java/net/coderbot/iris/mixin/vertices/MixinVertexBuffer.java src/main/java/net/coderbot/iris/mixin/vertices/MixinVertexFormat.java src/main/java/net/coderbot/iris/samplers/IrisSamplers.java src/main/java/net/coderbot/iris/uniforms/CommonUniforms.java
- Reset atlas info on atlas texture load instead of old logic in TextureTracker
Conflicts: src/main/java/net/coderbot/iris/Iris.java src/main/java/net/coderbot/iris/pipeline/DeferredWorldRenderingPipeline.java src/main/java/net/coderbot/iris/pipeline/FixedFunctionWorldRenderingPipeline.java src/main/java/net/coderbot/iris/pipeline/WorldRenderingPipeline.java src/main/java/net/coderbot/iris/samplers/IrisSamplers.java src/main/java/net/coderbot/iris/uniforms/CommonUniforms.java
Conflicts: src/main/java/net/coderbot/iris/Iris.java src/main/java/net/coderbot/iris/gl/shader/GlShader.java src/main/java/net/coderbot/iris/gl/shader/StandardMacros.java src/main/java/net/coderbot/iris/shaderpack/ShaderPack.java
Conflicts: src/main/java/net/coderbot/iris/Iris.java src/main/java/net/coderbot/iris/mixin/GlStateManagerAccessor.java src/main/java/net/coderbot/iris/mixin/MixinRenderTarget.java src/main/java/net/coderbot/iris/mixin/texture/MixinAbstractTexture.java src/main/java/net/coderbot/iris/mixin/texture/MixinGlStateManager.java src/main/java/net/coderbot/iris/pipeline/DeferredWorldRenderingPipeline.java src/main/java/net/coderbot/iris/pipeline/FixedFunctionWorldRenderingPipeline.java src/main/java/net/coderbot/iris/pipeline/ShadowRenderer.java src/main/java/net/coderbot/iris/pipeline/WorldRenderingPipeline.java src/main/java/net/coderbot/iris/samplers/IrisSamplers.java src/main/java/net/coderbot/iris/texture/TextureTracker.java src/main/java/net/coderbot/iris/texunits/TextureUnit.java src/main/resources/mixins.iris.json src/sodiumCompatibility/java/net/coderbot/iris/compat/sodium/impl/vertex_format/terrain_xhfp/XHFPModelVertexBufferWriterNio.java src/sodiumCompatibility/java/net/coderbot/iris/compat/sodium/impl/vertex_format/terrain_xhfp/XHFPModelVertexBufferWriterUnsafe.java
IMS212
added
status: waiting on review
|
What is the status of this PR? There are a number of issue reports in the #pbr-issue-report channel on GitHub that don't appear to have any follow up or explicit resolution. I'm not fully comfortable reviewing this PR and moving forward with the process of getting it into a release until we can get a list of outstanding issues on the PR & confirmation that the other reported issues are fixed. |
# Conflicts: # src/main/java/net/coderbot/iris/mixin/bettermipmaps/MixinTextureAtlasSprite.java
Allow broken paths
- Move PBR texture parameter setup from loaders to after binding - Remove texture parameter locking - Ensure PBRTextureManager#loadHolder does not change GL state - Change PBRTextureConsumer argument contracts from Nullable to NotNull - Move PBR texture change listeners from CustomTextureManager to PBRTextureManager - Use try-with-resources in AtlasPBRLoader - Remove AtlasPBRLoader#uploadAtlas and add PBRAtlasTexture#tryUpload
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.
yeef
made this to draft
Almost all code is by @PepperCode1