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

Backport #2901 to 1.19.2 #3413

Merged
merged 3 commits into from
Nov 26, 2023

Conversation

bluebear94
Copy link

This PR backports the core shader API in fabric-rendering-v1 to 1.19.2. This consists mostly of renames of the 1.19.3 API’s code, plus a minor change in the test mod to use the pre-JOML Matrix4f.

Motivation

While I want to use the standard Forge and Fabric APIs for custom core shaders in Caxton, Fabric’s APIs are not available on 1.19.2 or 1.18.2, both of which Caxton still supports.

* Add registry for core shaders in custom namespaces

* Apply suggestions from code review

Co-authored-by: modmuss50 <[email protected]>

* Use Identifier.NAMESPACE_SEPARATOR instead of ":"

* Remove fabric_ prefixes from mixins

* Move test rendering to lower-right corner for test screenshots

---------

Co-authored-by: modmuss50 <[email protected]>
@modmuss50
Copy link
Member

I think its unlikely that we will backport this to 1.18.2, but 1.19.2 should be possible, is there anything else (anyone) may want backporting while we are at it?

@modmuss50 modmuss50 added enhancement New feature or request port Porting existing code to a different version labels Nov 11, 2023
@bluebear94
Copy link
Author

I’ll try to backport this to 1.18.2 after this PR is merged.

Right now, I’d also prefer to have the ResourceManagerHelper#registerBuiltinResourcePack(Identifier, ModContainer, Text, ResourcePackActivationType) overload available on 1.19.2 and earlier (the original API used String instead of Text). But this isn’t a huge priority.

@bluebear94 bluebear94 force-pushed the mf/core-shader-registry/1.19.2 branch from 8d46a67 to c2b7aa6 Compare November 11, 2023 19:27
@modmuss50
Copy link
Member

I’ll try to backport this to 1.18.2 after this PR is merged.

Im a little hesitant to do a 1.18.2 feature release as its bene so long, and is before we split making it a bit hard to backport, I guess we can? If so It would need to go in at the same time as this PR.

@modmuss50 modmuss50 added the merge me please Pull requests that are ready to merge label Nov 22, 2023
@modmuss50 modmuss50 merged commit 526f2c6 into FabricMC:1.19.2 Nov 26, 2023
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request merge me please Pull requests that are ready to merge port Porting existing code to a different version
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants