merge with iris HEAD "1.6.13"#598
Conversation
Update guide.md
# Conflicts: # src/main/java/net/coderbot/iris/pipeline/newshader/NewWorldRenderingPipeline.java # src/main/java/net/coderbot/iris/pipeline/newshader/ShaderKey.java # src/main/java/net/coderbot/iris/pipeline/transform/TransformPatcher.java
deduplication of storage qualifier changing code, import cleanup, formatting
use Template for declarations,
Full Optifine core specification support
Update et_ee.json
…-parsing Improve number parsing for settings and consts
# Conflicts: # docs/guide.md # src/main/java/net/coderbot/iris/Iris.java # src/main/java/net/coderbot/iris/compat/sodium/mixin/shader_overrides/MixinGlRenderDevice.java # src/main/java/net/coderbot/iris/gl/program/ComputeProgram.java # src/main/java/net/coderbot/iris/mixin/MixinGlStateManager_FramebufferBinding.java # src/main/java/net/coderbot/iris/mixin/MixinLevelRenderer.java # src/main/java/net/coderbot/iris/mixin/MixinShaderInstance.java # src/main/java/net/coderbot/iris/pipeline/newshader/ExtendedShader.java # src/main/java/net/coderbot/iris/pipeline/newshader/ShaderInstanceInterface.java # src/main/java/net/coderbot/iris/pipeline/transform/parameter/AttributeParameters.java # src/main/java/net/coderbot/iris/pipeline/transform/parameter/GeometryInfoParameters.java # src/main/java/net/coderbot/iris/postprocess/CompositeRenderer.java # src/main/java/net/coderbot/iris/postprocess/FinalPassRenderer.java # src/main/resources/fabric.mod.json # src/sodiumCompatibility/resources/mixins.iris.compat.sodium.json
SettingDust
changed the title
|
Tested in dawncraft
|
|
Need more test. |
|
edit: just looked closer again at the opening post, and that definitely shows BSL not working correctly. are you sure this is ready for review? mc 1.18.2, forge 40.2.17, dh 2.0.2-a-dev (downloaded this morning), embeddium 0.3.12, and the above oculus build. this is all with an i7 laptop using iris-xe onboard graphics. i know from one of the dh folks that this machine SHOULD be able to pull this off, if i was using iris on fabric. dh is definitely working (was doing testing with it this morning before downloading the oculus build, plus you can see it loading the chunks) summary: bsl almost works, while complementary unbound is a little behind. bliss, photon, and shrimple definitely do not work. didn't include a photon screenshot, it looks very close to the same as bliss. only bothered including shrimple because it had a novel fail state. with bsl 8.2.09p1. with complementary unbound r5.1.1 (if there's a better version i'm not sure where it is, it isn't in the list of compatible things in the iris discord) with bliss (from https://github.com/X0nk/Bliss-Shader/archive/refs/heads/main.zip ) with shrimple (from https://github.com/Null-MC/Shrimple/archive/refs/heads/main.zip ) for funsies: |
|
@esotericist you need to compare with iris 1.18 on fabric. Bliss on Iris 1.18.2 fabric |
|
This update is Iris 1.6.13 instead of 1.7.0 that is beta. So the support for DH is "legacy" instead of "v2" |
ah, that wasn't clear from the pr. alright |
|
Does iris use mixinextras? |
https://github.com/Asek3/Oculus/tree/1.18.2-dev/src/main/java/llamalad7/mixinextras |
only in 1.18.2, and that doesn't mean you can use mixinextras in this pr. |
Why not? |
Because this pr should just update oculus to iris 1.16.13 and nothing more, other stuff needs a separate PR |
Make sense. You can close this or edit it since |
ghost
mentioned this pull request
19 participants
fix #559