mirror of
https://github.com/GTNewHorizons/Angelica.git
synced 2026-11-18 11:29:08 +00:00
Compare commits
21
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
979ad344a1 | ||
|
|
5f328e9b57 | ||
|
|
2dba62bf20 | ||
|
|
0fd4d457e2 | ||
|
|
b56e803622 | ||
|
|
3ab965ded7 | ||
|
|
538b38898c | ||
|
|
e43cd6f18e | ||
|
|
38285087c9 | ||
|
|
deb6c2b6e5 | ||
|
|
e11985a913 | ||
|
|
4bbf39eb4d | ||
|
|
8c90f79c17 | ||
|
|
e4e657846d | ||
|
|
2dace708b4 | ||
|
|
1df1ec3530 | ||
|
|
d96ac28043 | ||
|
|
72c13cff67 | ||
|
|
f233ba65e3 | ||
|
|
c0d636d4f7 | ||
|
|
bd5cd350c3 |
No files matched your search
@@ -18,6 +18,14 @@ body:
|
||||
placeholder: "Example: 1.0.0-alpha1"
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
id: report
|
||||
attributes:
|
||||
label: Bug Report
|
||||
description: "Relevant information, as well as relevant logs attached such as `logs/fml-client-latest.log."
|
||||
placeholder: "Example: https://mclo.gs/ OR submit the file to github by dragging it to this textbox."
|
||||
validations:
|
||||
required: true
|
||||
- type: dropdown
|
||||
id: java
|
||||
attributes:
|
||||
@@ -52,11 +60,10 @@ body:
|
||||
id: shaders
|
||||
attributes:
|
||||
label: Shaders
|
||||
description: Do you have Iris/Shaders enabled?
|
||||
description: Do you have a shaderpack enabled?
|
||||
options:
|
||||
- "No: Go ahead and create an issue"
|
||||
- "Yes: I will not create an issue"
|
||||
- "Yes: I don't read and shouldn't be creating an issue"
|
||||
- "No"
|
||||
- "Yes: Please put relevant information about shaderpack in the report(what shaderpack, any special settings of note, etc)"
|
||||
validations:
|
||||
required: true
|
||||
- type: dropdown
|
||||
@@ -70,14 +77,6 @@ body:
|
||||
- "Yes: I don't read and shouldn't be creating an issue"
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
id: report
|
||||
attributes:
|
||||
label: Bug Report
|
||||
description: "Relevant information, as well as relevant logs attached such as `logs/fml-client-latest.log."
|
||||
placeholder: "Example: https://mclo.gs/ OR submit the file to github by dragging it to this textbox."
|
||||
validations:
|
||||
required: true
|
||||
- type: textarea
|
||||
id: modlist
|
||||
attributes:
|
||||
@@ -98,6 +97,5 @@ body:
|
||||
required: true
|
||||
- label: "I am running an officially released version. (Or, if I've compiled it myself I plan to fix the issue)"
|
||||
required: true
|
||||
- label: "This issue is not related to a feature that is disabed by default - Shaders, MCPF, etc. [They'll be enabled when they're ready for testing]"
|
||||
required: true
|
||||
|
||||
|
||||
|
||||
@@ -29,5 +29,5 @@ body:
|
||||
required: true
|
||||
- label: "I have read the known incompatibilities and this is not related to one of those."
|
||||
required: true
|
||||
- label: "This issue is not related to a feature that is disabed by default - Shaders, MCPF, etc. [They'll be enabled when they're ready for testing]"
|
||||
required: true
|
||||
- label: "This issue is not related to a feature that is disabed by default - MCPF, etc. [They'll be enabled when they're ready for testing]"
|
||||
required: true
|
||||
@@ -66,7 +66,7 @@
|
||||
* HUDCaching
|
||||
* Created by [Moulberry](https://github.com/Moulberry/MCHUDCaching), backported from [Patcher](https://github.com/Sk1erLLC/Patcher) mod by Alexdoru under the CC-BY-SA-NC 4.0 license
|
||||
* Angelica
|
||||
* mitchej123, Omni, Makamys, Embeddedt, NanoLive, Caedis, Cardinalstar, Alexdoru, Eigenraven, mist475, Clepto for helping get Angelica up and running!
|
||||
* mitchej123, Omni, Makamys, Embeddedt, NanoLive, Caedis, Cardinalstar, Alexdoru, Eigenraven, mist475, Clepto, kurrycat for helping get Angelica up and running!
|
||||
* IMS, jss2a98aj, || dbp ||, roadhog360 for advice and moral support
|
||||
* Forge 1.12+
|
||||
* Some files have been taken from Minecraft Forge under the LGPL 2.1 license and are marked as such
|
||||
@@ -75,4 +75,6 @@
|
||||
license, see LICENSE in `com.gtnewhorizons.angelica.models`
|
||||
* Dynamic Lights
|
||||
* LambdAurora for [LambDynamicLights](https://github.com/LambdAurora/LambDynamicLights) under the MIT license, and the Forge port anthxnymc for [DynamicLightsReforged](https://github.com/anthxnymc/DynamicLightsReforged), also under the MIT license
|
||||
|
||||
* Embeddedt and Ferri_Arnus for [glsl-transformation-lib](https://github.com/TauMC/glsl-transformation-lib)
|
||||
* Also for work on [Monocle](https://github.com/ferriarnus/Monocle) which was used as a reference for implementing glsl-transformation-lib
|
||||
* Code from both glsl-transformation-lib and Monocle taken under their respective LGPL 3.0 licenses
|
||||
+2
-3
@@ -63,10 +63,10 @@ dependencies {
|
||||
compileOnly('org.jetbrains:annotations:24.0.1')
|
||||
api("com.github.GTNewHorizons:GTNHLib:0.5.12:dev")
|
||||
shadowImplementation("org.anarres:jcpp:1.4.14") // Apache 2.0
|
||||
implementation("io.github.douira:glsl-transformer:1.0.0")
|
||||
shadowImplementation("io.github.douira:glsl-transformer:1.0.0") { // glsl-transformer Noncommercial License 1.0.0
|
||||
shadowImplementation("org.taumc:glsl-transformation-lib:0.2.0-4.g6b42bca") {
|
||||
exclude module: "antlr4" // we only want to shadow the runtime module
|
||||
}
|
||||
shadowImplementation("org.antlr:antlr4-runtime:4.13.2")
|
||||
compileOnly "org.apache.ant:ant:1.8.2"
|
||||
|
||||
// Because who doesn't want NEI
|
||||
@@ -112,7 +112,6 @@ dependencies {
|
||||
// Better Crashes
|
||||
compileOnly("com.github.GTNewHorizons:BetterCrashes:1.4.0-GTNH:dev")
|
||||
|
||||
|
||||
// Tests
|
||||
testImplementation(platform('org.junit:junit-bom:5.9.2'))
|
||||
testImplementation('org.junit.jupiter:junit-jupiter')
|
||||
|
||||
@@ -25,5 +25,12 @@ repositories {
|
||||
includeGroup('CoreTweaks')
|
||||
}
|
||||
}
|
||||
maven {
|
||||
name = 'taumc'
|
||||
url = 'https://maven.taumc.org/releases'
|
||||
content {
|
||||
includeGroup 'org.taumc'
|
||||
}
|
||||
}
|
||||
mavenLocal()
|
||||
}
|
||||
@@ -2,17 +2,17 @@ package com.gtnewhorizons.angelica.common;
|
||||
|
||||
import cpw.mods.fml.relauncher.Side;
|
||||
import cpw.mods.fml.relauncher.SideOnly;
|
||||
import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
import net.minecraft.client.renderer.texture.IIconRegister;
|
||||
import net.minecraft.util.IIcon;
|
||||
import net.minecraftforge.client.event.TextureStitchEvent;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
|
||||
|
||||
/**
|
||||
* This Block is not actually getting registered. A static instance is created in AngelicaMod.
|
||||
* In order to register the texture for it, there is a mixin to TextureMap which injects a call
|
||||
* to this instance's registerBlocKIcons method. Actually registering the block on the client but
|
||||
* not the server can cause block IDs to different between client/server, which is not good.
|
||||
* Actually registering the block on the client but not the server can cause block IDs to
|
||||
* different between client/server, which is not good.
|
||||
|
||||
* We're essentially injecting the block's texture, so that we may use this block as if it were
|
||||
* any normal block for rendering purposes with RenderBlocks and such, but not have to actually
|
||||
@@ -25,21 +25,24 @@ public class BlockError extends Block {
|
||||
|
||||
public BlockError() {
|
||||
super(Material.rock);
|
||||
|
||||
MinecraftForge.EVENT_BUS.register(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
@SubscribeEvent
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void registerBlockIcons(IIconRegister reg)
|
||||
{
|
||||
for (int i = 0; i < icons.length; i++) {
|
||||
icons[i] = reg.registerIcon("angelica:error_block_" + i);
|
||||
public void onTextureStitch(TextureStitchEvent.Pre event) {
|
||||
if (event.map.getTextureType() == 0) {
|
||||
for (int i = 0; i < icons.length; i++) {
|
||||
icons[i] = event.map.registerIcon("angelica:error_block_" + i);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public IIcon getIcon(int side, int meta) {
|
||||
return icons[meta];
|
||||
return meta >= 0 && meta < icons.length ? icons[meta] : null;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -33,7 +33,7 @@ public class AngelicaConfig {
|
||||
public static boolean enableTestBlocks;
|
||||
|
||||
@Config.Comment("Enable Iris Shaders [Requires Sodium]")
|
||||
@Config.DefaultBoolean(false)
|
||||
@Config.DefaultBoolean(true)
|
||||
@Config.RequiresMcRestart
|
||||
public static boolean enableIris;
|
||||
|
||||
@@ -117,6 +117,11 @@ public class AngelicaConfig {
|
||||
@Config.RequiresMcRestart
|
||||
public static boolean fixExtraUtilsSodiumCompat;
|
||||
|
||||
@Config.Comment("Fix thread-safety in Stacks on Stacks rendering")
|
||||
@Config.DefaultBoolean(true)
|
||||
@Config.RequiresMcRestart
|
||||
public static boolean fixStacksOnStacksSodiumCompat;
|
||||
|
||||
@Config.Comment("Fix thread-safety issues in MineFactory Reloaded")
|
||||
@Config.DefaultBoolean(true)
|
||||
@Config.RequiresMcRestart
|
||||
@@ -138,6 +143,11 @@ public class AngelicaConfig {
|
||||
@Config.RangeInt(min = 32, max = 2048)
|
||||
public static int droppedItemLimit;
|
||||
|
||||
@Config.Comment("Use total world time instead of normal world time. Allows most shader animations to play when "
|
||||
+ "doDaylightCycle is off, but causes shader animations to desync from time of day.")
|
||||
@Config.DefaultBoolean(false)
|
||||
public static boolean useTotalWorldTime;
|
||||
|
||||
@Config.Comment("Enable Debug Logging")
|
||||
@Config.DefaultBoolean(false)
|
||||
@Config.RequiresMcRestart
|
||||
|
||||
@@ -37,6 +37,7 @@ import java.util.function.Predicate;
|
||||
public class DynamicLights {
|
||||
private static DynamicLights instance;
|
||||
public static DynamicLightsMode Mode = DynamicLightsMode.OFF;
|
||||
public static boolean ShaderForce = false;
|
||||
|
||||
private static final double MAX_RADIUS = 7.75;
|
||||
private static final double MAX_RADIUS_SQUARED = MAX_RADIUS * MAX_RADIUS;
|
||||
@@ -52,7 +53,11 @@ public class DynamicLights {
|
||||
}
|
||||
|
||||
public static boolean isEnabled() {
|
||||
return AngelicaConfig.enableDynamicLights && Mode.isEnabled() && !IrisApi.getInstance().isShaderPackInUse();
|
||||
return AngelicaConfig.enableDynamicLights &&
|
||||
Mode.isEnabled() &&
|
||||
// if shader force is enabled then true
|
||||
// if not, then true when shaders are not in use
|
||||
(ShaderForce || !IrisApi.getInstance().isShaderPackInUse());
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -65,7 +70,7 @@ public class DynamicLights {
|
||||
return;
|
||||
|
||||
long now = System.currentTimeMillis();
|
||||
if (now >= this.lastUpdate + 50) {
|
||||
if (now >= this.lastUpdate + Mode.getDelay()) {
|
||||
this.lastUpdate = now;
|
||||
this.lastUpdateCount = 0;
|
||||
|
||||
|
||||
@@ -7,7 +7,8 @@ public enum DynamicLightsMode
|
||||
OFF("Off", 0),
|
||||
FASTEST("Fastest", 500),
|
||||
FAST("Fast", 250),
|
||||
FANCY("Fancy", 0);
|
||||
FANCY("Fancy", 50),
|
||||
REALTIME("Realtime", 0);
|
||||
|
||||
private final String name;
|
||||
private final int delay;
|
||||
|
||||
@@ -73,13 +73,6 @@ public interface IDynamicLightSource {
|
||||
*/
|
||||
void angelica$dynamicLightTick();
|
||||
|
||||
/**
|
||||
* Returns whether this dynamic light source should update.
|
||||
*
|
||||
* @return {@code true} if this dynamic light source should update, else {@code false}
|
||||
*/
|
||||
boolean angelica$shouldUpdateDynamicLight();
|
||||
|
||||
boolean angelica$updateDynamicLight(@NotNull SodiumWorldRenderer renderer);
|
||||
|
||||
void angelica$scheduleTrackedChunksRebuild(@NotNull SodiumWorldRenderer renderer);
|
||||
|
||||
@@ -971,6 +971,20 @@ public class GLStateManager {
|
||||
GL11.glDrawBuffer(mode);
|
||||
}
|
||||
|
||||
public static void glDrawElements(int mode, IntBuffer indices) {
|
||||
if(AngelicaConfig.enableIris) {
|
||||
Iris.getPipelineManager().getPipeline().ifPresent(WorldRenderingPipeline::syncProgram);
|
||||
}
|
||||
GL11.glDrawElements(mode, indices);
|
||||
}
|
||||
|
||||
public static void glBegin(int mode) {
|
||||
if (AngelicaConfig.enableIris) {
|
||||
Iris.getPipelineManager().getPipeline().ifPresent(WorldRenderingPipeline::syncProgram);
|
||||
}
|
||||
GL11.glBegin(mode);
|
||||
}
|
||||
|
||||
public static void glLogicOp(int opcode) {
|
||||
GL11.glLogicOp(opcode);
|
||||
}
|
||||
|
||||
@@ -29,7 +29,7 @@ public enum Mixins {
|
||||
,"angelica.MixinMinecraft"
|
||||
,"angelica.optimizations.MixinRendererLivingEntity"
|
||||
,"angelica.MixinFMLClientHandler"
|
||||
,"angelica.MixinTextureMap"
|
||||
,"angelica.bugfixes.MixinRenderGlobal_DestroyBlock"
|
||||
)
|
||||
),
|
||||
ANGELICA_VBO(
|
||||
@@ -143,6 +143,7 @@ public enum Mixins {
|
||||
,"shaders.MixinGuiIngameForge"
|
||||
,"shaders.MixinFramebuffer"
|
||||
,"shaders.MixinItem"
|
||||
,"shaders.MixinItemRenderer"
|
||||
,"shaders.MixinLocale"
|
||||
,"shaders.MixinOpenGlHelper"
|
||||
,"shaders.MixinRender"
|
||||
|
||||
@@ -97,6 +97,7 @@ public class RedirectorTransformer implements IClassTransformer {
|
||||
glCapRedirects.put(org.lwjgl.opengl.GL11.GL_SCISSOR_TEST, "ScissorTest");
|
||||
methodRedirects.put(GL11, RedirectMap.newMap()
|
||||
.add("glAlphaFunc")
|
||||
.add("glBegin")
|
||||
.add("glBindTexture")
|
||||
.add("glBlendFunc")
|
||||
.add("glCallList")
|
||||
@@ -119,6 +120,7 @@ public class RedirectorTransformer implements IClassTransformer {
|
||||
.add("glDepthRange")
|
||||
.add("glDrawArrays")
|
||||
.add("glDrawBuffer")
|
||||
.add("glDrawElements")
|
||||
.add("glEdgeFlag")
|
||||
.add("glEndList")
|
||||
.add("glFog")
|
||||
|
||||
@@ -14,6 +14,8 @@ public enum CompatASMTransformers {
|
||||
EXTRA_UTILITIES_ISBRH("RenderBlockColor Transformer", () -> AngelicaConfig.fixExtraUtilsSodiumCompat, Side.CLIENT,
|
||||
"com.gtnewhorizons.angelica.transform.compat.ExtraUtilsTransformer"
|
||||
),
|
||||
STACKS_ON_STACKS_ISBRH("RenderTilePile Transformer", () -> AngelicaConfig.fixStacksOnStacksSodiumCompat, Side.CLIENT, "com.gtnewhorizons.angelica.transform.compat.StacksOnStacksTransformer"),
|
||||
FIELD_LEVEL_TESSELLATOR("Field Level Tessellator Transformer", () -> AngelicaConfig.enableSodium, Side.CLIENT, "com.gtnewhorizons.angelica.transform.compat.FieldLevelTessellatorTransformer"),
|
||||
HUD_CACHING("HUDCaching Early Return Transformer", () -> AngelicaConfig.enableHudCaching && AngelicaConfig.enableHudCachingEventTransformer, Side.CLIENT,
|
||||
"com.gtnewhorizons.angelica.transform.HUDCachingTransformer")
|
||||
;
|
||||
|
||||
+107
@@ -0,0 +1,107 @@
|
||||
package com.gtnewhorizons.angelica.transform.compat;
|
||||
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.google.common.collect.ImmutableMap;
|
||||
import com.gtnewhorizons.angelica.loading.AngelicaTweaker;
|
||||
import net.minecraft.launchwrapper.IClassTransformer;
|
||||
import org.spongepowered.asm.lib.ClassReader;
|
||||
import org.spongepowered.asm.lib.ClassWriter;
|
||||
import org.spongepowered.asm.lib.Opcodes;
|
||||
import org.spongepowered.asm.lib.tree.AbstractInsnNode;
|
||||
import org.spongepowered.asm.lib.tree.ClassNode;
|
||||
import org.spongepowered.asm.lib.tree.FieldInsnNode;
|
||||
import org.spongepowered.asm.lib.tree.InsnList;
|
||||
import org.spongepowered.asm.lib.tree.LabelNode;
|
||||
import org.spongepowered.asm.lib.tree.LocalVariableNode;
|
||||
import org.spongepowered.asm.lib.tree.MethodNode;
|
||||
import org.spongepowered.asm.lib.tree.VarInsnNode;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
public class FieldLevelTessellatorTransformer implements IClassTransformer {
|
||||
|
||||
private static final Map<String, List<String>> patchMethods = ImmutableMap.of(
|
||||
"com.tierzero.stacksonstacks.util.ClientUtils", ImmutableList.of("drawQuad", "drawRectangularPrism")
|
||||
);
|
||||
|
||||
public byte[] transform(final String className, String transformedName, byte[] basicClass) {
|
||||
if (basicClass == null) return null;
|
||||
|
||||
if (!patchMethods.containsKey(transformedName)) {
|
||||
return basicClass;
|
||||
}
|
||||
|
||||
ClassReader cr = new ClassReader(basicClass);
|
||||
ClassNode cn = new ClassNode();
|
||||
cr.accept(cn, 0);
|
||||
|
||||
for (String targetMethod : patchMethods.get(transformedName)) {
|
||||
for (MethodNode method : cn.methods) {
|
||||
if (!method.name.equals(targetMethod)) continue;
|
||||
injectLocalTessellatorAndReplaceFieldUsage(method);
|
||||
}
|
||||
}
|
||||
|
||||
ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS | ClassWriter.COMPUTE_FRAMES);
|
||||
cn.accept(cw);
|
||||
final byte[] bytes = cw.toByteArray();
|
||||
AngelicaTweaker.dumpClass(transformedName, basicClass, bytes, this);
|
||||
return bytes;
|
||||
}
|
||||
|
||||
public static void injectLocalTessellatorAndReplaceFieldUsage(MethodNode mn) {
|
||||
// This part searches the instructions to see if there is any usage of a Tessellator field
|
||||
// which is NOT owned by Minecraft itself. This means anyone that caches it into a field will get caught
|
||||
// but not direct usage of Tessellator.instance.whatever()
|
||||
List<String> fields = new ArrayList<>();
|
||||
for (int i = 0; i < mn.instructions.size(); i++) {
|
||||
AbstractInsnNode in = mn.instructions.get(i);
|
||||
if (in instanceof FieldInsnNode fin) {
|
||||
if (
|
||||
(fin.getOpcode() == Opcodes.GETSTATIC || fin.getOpcode() == Opcodes.GETFIELD)
|
||||
&& fin.desc.equals("Lnet/minecraft/client/renderer/Tessellator;")
|
||||
&& !fin.owner.equals("net/minecraft/client/renderer/Tessellator")
|
||||
) {
|
||||
fields.add(fin.owner + ";" + fin.name);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (fields.isEmpty()) return;
|
||||
|
||||
// Injects a new local to store our new local Tessellator in
|
||||
int localIndex = mn.maxLocals;
|
||||
LabelNode startLabel = new LabelNode();
|
||||
LabelNode endLabel = new LabelNode();
|
||||
LocalVariableNode tesNode = new LocalVariableNode("tes", "Lnet/minecraft/client/renderer/Tessellator;", null, startLabel, endLabel, localIndex);
|
||||
mn.localVariables.add(tesNode);
|
||||
|
||||
// Actually initialize the new local Tessellator
|
||||
InsnList list = new InsnList();
|
||||
list.add(startLabel);
|
||||
list.add(new FieldInsnNode(Opcodes.GETSTATIC, "net/minecraft/client/renderer/Tessellator", AngelicaTweaker.isObfEnv() ? "field_78398_a" : "instance", "Lnet/minecraft/client/renderer/Tessellator;"));
|
||||
list.add(new VarInsnNode(Opcodes.ASTORE, localIndex));
|
||||
mn.instructions.insert(list);
|
||||
|
||||
// This searches through all the instructions and finds usage of the previously discovered fields, then it replaces them
|
||||
// with an ALOAD for our new local instead of the GETSTATIC/GETFIELD
|
||||
for (int i = 0; i < mn.instructions.size(); i++) {
|
||||
AbstractInsnNode in = mn.instructions.get(i);
|
||||
if (in instanceof FieldInsnNode fin) {
|
||||
String hash = fin.owner + ";" + fin.name;
|
||||
if (
|
||||
(fin.getOpcode() == Opcodes.GETSTATIC || fin.getOpcode() == Opcodes.GETFIELD)
|
||||
&& fin.desc.equals("Lnet/minecraft/client/renderer/Tessellator;")
|
||||
&& fields.contains(hash)
|
||||
) {
|
||||
mn.instructions.insertBefore(in, new VarInsnNode(Opcodes.ALOAD, localIndex));
|
||||
mn.instructions.remove(in);
|
||||
}
|
||||
}
|
||||
}
|
||||
mn.instructions.add(endLabel);
|
||||
}
|
||||
|
||||
}
|
||||
+171
@@ -0,0 +1,171 @@
|
||||
package com.gtnewhorizons.angelica.transform.compat;
|
||||
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.gtnewhorizons.angelica.loading.AngelicaTweaker;
|
||||
import net.minecraft.launchwrapper.IClassTransformer;
|
||||
import org.spongepowered.asm.lib.ClassWriter;
|
||||
import org.spongepowered.asm.lib.ClassReader;
|
||||
import org.spongepowered.asm.lib.Opcodes;
|
||||
import org.spongepowered.asm.lib.tree.AbstractInsnNode;
|
||||
import org.spongepowered.asm.lib.tree.AnnotationNode;
|
||||
import org.spongepowered.asm.lib.tree.ClassNode;
|
||||
import org.spongepowered.asm.lib.tree.FieldInsnNode;
|
||||
import org.spongepowered.asm.lib.tree.FieldNode;
|
||||
import org.spongepowered.asm.lib.tree.InsnList;
|
||||
import org.spongepowered.asm.lib.tree.InsnNode;
|
||||
import org.spongepowered.asm.lib.tree.JumpInsnNode;
|
||||
import org.spongepowered.asm.lib.tree.LabelNode;
|
||||
import org.spongepowered.asm.lib.tree.MethodInsnNode;
|
||||
import org.spongepowered.asm.lib.tree.MethodNode;
|
||||
import org.spongepowered.asm.lib.tree.TypeInsnNode;
|
||||
import org.spongepowered.asm.lib.tree.VarInsnNode;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class StacksOnStacksTransformer implements IClassTransformer {
|
||||
|
||||
private static final String RenderTilePile = "com.tierzero.stacksonstacks.client.render.RenderTilePile";
|
||||
private static final List<String> staticRemovers = ImmutableList.of("ingotRender", "gemRender", "dustRender");
|
||||
|
||||
private static final String ClientUtils = "com.tierzero.stacksonstacks.util.ClientUtils";
|
||||
|
||||
@Override
|
||||
public byte[] transform(String name, String transformedName, byte[] basicClass) {
|
||||
if (basicClass == null) return null;
|
||||
|
||||
if (!transformedName.equals(RenderTilePile) && !transformedName.equals(ClientUtils)) return basicClass;
|
||||
|
||||
final ClassReader cr = new ClassReader(basicClass);
|
||||
final ClassNode cn = new ClassNode();
|
||||
cr.accept(cn, 0);
|
||||
|
||||
if (transformedName.equals(RenderTilePile)) {
|
||||
transformRenderTilePile(cn);
|
||||
} else {
|
||||
transformClientUtils(cn);
|
||||
}
|
||||
|
||||
ClassWriter cw = new ClassWriter(0);
|
||||
cn.accept(cw);
|
||||
final byte[] bytes = cw.toByteArray();
|
||||
AngelicaTweaker.dumpClass(transformedName, basicClass, bytes, this);
|
||||
return bytes;
|
||||
}
|
||||
|
||||
/**
|
||||
* Injects initializers for the field level PileRender objects which used to be static into the <init>
|
||||
*/
|
||||
private InsnList injectPileRenderInitializer(MethodNode mn, String type) {
|
||||
LabelNode start = new LabelNode();
|
||||
LabelNode end = new LabelNode();
|
||||
InsnList list = new InsnList();
|
||||
list.add(start);
|
||||
list.add(new VarInsnNode(Opcodes.ALOAD, 0));
|
||||
list.add(new TypeInsnNode(Opcodes.NEW, "com/tierzero/stacksonstacks/client/render/PileRender" + type));
|
||||
list.add(new InsnNode(Opcodes.DUP));
|
||||
list.add(new MethodInsnNode(Opcodes.INVOKESPECIAL, "com/tierzero/stacksonstacks/client/render/PileRender" + type, "<init>", "()V"));
|
||||
list.add(new FieldInsnNode(Opcodes.PUTFIELD, "com/tierzero/stacksonstacks/client/render/RenderTilePile", type.toLowerCase() + "Render", "Lcom/tierzero/stacksonstacks/client/render/PileRender;"));
|
||||
list.add(end);
|
||||
return list;
|
||||
}
|
||||
|
||||
private void transformRenderTilePile(ClassNode cn) {
|
||||
MethodNode clinit = null;
|
||||
for (MethodNode mn : cn.methods) {
|
||||
// Handles injecting field initializers for the various PileRender fields which used to be static
|
||||
// but we're removing <clinit> entirely and doing the initialization in <init>
|
||||
if (mn.name.equals("<init>")) {
|
||||
AbstractInsnNode objectInsn = null;
|
||||
// This removes the early return, and gets a reference to the self initialization so we can insert after
|
||||
for (int i = 0; i < mn.instructions.size(); i++) {
|
||||
AbstractInsnNode ain = mn.instructions.get(i);
|
||||
if (ain.getOpcode() == Opcodes.RETURN) mn.instructions.remove(ain);
|
||||
if (ain.getOpcode() == Opcodes.INVOKESPECIAL) objectInsn = mn.instructions.get(i);
|
||||
}
|
||||
// Build the initializer InsnLists and then insert them in reverse order, such that the dustRender comes last
|
||||
// because we are adding the return opcode back in as part of that one's InsnList
|
||||
InsnList ingotRender = injectPileRenderInitializer(mn, "Ingot");
|
||||
InsnList gemRender = injectPileRenderInitializer(mn, "Gem");
|
||||
InsnList dustRender = injectPileRenderInitializer(mn, "Dust");
|
||||
dustRender.add(new InsnNode(Opcodes.RETURN));
|
||||
mn.instructions.insert(objectInsn, dustRender);
|
||||
mn.instructions.insert(objectInsn, gemRender);
|
||||
mn.instructions.insert(objectInsn, ingotRender);
|
||||
}
|
||||
// Just catching the MethodNode for <clinit> so we can remove it later after we're done iterating
|
||||
if (mn.name.equals("<clinit>")) {
|
||||
clinit = mn;
|
||||
}
|
||||
if (mn.name.equals("renderWorldBlock")) {
|
||||
for (int i = 0; i < mn.instructions.size(); i++) {
|
||||
AbstractInsnNode in = mn.instructions.get(i);
|
||||
// This part removes the GETSTATIC for the field level PileRender objects which used to be static, and replaces them with
|
||||
// a non-static GETFIELD
|
||||
if (in instanceof FieldInsnNode fin) {
|
||||
if (fin.getOpcode() == Opcodes.GETSTATIC && staticRemovers.contains(fin.name)) {
|
||||
FieldInsnNode nonStatic = new FieldInsnNode(Opcodes.GETFIELD, "com/tierzero/stacksonstacks/client/render/RenderTilePile", fin.name, "Lcom/tierzero/stacksonstacks/client/render/PileRender;");
|
||||
mn.instructions.insertBefore(fin, new VarInsnNode(Opcodes.ALOAD, 0));
|
||||
mn.instructions.insertBefore(fin, nonStatic);
|
||||
mn.instructions.remove(fin);
|
||||
}
|
||||
}
|
||||
// Adds a null guard for the IBlockAccess.getTileEntity call
|
||||
if (in instanceof VarInsnNode vin) {
|
||||
if (vin.getOpcode() == Opcodes.ASTORE && vin.var == 8) {
|
||||
InsnList list = new InsnList();
|
||||
LabelNode exit = new LabelNode();
|
||||
list.add(new VarInsnNode(Opcodes.ALOAD, 8));
|
||||
list.add(new JumpInsnNode(Opcodes.IFNONNULL, exit));
|
||||
list.add(new InsnNode(Opcodes.ICONST_0));
|
||||
list.add(new InsnNode(Opcodes.IRETURN));
|
||||
list.add(exit);
|
||||
mn.instructions.insert(vin, list);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
// Remove clinit after iterating. Nothing else happens in here besides the field initialization, so no reason to drill down
|
||||
// into the instructions
|
||||
if (clinit != null) cn.methods.remove(clinit);
|
||||
|
||||
// Remove the static access bits from the desired field names
|
||||
for (FieldNode fn : cn.fields) {
|
||||
if (staticRemovers.contains(fn.name)) {
|
||||
fn.access = fn.access & (~Opcodes.ACC_STATIC);
|
||||
}
|
||||
}
|
||||
|
||||
// Add a ThreadSafeISBRH annotation
|
||||
AnnotationNode isbrhAnnotation = new AnnotationNode("Lcom/gtnewhorizons/angelica/api/ThreadSafeISBRH;");
|
||||
isbrhAnnotation.values = ImmutableList.of("perThread", true);
|
||||
if (cn.visibleAnnotations == null) {
|
||||
cn.visibleAnnotations = new ArrayList<>();
|
||||
}
|
||||
cn.visibleAnnotations.add(isbrhAnnotation);
|
||||
}
|
||||
|
||||
private void transformClientUtils(ClassNode cn) {
|
||||
// Various things throughout the ISBRH call these functions which in turn call GL11.glPush/PopMatrix
|
||||
// Upon checking, these aren't called anywhere but in the ISBRH, and they're entirely unnecessary in there.
|
||||
// This just makes the methods no-op, since they aren't required by any other part of the mod to be working.
|
||||
for (MethodNode mn : cn.methods) {
|
||||
if (mn.name.equals("pushMatrix")) {
|
||||
for (int i = 0; i < mn.instructions.size(); i++) {
|
||||
AbstractInsnNode in = mn.instructions.get(i);
|
||||
if (in.getOpcode() == Opcodes.INVOKESTATIC) {
|
||||
mn.instructions.remove(in);
|
||||
}
|
||||
}
|
||||
} else if (mn.name.equals("popMatrix")) {
|
||||
for (int i = 0; i < mn.instructions.size(); i++) {
|
||||
AbstractInsnNode in = mn.instructions.get(i);
|
||||
if (in.getOpcode() == Opcodes.INVOKESTATIC) {
|
||||
mn.instructions.remove(in);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -51,7 +51,13 @@ public enum Settings {
|
||||
DYNAMIC_LIGHTS(new NotFineOptionCycling(DynamicLightsMode.FANCY, OptionImpact.VARIES)){
|
||||
@Override
|
||||
public void applyChanges() {
|
||||
DynamicLights.Mode = (DynamicLightsMode) DYNAMIC_LIGHTS.option.getStore();
|
||||
DynamicLights.Mode = (DynamicLightsMode) this.option.getStore();
|
||||
}
|
||||
},
|
||||
DYNAMIC_LIGHTS_SHADER_FORCE(new NotFineOptionTickBox(false, OptionImpact.VARIES)){
|
||||
@Override
|
||||
public void applyChanges() {
|
||||
DynamicLights.ShaderForce = (boolean) this.option.getStore();
|
||||
}
|
||||
},
|
||||
FOG_NEAR_DISTANCE(new NotFineOptionSliderPercentage(75, 1, 100, 1, OptionImpact.LOW)),
|
||||
|
||||
@@ -191,6 +191,7 @@ public class NotFineGameOptionPages {
|
||||
.add(Settings.DOWNFALL_DISTANCE.option)
|
||||
.add(Settings.MODE_VIGNETTE.option)
|
||||
.add(Settings.DYNAMIC_LIGHTS.option, AngelicaConfig.enableDynamicLights)
|
||||
.add(Settings.DYNAMIC_LIGHTS_SHADER_FORCE.option, AngelicaConfig.enableDynamicLights)
|
||||
.add(Settings.MODE_SHADOWS.option)
|
||||
.add(Settings.VOID_FOG.option)
|
||||
.add(Settings.MODE_DROPPED_ITEMS.option)
|
||||
|
||||
@@ -243,6 +243,7 @@ public class SodiumGameOptionPages {
|
||||
.add(Settings.MODE_SHADOWS.option)
|
||||
.add(Settings.MODE_VIGNETTE.option)
|
||||
.add(Settings.DYNAMIC_LIGHTS.option, AngelicaConfig.enableDynamicLights)
|
||||
.add(Settings.DYNAMIC_LIGHTS_SHADER_FORCE.option, AngelicaConfig.enableDynamicLights)
|
||||
.build());
|
||||
|
||||
|
||||
|
||||
+19
-3
@@ -3,6 +3,7 @@ package me.jellysquid.mods.sodium.client.render.chunk.tasks;
|
||||
import com.gtnewhorizon.gtnhlib.blockpos.BlockPos;
|
||||
import com.gtnewhorizon.gtnhlib.client.renderer.util.WorldUtil;
|
||||
import com.gtnewhorizons.angelica.compat.mojang.ChunkOcclusionDataBuilder;
|
||||
import com.gtnewhorizons.angelica.compat.toremove.RenderLayer;
|
||||
import com.gtnewhorizons.angelica.config.AngelicaConfig;
|
||||
import com.gtnewhorizons.angelica.mixins.interfaces.ITexturesCache;
|
||||
import com.gtnewhorizons.angelica.rendering.AngelicaBlockSafetyRegistry;
|
||||
@@ -23,6 +24,7 @@ import me.jellysquid.mods.sodium.client.util.MathUtil;
|
||||
import me.jellysquid.mods.sodium.client.util.task.CancellationSource;
|
||||
import me.jellysquid.mods.sodium.client.world.WorldSlice;
|
||||
import me.jellysquid.mods.sodium.client.world.cloned.ChunkRenderContext;
|
||||
import net.coderbot.iris.block_rendering.BlockRenderingSettings;
|
||||
import net.coderbot.iris.vertices.ExtendedDataHelper;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.block.material.Material;
|
||||
@@ -35,6 +37,7 @@ import net.minecraft.util.AxisAlignedBB;
|
||||
import net.minecraft.util.IIcon;
|
||||
import org.joml.Vector3d;
|
||||
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
import java.util.concurrent.ExecutionException;
|
||||
|
||||
@@ -104,6 +107,19 @@ public class ChunkRenderRebuildTask<T extends ChunkGraphicsState> extends ChunkR
|
||||
}
|
||||
}
|
||||
|
||||
private boolean canRenderInPass(Block block, BlockRenderPass pass) {
|
||||
boolean canRender = block.canRenderInPass(pass.ordinal());
|
||||
Map<Block, RenderLayer> blockTypeIds = BlockRenderingSettings.INSTANCE.getBlockTypeIds();
|
||||
RenderLayer renderLayer;
|
||||
if (blockTypeIds != null && (renderLayer = blockTypeIds.get(block)) != null) {
|
||||
canRender = switch (pass) {
|
||||
case CUTOUT_MIPPED -> renderLayer == RenderLayer.cutout();
|
||||
case TRANSLUCENT -> renderLayer == RenderLayer.translucent();
|
||||
};
|
||||
}
|
||||
return canRender;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ChunkBuildResult<T> performBuild(ChunkRenderCacheLocal cache, ChunkBuildBuffers buffers, CancellationSource cancellationSource) {
|
||||
final ChunkRenderData.Builder renderData = new ChunkRenderData.Builder();
|
||||
@@ -153,7 +169,7 @@ public class ChunkRenderRebuildTask<T extends ChunkGraphicsState> extends ChunkR
|
||||
if (rendersOffThread(block)) {
|
||||
// Do regular block rendering
|
||||
for (BlockRenderPass pass : BlockRenderPass.VALUES) {
|
||||
if (block.canRenderInPass(pass.ordinal()) && !shouldUseSodiumFluidRendering(block)) {
|
||||
if (canRenderInPass(block, pass) && !shouldUseSodiumFluidRendering(block)) {
|
||||
ChunkRenderManager.setWorldRenderPass(pass);
|
||||
final long seed = MathUtil.hashPos(pos.x, pos.y, pos.z);
|
||||
if(AngelicaConfig.enableIris) buffers.iris$setMaterialId(block, ExtendedDataHelper.BLOCK_RENDER_TYPE);
|
||||
@@ -171,7 +187,7 @@ public class ChunkRenderRebuildTask<T extends ChunkGraphicsState> extends ChunkR
|
||||
// Do fluid rendering without RenderBlocks
|
||||
if (shouldUseSodiumFluidRendering(block)) {
|
||||
for (BlockRenderPass pass : BlockRenderPass.VALUES) {
|
||||
if (block.canRenderInPass(pass.ordinal())) {
|
||||
if (canRenderInPass(block, pass)) {
|
||||
ChunkRenderManager.setWorldRenderPass(pass);
|
||||
if(AngelicaConfig.enableIris) buffers.iris$setMaterialId(block, ExtendedDataHelper.FLUID_RENDER_TYPE);
|
||||
|
||||
@@ -273,7 +289,7 @@ public class ChunkRenderRebuildTask<T extends ChunkGraphicsState> extends ChunkR
|
||||
|
||||
// Do regular block rendering
|
||||
for (BlockRenderPass pass : BlockRenderPass.VALUES) {
|
||||
if (block.canRenderInPass(pass.ordinal()) && !shouldUseSodiumFluidRendering(block)) {
|
||||
if (canRenderInPass(block, pass) && !shouldUseSodiumFluidRendering(block)) {
|
||||
ChunkRenderManager.setWorldRenderPass(pass);
|
||||
final long seed = MathUtil.hashPos(pos.x, pos.y, pos.z);
|
||||
if(AngelicaConfig.enableIris) buffers.iris$setMaterialId(block, ExtendedDataHelper.BLOCK_RENDER_TYPE);
|
||||
|
||||
@@ -1,7 +1,15 @@
|
||||
package net.coderbot.iris.gl.program;
|
||||
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.gtnewhorizons.angelica.config.AngelicaConfig;
|
||||
import com.gtnewhorizons.angelica.glsm.RenderSystem;
|
||||
import java.nio.IntBuffer;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
import java.util.OptionalInt;
|
||||
import net.coderbot.iris.Iris;
|
||||
import net.coderbot.iris.gl.state.ValueUpdateNotifier;
|
||||
import net.coderbot.iris.gl.uniform.DynamicLocationalUniformHolder;
|
||||
@@ -11,20 +19,13 @@ import net.coderbot.iris.gl.uniform.UniformType;
|
||||
import net.coderbot.iris.gl.uniform.UniformUpdateFrequency;
|
||||
import net.coderbot.iris.uniforms.SystemTimeUniforms;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.multiplayer.WorldClient;
|
||||
import org.lwjgl.BufferUtils;
|
||||
import org.lwjgl.opengl.ARBShaderImageLoadStore;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.lwjgl.opengl.GL20;
|
||||
import org.lwjgl.opengl.GL30;
|
||||
|
||||
import java.nio.IntBuffer;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
import java.util.OptionalInt;
|
||||
|
||||
public class ProgramUniforms {
|
||||
private static ProgramUniforms active;
|
||||
private final ImmutableList<Uniform> perTick;
|
||||
@@ -52,8 +53,11 @@ public class ProgramUniforms {
|
||||
}
|
||||
|
||||
private static long getCurrentTick() {
|
||||
if (Minecraft.getMinecraft().theWorld != null) {
|
||||
return Minecraft.getMinecraft().theWorld.getWorldTime();
|
||||
final WorldClient world = Minecraft.getMinecraft().theWorld;
|
||||
if (world != null) {
|
||||
return AngelicaConfig.useTotalWorldTime
|
||||
? world.getWorldTime()
|
||||
: world.getTotalWorldTime();
|
||||
} else {
|
||||
return 0L;
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
package net.coderbot.iris.gl.shader;
|
||||
|
||||
import com.google.common.collect.ImmutableList;
|
||||
import com.gtnewhorizons.angelica.Tags;
|
||||
import cpw.mods.fml.common.Loader;
|
||||
import net.coderbot.iris.pipeline.HandRenderer;
|
||||
import net.coderbot.iris.pipeline.WorldRenderingPhase;
|
||||
@@ -52,6 +53,8 @@ public class StandardMacros {
|
||||
define(standardDefines, "MC_SPECULAR_MAP");
|
||||
define(standardDefines, "MC_RENDER_QUALITY", "1.0");
|
||||
define(standardDefines, "MC_SHADOW_QUALITY", "1.0");
|
||||
define(standardDefines, "IS_ANGELICA");
|
||||
define(standardDefines, "ANGELICA_VERSION", Tags.VERSION);
|
||||
define(standardDefines, "MC_HAND_DEPTH", Float.toString(HandRenderer.DEPTH));
|
||||
|
||||
TextureFormat textureFormat = TextureFormatLoader.getFormat();
|
||||
|
||||
@@ -108,8 +108,11 @@ public abstract class IrisGuiSlot extends GuiSlot {
|
||||
if (scrolling) {
|
||||
this.amountScrolled += ((float) mouseY - this.initialClickY);
|
||||
this.initialClickY = mouseY;
|
||||
} else {
|
||||
for (; !this.mc.gameSettings.touchscreen && Mouse.next(); this.mc.currentScreen.handleMouseInput()) {
|
||||
} else if (this.mc.currentScreen != null ){
|
||||
while (!this.mc.gameSettings.touchscreen && Mouse.next()) {
|
||||
if(this.mc.currentScreen != null) {
|
||||
this.mc.currentScreen.handleMouseInput();
|
||||
}
|
||||
int dWheel = Mouse.getEventDWheel();
|
||||
|
||||
if (dWheel != 0) {
|
||||
|
||||
@@ -111,6 +111,12 @@ public class ShaderPackScreen extends GuiScreen implements HudHideable {
|
||||
}
|
||||
}
|
||||
|
||||
if (hoveredElement != null) {
|
||||
hoveredElementCommentTimer++;
|
||||
} else {
|
||||
hoveredElementCommentTimer = 0;
|
||||
}
|
||||
|
||||
final float previousHoverTimer = this.guiButtonHoverTimer;
|
||||
super.drawScreen(mouseX, mouseY, delta);
|
||||
if (previousHoverTimer == this.guiButtonHoverTimer) {
|
||||
@@ -374,6 +380,8 @@ public class ShaderPackScreen extends GuiScreen implements HudHideable {
|
||||
public void applyChanges() {
|
||||
final ShaderPackEntry entry = this.shaderPackList.getSelected();
|
||||
|
||||
if (entry == null) return;
|
||||
|
||||
this.shaderPackList.setApplied(entry);
|
||||
|
||||
final String name = entry.getPackName();
|
||||
|
||||
@@ -2,157 +2,181 @@ package net.coderbot.iris.pipeline;
|
||||
|
||||
import com.gtnewhorizons.angelica.compat.mojang.Camera;
|
||||
import com.gtnewhorizons.angelica.compat.mojang.InteractionHand;
|
||||
import com.gtnewhorizons.angelica.compat.toremove.MatrixStack;
|
||||
import com.gtnewhorizons.angelica.compat.toremove.RenderLayer;
|
||||
import com.gtnewhorizons.angelica.rendering.RenderingState;
|
||||
import net.coderbot.iris.block_rendering.BlockRenderingSettings;
|
||||
import net.irisshaders.iris.api.v0.IrisApi;
|
||||
import net.minecraft.block.Block;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.RenderGlobal;
|
||||
import net.minecraft.entity.EntityLiving;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.Item;
|
||||
import net.minecraft.item.ItemBlock;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.lwjgl.util.glu.Project;
|
||||
|
||||
import org.joml.Matrix4f;
|
||||
import java.util.Map;
|
||||
|
||||
public class HandRenderer {
|
||||
public static final HandRenderer INSTANCE = new HandRenderer();
|
||||
public static final HandRenderer INSTANCE = new HandRenderer();
|
||||
|
||||
private boolean ACTIVE;
|
||||
private boolean renderingSolid;
|
||||
public static final float DEPTH = 0.125F;
|
||||
private boolean ACTIVE;
|
||||
private boolean renderingSolid;
|
||||
public static final float DEPTH = 0.125F;
|
||||
|
||||
private void setupGlState(RenderGlobal gameRenderer, Camera camera, MatrixStack poseStack, float tickDelta) {
|
||||
// final MatrixStack.Entry pose = poseStack.peek();
|
||||
private void setupGlState(RenderGlobal gameRenderer, Camera camera, float tickDelta) {
|
||||
Minecraft mc = Minecraft.getMinecraft();
|
||||
|
||||
// We need to scale the matrix by 0.125 so the hand doesn't clip through blocks.
|
||||
// Matrix4f scaleMatrix = new Matrix4f().scale(1F, 1F, DEPTH);
|
||||
// TODO: ProjectionMatrix
|
||||
// scaleMatrix.multiply(gameRenderer.getProjectionMatrix(camera, tickDelta, false));
|
||||
// scaleMatrix.mul(projectionMatrix);
|
||||
// RenderSystem.matrixMode(5889);
|
||||
// RenderSystem.loadIdentity();
|
||||
// RenderSystem.multMatrix(arg);
|
||||
// RenderSystem.matrixMode(5888);
|
||||
GL11.glMatrixMode(GL11.GL_PROJECTION);
|
||||
GL11.glLoadIdentity();
|
||||
// We need to scale the matrix by 0.125 so the hand doesn't clip through blocks.
|
||||
GL11.glScalef(1.0F, 1.0F, DEPTH);
|
||||
|
||||
// pose.getModel().identity();
|
||||
// pose.getNormal().identity();
|
||||
// TODO: Anaglyph
|
||||
/*if (this.mc.gameSettings.anaglyph) {
|
||||
GL11.glTranslatef((float) (-(anaglyphChannel * 2 - 1)) * 0.07F, 0.0F, 0.0F);
|
||||
}*/
|
||||
|
||||
// gameRenderer.invokeBobHurt(poseStack, tickDelta);
|
||||
//
|
||||
// if (Minecraft.getMinecraft().gameSettings.viewBobbing) {
|
||||
//// gameRenderer.invokeBobView(poseStack, tickDelta);
|
||||
// }
|
||||
}
|
||||
if (mc.entityRenderer.cameraZoom != 1.0D) {
|
||||
GL11.glTranslatef((float) mc.entityRenderer.cameraYaw, (float) (-mc.entityRenderer.cameraPitch), 0.0F);
|
||||
GL11.glScaled(mc.entityRenderer.cameraZoom, mc.entityRenderer.cameraZoom, 1.0D);
|
||||
}
|
||||
|
||||
private boolean canRender(Camera camera, RenderGlobal gameRenderer) {
|
||||
return (camera.isThirdPerson() || !(camera.getEntity() instanceof EntityPlayer) || Minecraft.getMinecraft().gameSettings.hideGUI || (camera.getEntity() instanceof EntityLiving && ((EntityLiving)camera.getEntity()).isPlayerSleeping()));
|
||||
Project.gluPerspective(mc.entityRenderer.getFOVModifier(tickDelta, false), (float) mc.displayWidth / (float) mc.displayHeight, 0.05F, mc.entityRenderer.farPlaneDistance * 2.0F);
|
||||
|
||||
// return !(!gameRenderer.getRenderHand()
|
||||
// || camera.isThirdPerson()
|
||||
// || !(camera.getEntity() instanceof EntityPlayer)
|
||||
// || gameRenderer.getPanoramicMode()
|
||||
// || Minecraft.getMinecraft().gameSettings.hideGUI
|
||||
// || (camera.getEntity() instanceof EntityLiving && ((EntityLiving)camera.getEntity()).isPlayerSleeping())
|
||||
// // TODO: SPECTATOR
|
||||
// /*|| Minecraft.getMinecraft().gameMode.getPlayerMode() == GameType.SPECTATOR*/);
|
||||
}
|
||||
|
||||
public boolean isHandTranslucent(InteractionHand hand) {
|
||||
if (mc.playerController.enableEverythingIsScrewedUpMode()) {
|
||||
GL11.glScalef(1.0F, 2 / 3f, 1.0F);
|
||||
}
|
||||
|
||||
GL11.glMatrixMode(GL11.GL_MODELVIEW);
|
||||
GL11.glLoadIdentity();
|
||||
|
||||
// TODO: Anaglyph
|
||||
/*if (mc.gameSettings.anaglyph) {
|
||||
GL11.glTranslatef((float) (anaglyphChannel * 2 - 1) * 0.1F, 0.0F, 0.0F);
|
||||
}*/
|
||||
|
||||
mc.entityRenderer.hurtCameraEffect(tickDelta);
|
||||
|
||||
if (mc.gameSettings.viewBobbing) {
|
||||
mc.entityRenderer.setupViewBobbing(tickDelta);
|
||||
}
|
||||
}
|
||||
|
||||
private boolean canRender(Camera camera, RenderGlobal gameRenderer) {
|
||||
Minecraft mc = Minecraft.getMinecraft();
|
||||
|
||||
return mc.entityRenderer.debugViewDirection <= 0 &&
|
||||
mc.gameSettings.thirdPersonView == 0 &&
|
||||
!camera.getEntity().isPlayerSleeping() &&
|
||||
!mc.gameSettings.hideGUI &&
|
||||
// TODO: SPECTATOR
|
||||
// mc.playerController.currentGameType
|
||||
!mc.playerController.enableEverythingIsScrewedUpMode();
|
||||
}
|
||||
|
||||
public boolean isHandTranslucent(InteractionHand hand) {
|
||||
// TODO: Offhand
|
||||
// Item item = Minecraft.getMinecraft().thePlayer.getItemBySlot(hand == InteractionHand.OFF_HAND ? EquipmentSlot.OFFHAND : EquipmentSlot.MAINHAND).getItem();
|
||||
ItemStack heldItem = Minecraft.getMinecraft().thePlayer.getHeldItem();
|
||||
if (heldItem == null) {
|
||||
return false;
|
||||
}
|
||||
Item item = heldItem.getItem();
|
||||
|
||||
if (item instanceof ItemBlock itemBlock) {
|
||||
// TODO: RenderType
|
||||
// return ItemBlockRenderTypes.getChunkRenderType(itemBlock.getBlock().defaultBlockState()) == RenderType.translucent();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
Item item = heldItem.getItem();
|
||||
|
||||
return false;
|
||||
}
|
||||
if (item instanceof ItemBlock itemBlock) {
|
||||
Map<Block, RenderLayer> blockTypeIds = BlockRenderingSettings.INSTANCE.getBlockTypeIds();
|
||||
return blockTypeIds != null && blockTypeIds.get(itemBlock.field_150939_a) == RenderLayer.translucent();
|
||||
}
|
||||
|
||||
public boolean isAnyHandTranslucent() {
|
||||
return isHandTranslucent(InteractionHand.MAIN_HAND) || isHandTranslucent(InteractionHand.OFF_HAND);
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public void renderSolid(MatrixStack poseStack, float tickDelta, Camera camera, RenderGlobal gameRenderer, WorldRenderingPipeline pipeline) {
|
||||
if (!canRender(camera, gameRenderer) || !IrisApi.getInstance().isShaderPackInUse()) {
|
||||
return;
|
||||
}
|
||||
public boolean isAnyHandTranslucent() {
|
||||
return isHandTranslucent(InteractionHand.MAIN_HAND) || isHandTranslucent(InteractionHand.OFF_HAND);
|
||||
}
|
||||
|
||||
ACTIVE = true;
|
||||
public void renderSolid(float tickDelta, Camera camera, RenderGlobal gameRenderer, WorldRenderingPipeline pipeline) {
|
||||
if (!canRender(camera, gameRenderer) || !IrisApi.getInstance().isShaderPackInUse()) {
|
||||
return;
|
||||
}
|
||||
Minecraft mc = Minecraft.getMinecraft();
|
||||
|
||||
pipeline.setPhase(WorldRenderingPhase.HAND_SOLID);
|
||||
ACTIVE = true;
|
||||
|
||||
// poseStack.push();
|
||||
pipeline.setPhase(WorldRenderingPhase.HAND_SOLID);
|
||||
|
||||
Minecraft.getMinecraft().mcProfiler.startSection("iris_hand");
|
||||
GL11.glPushMatrix();
|
||||
GL11.glDepthMask(true); // actually write to the depth buffer, it's normally disabled at this point
|
||||
|
||||
// TODO: Iris
|
||||
// setupGlState(gameRenderer, camera, poseStack, tickDelta);
|
||||
mc.mcProfiler.startSection("iris_hand");
|
||||
|
||||
renderingSolid = true;
|
||||
// TODO: Hand
|
||||
// Minecraft.getMinecraft().getItemInHandRenderer().renderHandsWithItems(tickDelta, poseStack, bufferSource, Minecraft.getMinecraft().thePlayer, Minecraft.getMinecraft().getEntityRenderDispatcher().getPackedLightCoords(camera.getEntity(), tickDelta));
|
||||
setupGlState(gameRenderer, camera, tickDelta);
|
||||
|
||||
Minecraft.getMinecraft().mcProfiler.endSection();
|
||||
renderingSolid = true;
|
||||
mc.entityRenderer.enableLightmap(tickDelta);
|
||||
mc.entityRenderer.itemRenderer.renderItemInFirstPerson(tickDelta);
|
||||
mc.entityRenderer.disableLightmap(tickDelta);
|
||||
|
||||
// TODO: ProjectionMatrix
|
||||
// gameRenderer.resetProjectionMatrix(CapturedRenderingState.INSTANCE.getGbufferProjection());
|
||||
GL11.glDepthMask(false);
|
||||
GL11.glPopMatrix();
|
||||
|
||||
// poseStack.pop();
|
||||
mc.mcProfiler.endSection();
|
||||
|
||||
// bufferSource.endBatch();
|
||||
resetProjectionMatrix();
|
||||
|
||||
renderingSolid = false;
|
||||
renderingSolid = false;
|
||||
|
||||
pipeline.setPhase(WorldRenderingPhase.NONE);
|
||||
pipeline.setPhase(WorldRenderingPhase.NONE);
|
||||
|
||||
ACTIVE = false;
|
||||
}
|
||||
ACTIVE = false;
|
||||
}
|
||||
|
||||
public void renderTranslucent(MatrixStack poseStack, float tickDelta, Camera camera, RenderGlobal gameRenderer, WorldRenderingPipeline pipeline) {
|
||||
if (!canRender(camera, gameRenderer) || !isAnyHandTranslucent() || !IrisApi.getInstance().isShaderPackInUse()) {
|
||||
return;
|
||||
}
|
||||
// TODO: RenderType
|
||||
public void renderTranslucent(float tickDelta, Camera camera, RenderGlobal gameRenderer, WorldRenderingPipeline pipeline) {
|
||||
if (!canRender(camera, gameRenderer) || !isAnyHandTranslucent() || !IrisApi.getInstance().isShaderPackInUse()) {
|
||||
return;
|
||||
}
|
||||
Minecraft mc = Minecraft.getMinecraft();
|
||||
|
||||
ACTIVE = true;
|
||||
ACTIVE = true;
|
||||
|
||||
pipeline.setPhase(WorldRenderingPhase.HAND_TRANSLUCENT);
|
||||
pipeline.setPhase(WorldRenderingPhase.HAND_TRANSLUCENT);
|
||||
|
||||
poseStack.push();
|
||||
GL11.glPushMatrix();
|
||||
|
||||
Minecraft.getMinecraft().mcProfiler.startSection("iris_hand_translucent");
|
||||
mc.mcProfiler.startSection("iris_hand_translucent");
|
||||
|
||||
setupGlState(gameRenderer, camera, poseStack, tickDelta);
|
||||
setupGlState(gameRenderer, camera, tickDelta);
|
||||
|
||||
// TODO: Hand
|
||||
// Minecraft.getMinecraft().getItemInHandRenderer().renderHandsWithItems(tickDelta, poseStack, bufferSource, Minecraft.getMinecraft().thePlayer, Minecraft.getMinecraft().getEntityRenderDispatcher().getPackedLightCoords(camera.getEntity(), tickDelta));
|
||||
mc.entityRenderer.enableLightmap(tickDelta);
|
||||
mc.entityRenderer.itemRenderer.renderItemInFirstPerson(tickDelta);
|
||||
mc.entityRenderer.disableLightmap(tickDelta);
|
||||
|
||||
poseStack.pop();
|
||||
GL11.glPopMatrix();
|
||||
|
||||
Minecraft.getMinecraft().mcProfiler.endSection();
|
||||
resetProjectionMatrix();
|
||||
|
||||
// TODO: ProjectionMatrix
|
||||
// gameRenderer.resetProjectionMatrix(CapturedRenderingState.INSTANCE.getGbufferProjection());
|
||||
Minecraft.getMinecraft().mcProfiler.endSection();
|
||||
|
||||
// bufferSource.endBatch();
|
||||
pipeline.setPhase(WorldRenderingPhase.NONE);
|
||||
|
||||
pipeline.setPhase(WorldRenderingPhase.NONE);
|
||||
ACTIVE = false;
|
||||
}
|
||||
|
||||
ACTIVE = false;
|
||||
}
|
||||
private void resetProjectionMatrix() {
|
||||
GL11.glMatrixMode(GL11.GL_PROJECTION);
|
||||
GL11.glLoadIdentity();
|
||||
GL11.glMultMatrix(RenderingState.INSTANCE.getProjectionBuffer());
|
||||
GL11.glMatrixMode(GL11.GL_MODELVIEW);
|
||||
}
|
||||
|
||||
public boolean isActive() {
|
||||
return ACTIVE;
|
||||
}
|
||||
|
||||
public boolean isRenderingSolid() {
|
||||
return renderingSolid;
|
||||
}
|
||||
public boolean isActive() {
|
||||
return ACTIVE;
|
||||
}
|
||||
|
||||
public boolean isRenderingSolid() {
|
||||
return renderingSolid;
|
||||
}
|
||||
}
|
||||
@@ -5,8 +5,12 @@ import com.gtnewhorizons.angelica.compat.mojang.Camera;
|
||||
import com.gtnewhorizons.angelica.compat.toremove.MatrixStack;
|
||||
import com.gtnewhorizons.angelica.glsm.GLStateManager;
|
||||
import com.gtnewhorizons.angelica.glsm.RenderSystem;
|
||||
import com.gtnewhorizons.angelica.mixins.interfaces.IRenderGlobalExt;
|
||||
import com.gtnewhorizons.angelica.rendering.RenderingState;
|
||||
import cpw.mods.fml.relauncher.ReflectionHelper;
|
||||
import me.jellysquid.mods.sodium.client.gl.device.RenderDevice;
|
||||
import me.jellysquid.mods.sodium.client.render.SodiumWorldRenderer;
|
||||
import me.jellysquid.mods.sodium.client.render.chunk.passes.BlockRenderPass;
|
||||
import net.coderbot.iris.Iris;
|
||||
import net.coderbot.iris.shaderpack.OptionalBoolean;
|
||||
import net.coderbot.iris.shaderpack.PackDirectives;
|
||||
@@ -27,9 +31,12 @@ import net.coderbot.iris.uniforms.CelestialUniforms;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.multiplayer.WorldClient;
|
||||
import net.minecraft.client.renderer.EntityRenderer;
|
||||
import net.minecraft.client.renderer.OpenGlHelper;
|
||||
import net.minecraft.client.renderer.RenderGlobal;
|
||||
import net.minecraft.client.renderer.RenderHelper;
|
||||
import net.minecraft.client.renderer.culling.Frustrum;
|
||||
import net.minecraft.client.renderer.entity.RenderManager;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
|
||||
import net.minecraft.entity.Entity;
|
||||
import net.minecraft.profiler.Profiler;
|
||||
@@ -349,17 +356,13 @@ public class ShadowRenderer {
|
||||
}
|
||||
|
||||
private void renderEntities(EntityRenderer levelRenderer, Frustrum frustum, Object bufferSource, MatrixStack modelView, double cameraX, double cameraY, double cameraZ, float tickDelta) {
|
||||
// TODO: Render
|
||||
// EntityRenderDispatcher dispatcher = levelRenderer.getEntityRenderDispatcher();
|
||||
|
||||
int shadowEntities = 0;
|
||||
int shadowEntities = 0;
|
||||
|
||||
profiler.startSection("cull");
|
||||
|
||||
List<Entity> renderedEntities = new ArrayList<>(32);
|
||||
|
||||
// TODO: I'm sure that this can be improved / optimized.
|
||||
// TODO: Render
|
||||
// TODO: Entity culling
|
||||
for (Entity entity : getLevel().loadedEntityList) {
|
||||
if (false/*!dispatcher.shouldRender(entity, frustum, cameraX, cameraY, cameraZ) || entity.isSpectator()*/) {
|
||||
@@ -383,7 +386,7 @@ public class ShadowRenderer {
|
||||
modelView.peek().getModel().get(MODELVIEW_BUFFER);
|
||||
GL11.glLoadMatrix(MODELVIEW_BUFFER);
|
||||
for (Entity entity : renderedEntities) {
|
||||
RenderManager.instance.renderEntitySimple(entity, tickDelta);//(entity, cameraX, cameraY, cameraZ, tickDelta, modelView, bufferSource);
|
||||
RenderManager.instance.renderEntitySimple(entity, tickDelta);
|
||||
shadowEntities++;
|
||||
}
|
||||
GL11.glPopMatrix();
|
||||
@@ -394,13 +397,11 @@ public class ShadowRenderer {
|
||||
}
|
||||
|
||||
private void renderPlayerEntity(EntityRenderer levelRenderer, Frustrum frustum, Object bufferSource, MatrixStack modelView, double cameraX, double cameraY, double cameraZ, float tickDelta) {
|
||||
// TODO: Render
|
||||
// EntityRenderDispatcher dispatcher = levelRenderer.getEntityRenderDispatcher();
|
||||
|
||||
profiler.startSection("cull");
|
||||
|
||||
Entity player = Minecraft.getMinecraft().thePlayer;
|
||||
|
||||
// TODO: Entity culling
|
||||
// if (!dispatcher.shouldRender(player, frustum, cameraX, cameraY, cameraZ) || player.isSpectator()) {
|
||||
// return;
|
||||
// }
|
||||
@@ -409,19 +410,24 @@ public class ShadowRenderer {
|
||||
|
||||
int shadowEntities = 0;
|
||||
|
||||
// if (!player.getPassengers().isEmpty()) {
|
||||
// for (int i = 0; i < player.getPassengers().size(); i++) {
|
||||
// levelRenderer.invokeRenderEntity(player.getPassengers().get(i), cameraX, cameraY, cameraZ, tickDelta, modelView, bufferSource);
|
||||
// shadowEntities++;
|
||||
// }
|
||||
// }
|
||||
//
|
||||
// if (player.getVehicle() != null) {
|
||||
// levelRenderer.invokeRenderEntity(player.getVehicle(), cameraX, cameraY, cameraZ, tickDelta, modelView, bufferSource);
|
||||
// shadowEntities++;
|
||||
// }
|
||||
//
|
||||
// levelRenderer.invokeRenderEntity(player, cameraX, cameraY, cameraZ, tickDelta, modelView, bufferSource);
|
||||
GL11.glPushMatrix();
|
||||
MODELVIEW_BUFFER.clear().rewind();
|
||||
modelView.peek().getModel().get(MODELVIEW_BUFFER);
|
||||
GL11.glLoadMatrix(MODELVIEW_BUFFER);
|
||||
|
||||
if (player.riddenByEntity != null) {
|
||||
RenderManager.instance.renderEntitySimple(player.riddenByEntity, tickDelta);
|
||||
shadowEntities++;
|
||||
}
|
||||
|
||||
if (player.ridingEntity != null) {
|
||||
RenderManager.instance.renderEntitySimple(player.ridingEntity, tickDelta);
|
||||
shadowEntities++;
|
||||
}
|
||||
|
||||
RenderManager.instance.renderEntitySimple(player, tickDelta);
|
||||
|
||||
GL11.glPopMatrix();
|
||||
|
||||
shadowEntities++;
|
||||
|
||||
@@ -430,6 +436,21 @@ public class ShadowRenderer {
|
||||
profiler.endSection();
|
||||
}
|
||||
|
||||
private void renderTileEntity(TileEntity tile, double cameraX, double cameraY, double cameraZ, float partialTicks) {
|
||||
if (tile.getDistanceFrom(cameraX, cameraY, cameraZ) >= tile.getMaxRenderDistanceSquared()) {
|
||||
return;
|
||||
}
|
||||
int brightness = tile.getWorldObj().getLightBrightnessForSkyBlocks(tile.xCoord, tile.yCoord, tile.zCoord, 0);
|
||||
OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, (float) brightness % 65536, (float) brightness / 65536);
|
||||
GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
|
||||
TileEntityRendererDispatcher.instance.renderTileEntityAt(tile,
|
||||
(double)tile.xCoord - cameraX,
|
||||
(double)tile.yCoord - cameraY,
|
||||
(double)tile.zCoord - cameraZ,
|
||||
partialTicks
|
||||
);
|
||||
}
|
||||
|
||||
private void renderTileEntities(Object bufferSource, MatrixStack modelView, double cameraX, double cameraY, double cameraZ, float partialTicks, boolean hasEntityFrustum) {
|
||||
profiler.startSection("build blockentities");
|
||||
|
||||
@@ -440,17 +461,19 @@ public class ShadowRenderer {
|
||||
culler.setPosition(cameraX, cameraY, cameraZ);
|
||||
}
|
||||
|
||||
GL11.glPushMatrix();
|
||||
MODELVIEW_BUFFER.clear().rewind();
|
||||
modelView.peek().getModel().get(MODELVIEW_BUFFER);
|
||||
GL11.glLoadMatrix(MODELVIEW_BUFFER);
|
||||
for (TileEntity tileEntity : visibleTileEntities) {
|
||||
if (hasEntityFrustum && (culler.isCulled(tileEntity.xCoord - 1, tileEntity.yCoord - 1, tileEntity.zCoord - 1, tileEntity.xCoord + 1, tileEntity.yCoord + 1, tileEntity.zCoord + 1))) {
|
||||
continue;
|
||||
}
|
||||
modelView.push();
|
||||
modelView.translate(tileEntity.xCoord - cameraX, tileEntity.yCoord - cameraY, tileEntity.zCoord - cameraZ);
|
||||
TileEntityRendererDispatcher.instance.renderTileEntity(tileEntity, partialTicks);
|
||||
modelView.pop();
|
||||
renderTileEntity(tileEntity, cameraX, cameraY, cameraZ, partialTicks);
|
||||
|
||||
shadowTileEntities++;
|
||||
}
|
||||
GLStateManager.glPopMatrix();
|
||||
|
||||
renderedShadowTileEntities = shadowTileEntities;
|
||||
|
||||
@@ -465,8 +488,6 @@ public class ShadowRenderer {
|
||||
// If the profiler is inactive, it will return InactiveProfiler.INSTANCE
|
||||
this.profiler = Minecraft.getMinecraft().mcProfiler;
|
||||
|
||||
Minecraft client = Minecraft.getMinecraft();
|
||||
|
||||
profiler.endStartSection("shadows");
|
||||
ACTIVE = true;
|
||||
|
||||
@@ -523,7 +544,6 @@ public class ShadowRenderer {
|
||||
|
||||
// Execute the vanilla terrain setup / culling routines using our shadow frustum.
|
||||
mc.renderGlobal.clipRenderersByFrustum(terrainFrustumHolder.getFrustum(), playerCamera.getPartialTicks());
|
||||
// levelRenderer.invokeSetupRender(playerCamera, terrainFrustumHolder.getFrustum(), false, levelRenderer.getFrameId(), false);
|
||||
|
||||
// Don't forget to increment the frame counter! This variable is arbitrary and only used in terrain setup,
|
||||
// and if it's not incremented, the vanilla culling code will get confused and think that it's already seen
|
||||
@@ -536,11 +556,8 @@ public class ShadowRenderer {
|
||||
|
||||
// Render all opaque terrain unless pack requests not to
|
||||
if (shouldRenderTerrain) {
|
||||
mc.renderEngine.bindTexture(TextureMap.locationBlocksTexture);
|
||||
rg.sortAndRender(mc.thePlayer, 0, playerCamera.getPartialTicks());
|
||||
|
||||
// levelRenderer.invokeRenderChunkLayer(RenderLayer.solid(), modelView, cameraX, cameraY, cameraZ);
|
||||
// levelRenderer.invokeRenderChunkLayer(RenderLayer.cutout(), modelView, cameraX, cameraY, cameraZ);
|
||||
// levelRenderer.invokeRenderChunkLayer(RenderLayer.cutoutMipped(), modelView, cameraX, cameraY, cameraZ);
|
||||
}
|
||||
|
||||
profiler.endStartSection("entities");
|
||||
@@ -564,27 +581,15 @@ public class ShadowRenderer {
|
||||
entityShadowFrustum.setPosition(cameraX, cameraY, cameraZ);
|
||||
|
||||
// Render nearby entities
|
||||
//
|
||||
// Note: We must use a separate BuilderBufferStorage object here, or else very weird things will happen during
|
||||
// rendering.
|
||||
// if (renderBuffersExt != null) {
|
||||
// renderBuffersExt.beginLevelRendering();
|
||||
// }
|
||||
|
||||
// if (buffers instanceof DrawCallTrackingRenderBuffers) {
|
||||
// ((DrawCallTrackingRenderBuffers) buffers).resetDrawCounts();
|
||||
// }
|
||||
|
||||
// BufferSource bufferSource = buffers.bufferSource();
|
||||
|
||||
if (shouldRenderEntities) {
|
||||
renderEntities(levelRenderer, entityShadowFrustum, null, modelView, cameraX, cameraY, cameraZ, tickDelta);
|
||||
} else if (shouldRenderPlayer) {
|
||||
// renderPlayerEntity(levelRenderer, entityShadowFrustum, bufferSource, modelView, cameraX, cameraY, cameraZ, tickDelta);
|
||||
renderPlayerEntity(levelRenderer, entityShadowFrustum, null, modelView, cameraX, cameraY, cameraZ, tickDelta);
|
||||
}
|
||||
|
||||
if (shouldRenderBlockEntities) {
|
||||
// renderTileEntities(bufferSource, modelView, cameraX, cameraY, cameraZ, tickDelta, hasEntityFrustum);
|
||||
renderTileEntities(null, modelView, cameraX, cameraY, cameraZ, tickDelta, hasEntityFrustum);
|
||||
}
|
||||
|
||||
profiler.endStartSection("draw entities");
|
||||
@@ -592,21 +597,16 @@ public class ShadowRenderer {
|
||||
// NB: Don't try to draw the translucent parts of entities afterwards. It'll cause problems since some
|
||||
// shader packs assume that everything drawn afterwards is actually translucent and should cast a colored
|
||||
// shadow...
|
||||
// bufferSource.endBatch();
|
||||
|
||||
copyPreTranslucentDepth();
|
||||
|
||||
profiler.endStartSection("translucent terrain");
|
||||
|
||||
// TODO: Prevent these calls from scheduling translucent sorting...
|
||||
// TODO (Iris): Prevent these calls from scheduling translucent sorting...
|
||||
// It doesn't matter a ton, since this just means that they won't be sorted in the getNormal rendering pass.
|
||||
// Just something to watch out for, however...
|
||||
if (shouldRenderTranslucent) {
|
||||
// TODO: Render
|
||||
// TODO -- This makes everything look... weird
|
||||
// rg.sortAndRender(mc.thePlayer, 1, playerCamera.getPartialTicks());
|
||||
|
||||
// levelRenderer.invokeRenderChunkLayer(RenderLayer.translucent(), modelView, cameraX, cameraY, cameraZ);
|
||||
rg.sortAndRender(mc.thePlayer, 1, playerCamera.getPartialTicks());
|
||||
}
|
||||
|
||||
// Note: Apparently tripwire isn't rendered in the shadow pass.
|
||||
@@ -616,7 +616,6 @@ public class ShadowRenderer {
|
||||
// renderBuffersExt.endLevelRendering();
|
||||
// }
|
||||
|
||||
// TODO: Render
|
||||
debugStringTerrain = SodiumWorldRenderer.getInstance().getChunksDebugString();
|
||||
|
||||
profiler.endStartSection("generate mipmaps");
|
||||
@@ -631,9 +630,6 @@ public class ShadowRenderer {
|
||||
((CullingDataCache) levelRenderer).restoreState();
|
||||
}
|
||||
|
||||
// TODO: Render
|
||||
// levelRenderer.setRenderBuffers(playerBuffers);
|
||||
|
||||
ACTIVE = false;
|
||||
profiler.endSection();
|
||||
profiler.endStartSection("updatechunks");
|
||||
|
||||
@@ -1,42 +0,0 @@
|
||||
package net.coderbot.iris.pipeline.transform;
|
||||
|
||||
import net.coderbot.iris.gbuffer_overrides.matching.InputAvailability;
|
||||
|
||||
class AttributeParameters extends Parameters {
|
||||
public final boolean hasGeometry;
|
||||
public final InputAvailability inputs;
|
||||
|
||||
public AttributeParameters(Patch patch, boolean hasGeometry, InputAvailability inputs) {
|
||||
super(patch);
|
||||
this.hasGeometry = hasGeometry;
|
||||
this.inputs = inputs;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
final int prime = 31;
|
||||
int result = super.hashCode();
|
||||
result = prime * result + (hasGeometry ? 1231 : 1237);
|
||||
result = prime * result + ((inputs == null) ? 0 : inputs.hashCode());
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object obj) {
|
||||
if (this == obj)
|
||||
return true;
|
||||
if (!super.equals(obj))
|
||||
return false;
|
||||
if (getClass() != obj.getClass())
|
||||
return false;
|
||||
AttributeParameters other = (AttributeParameters) obj;
|
||||
if (hasGeometry != other.hasGeometry)
|
||||
return false;
|
||||
if (inputs == null) {
|
||||
if (other.inputs != null)
|
||||
return false;
|
||||
} else if (!inputs.equals(other.inputs))
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -1,30 +1,17 @@
|
||||
package net.coderbot.iris.pipeline.transform;
|
||||
|
||||
import io.github.douira.glsl_transformer.ast.node.Identifier;
|
||||
import io.github.douira.glsl_transformer.ast.node.Profile;
|
||||
import io.github.douira.glsl_transformer.ast.node.TranslationUnit;
|
||||
import io.github.douira.glsl_transformer.ast.node.basic.ASTNode;
|
||||
import io.github.douira.glsl_transformer.ast.node.external_declaration.ExternalDeclaration;
|
||||
import io.github.douira.glsl_transformer.ast.query.Root;
|
||||
import io.github.douira.glsl_transformer.ast.query.match.AutoHintedMatcher;
|
||||
import io.github.douira.glsl_transformer.ast.query.match.Matcher;
|
||||
import io.github.douira.glsl_transformer.ast.transform.ASTInjectionPoint;
|
||||
import io.github.douira.glsl_transformer.ast.transform.ASTParser;
|
||||
import net.coderbot.iris.gl.shader.ShaderType;
|
||||
|
||||
import java.util.stream.Stream;
|
||||
import net.coderbot.iris.pipeline.transform.parameter.AttributeParameters;
|
||||
import org.taumc.glsl.grammar.GLSLParser;
|
||||
import org.taumc.glsl.Util;
|
||||
|
||||
/**
|
||||
* Implements AttributeShaderTransformer using glsl-transformer AST
|
||||
* transformation methods.
|
||||
*/
|
||||
class AttributeTransformer {
|
||||
public static void transform(
|
||||
ASTParser t,
|
||||
TranslationUnit tree,
|
||||
Root root,
|
||||
AttributeParameters parameters) {
|
||||
boolean isCore = (tree.getVersionStatement().profile == Profile.CORE || (tree.getVersionStatement().profile == null && tree.getVersionStatement().version.number > 140));
|
||||
public static void transform(GLSLParser.Translation_unitContext translationUnit, AttributeParameters parameters, String profile, int version) {
|
||||
boolean isCore = (profile.equals("core") || version > 140);
|
||||
if (isCore) {
|
||||
if (parameters.type == PatchShaderType.VERTEX) {
|
||||
throw new IllegalStateException("Vertex shaders must be in the compatibility profile to run properly!");
|
||||
@@ -36,32 +23,22 @@ class AttributeTransformer {
|
||||
// lightmap texture coordinate.
|
||||
// See https://github.com/IrisShaders/Iris/issues/1149
|
||||
if (parameters.inputs.lightmap) {
|
||||
root.rename("gl_MultiTexCoord2", "gl_MultiTexCoord1");
|
||||
Util.rename(translationUnit, "gl_MultiTexCoord2", "gl_MultiTexCoord1");
|
||||
}
|
||||
|
||||
Stream<Identifier> stream = Stream.empty();
|
||||
boolean hasItems = false;
|
||||
if (!parameters.inputs.lightmap) {
|
||||
stream = Stream.concat(stream,
|
||||
root.identifierIndex.getStream("gl_MultiTexCoord1"));
|
||||
stream = Stream.concat(stream,
|
||||
root.identifierIndex.getStream("gl_MultiTexCoord2"));
|
||||
hasItems = true;
|
||||
}
|
||||
if (!parameters.inputs.texture) {
|
||||
stream = Stream.concat(stream,
|
||||
root.identifierIndex.getStream("gl_MultiTexCoord0"));
|
||||
hasItems = true;
|
||||
}
|
||||
if (hasItems) {
|
||||
root.replaceReferenceExpressions(t, stream, "vec4(240.0, 240.0, 0.0, 1.0)");
|
||||
}
|
||||
if (!parameters.inputs.lightmap) {
|
||||
Util.replaceExpression(translationUnit, "gl_MultiTexCoord1", "vec4(240.0, 240.0, 0.0, 1.0)");
|
||||
Util.replaceExpression(translationUnit, "gl_MultiTexCoord2", "vec4(240.0, 240.0, 0.0, 1.0)");
|
||||
}
|
||||
if (!parameters.inputs.texture) {
|
||||
Util.replaceExpression(translationUnit, "gl_MultiTexCoord0", "vec4(240.0, 240.0, 0.0, 1.0)");
|
||||
}
|
||||
|
||||
patchTextureMatrices(t, tree, root, parameters.inputs.lightmap);
|
||||
patchTextureMatrices(translationUnit, parameters.inputs.lightmap);
|
||||
|
||||
if (parameters.type.glShaderType == ShaderType.VERTEX
|
||||
&& root.identifierIndex.has("gl_MultiTexCoord3")
|
||||
&& !root.identifierIndex.has("mc_midTexCoord")) {
|
||||
&& Util.hasVariable(translationUnit, "gl_MultiTexCoord3")
|
||||
&& !Util.hasVariable(translationUnit, "mc_midTexCoord")) {
|
||||
// TODO: proper type conversion
|
||||
// gl_MultiTexCoord3 is a super legacy alias of mc_midTexCoord. We don't do this
|
||||
// replacement if we think mc_midTexCoord could be defined just we can't handle
|
||||
@@ -69,43 +46,44 @@ class AttributeTransformer {
|
||||
// to define mc_midTexCoord only if it's not defined, and if it is defined,
|
||||
// figure out its type, then replace all occurrences of gl_MultiTexCoord3 with
|
||||
// the correct conversion from mc_midTexCoord's declared type to vec4.
|
||||
root.rename("gl_MultiTexCoord3", "mc_midTexCoord");
|
||||
tree.parseAndInjectNode(t, ASTInjectionPoint.BEFORE_FUNCTIONS,
|
||||
"attribute vec4 mc_midTexCoord;");
|
||||
Util.rename(translationUnit, "gl_MultiTexCoord3", "mc_midTexCoord");
|
||||
Util.injectVariable(translationUnit, "attribute vec4 mc_midTexCoord;");
|
||||
}
|
||||
}
|
||||
|
||||
private static void patchTextureMatrices(
|
||||
ASTParser t,
|
||||
TranslationUnit tree,
|
||||
Root root,
|
||||
boolean hasLightmap) {
|
||||
root.rename("gl_TextureMatrix", "iris_TextureMatrix");
|
||||
private static void patchTextureMatrices(GLSLParser.Translation_unitContext translationUnit, boolean hasLightmap) {
|
||||
Util.rename(translationUnit, "gl_TextureMatrix", "iris_TextureMatrix");
|
||||
|
||||
tree.parseAndInjectNodes(t, ASTInjectionPoint.BEFORE_FUNCTIONS,
|
||||
"const float iris_ONE_OVER_256 = 0.00390625;",
|
||||
"const float iris_ONE_OVER_32 = iris_ONE_OVER_256 * 8;");
|
||||
if (hasLightmap) {
|
||||
tree.parseAndInjectNode(t, ASTInjectionPoint.BEFORE_FUNCTIONS,
|
||||
"mat4 iris_LightmapTextureMatrix = gl_TextureMatrix[1];");
|
||||
} else {
|
||||
tree.parseAndInjectNode(t, ASTInjectionPoint.BEFORE_FUNCTIONS, "mat4 iris_LightmapTextureMatrix =" +
|
||||
"mat4(iris_ONE_OVER_256, 0.0, 0.0, 0.0," +
|
||||
" 0.0, iris_ONE_OVER_256, 0.0, 0.0," +
|
||||
" 0.0, 0.0, iris_ONE_OVER_256, 0.0," +
|
||||
" iris_ONE_OVER_32, iris_ONE_OVER_32, iris_ONE_OVER_32, iris_ONE_OVER_256);");
|
||||
}
|
||||
// TODO: These were originally marked const, but that breaks things
|
||||
// If these are marked const, then using them below in the iris_LightmapTextureMatrix creation
|
||||
// breaks with them being undefined. I suppose the const variables cause them to get defined later than otherwise?
|
||||
// Similarly, if you make them a const, then iris_ONE_OVER_32 breaks because it references iris_ONE_OVER_256.
|
||||
// Not sure if it really matters if these are marked const or not. Alternatively they can be marked const
|
||||
// and the values hardcoded within the places that use them here, that seems to work fine, but this probably
|
||||
// stayed closer to the original way it worked.
|
||||
Util.injectVariable(translationUnit, "float iris_ONE_OVER_256 = 0.00390625;");
|
||||
Util.injectVariable(translationUnit, "float iris_ONE_OVER_32 = iris_ONE_OVER_256 * 8;");
|
||||
|
||||
// column major
|
||||
tree.parseAndInjectNode(t, ASTInjectionPoint.BEFORE_FUNCTIONS, "mat4 iris_TextureMatrix[8] = mat4[8](" +
|
||||
"gl_TextureMatrix[0]," +
|
||||
"iris_LightmapTextureMatrix," +
|
||||
"mat4(1.0)," +
|
||||
"mat4(1.0)," +
|
||||
"mat4(1.0)," +
|
||||
"mat4(1.0)," +
|
||||
"mat4(1.0)," +
|
||||
"mat4(1.0)" +
|
||||
");");
|
||||
if (hasLightmap) {
|
||||
Util.injectVariable(translationUnit, "mat4 iris_LightmapTextureMatrix = gl_TextureMatrix[1];");
|
||||
} else {
|
||||
Util.injectVariable(translationUnit, "mat4 iris_LightmapTextureMatrix =" +
|
||||
"mat4(iris_ONE_OVER_256, 0.0, 0.0, 0.0," +
|
||||
" 0.0, iris_ONE_OVER_256, 0.0, 0.0," +
|
||||
" 0.0, 0.0, iris_ONE_OVER_256, 0.0," +
|
||||
" iris_ONE_OVER_32, iris_ONE_OVER_32, iris_ONE_OVER_32, iris_ONE_OVER_256);");
|
||||
}
|
||||
|
||||
// column major
|
||||
Util.injectVariable(translationUnit, "mat4 iris_TextureMatrix[8] = mat4[8](" +
|
||||
"gl_TextureMatrix[0]," +
|
||||
"iris_LightmapTextureMatrix," +
|
||||
"mat4(1.0)," +
|
||||
"mat4(1.0)," +
|
||||
"mat4(1.0)," +
|
||||
"mat4(1.0)," +
|
||||
"mat4(1.0)," +
|
||||
"mat4(1.0)" +
|
||||
");");
|
||||
}
|
||||
}
|
||||
@@ -1,310 +1,55 @@
|
||||
package net.coderbot.iris.pipeline.transform;
|
||||
|
||||
import io.github.douira.glsl_transformer.ast.node.Identifier;
|
||||
import io.github.douira.glsl_transformer.ast.node.TranslationUnit;
|
||||
import io.github.douira.glsl_transformer.ast.node.basic.ASTNode;
|
||||
import io.github.douira.glsl_transformer.ast.node.declaration.DeclarationMember;
|
||||
import io.github.douira.glsl_transformer.ast.node.declaration.FunctionParameter;
|
||||
import io.github.douira.glsl_transformer.ast.node.declaration.TypeAndInitDeclaration;
|
||||
import io.github.douira.glsl_transformer.ast.node.expression.Expression;
|
||||
import io.github.douira.glsl_transformer.ast.node.expression.LiteralExpression;
|
||||
import io.github.douira.glsl_transformer.ast.node.expression.ReferenceExpression;
|
||||
import io.github.douira.glsl_transformer.ast.node.expression.unary.FunctionCallExpression;
|
||||
import io.github.douira.glsl_transformer.ast.node.external_declaration.DeclarationExternalDeclaration;
|
||||
import io.github.douira.glsl_transformer.ast.node.external_declaration.EmptyDeclaration;
|
||||
import io.github.douira.glsl_transformer.ast.node.external_declaration.ExternalDeclaration;
|
||||
import io.github.douira.glsl_transformer.ast.node.external_declaration.FunctionDefinition;
|
||||
import io.github.douira.glsl_transformer.ast.node.statement.Statement;
|
||||
import io.github.douira.glsl_transformer.ast.node.type.qualifier.StorageQualifier;
|
||||
import io.github.douira.glsl_transformer.ast.node.type.qualifier.StorageQualifier.StorageType;
|
||||
import io.github.douira.glsl_transformer.ast.node.type.qualifier.TypeQualifier;
|
||||
import io.github.douira.glsl_transformer.ast.node.type.qualifier.TypeQualifierPart;
|
||||
import io.github.douira.glsl_transformer.ast.node.type.specifier.BuiltinNumericTypeSpecifier;
|
||||
import io.github.douira.glsl_transformer.ast.node.type.specifier.FunctionPrototype;
|
||||
import io.github.douira.glsl_transformer.ast.node.type.specifier.TypeSpecifier;
|
||||
import io.github.douira.glsl_transformer.ast.query.Root;
|
||||
import io.github.douira.glsl_transformer.ast.query.match.AutoHintedMatcher;
|
||||
import io.github.douira.glsl_transformer.ast.query.match.Matcher;
|
||||
import io.github.douira.glsl_transformer.ast.transform.ASTInjectionPoint;
|
||||
import io.github.douira.glsl_transformer.ast.transform.ASTParser;
|
||||
import io.github.douira.glsl_transformer.ast.transform.Template;
|
||||
import io.github.douira.glsl_transformer.util.Type;
|
||||
import net.coderbot.iris.Iris;
|
||||
import net.coderbot.iris.gl.shader.ShaderType;
|
||||
import net.coderbot.iris.pipeline.PatchedShaderPrinter;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import net.coderbot.iris.pipeline.transform.parameter.Parameters;
|
||||
import org.antlr.v4.runtime.tree.ParseTree;
|
||||
import org.taumc.glsl.Util;
|
||||
import org.taumc.glsl.grammar.GLSLLexer;
|
||||
import org.taumc.glsl.grammar.GLSLParser;
|
||||
|
||||
import java.util.ArrayDeque;
|
||||
import java.util.Deque;
|
||||
import java.util.HashMap;
|
||||
import java.util.HashSet;
|
||||
import java.util.LinkedList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
import java.util.stream.Stream;
|
||||
|
||||
public class CompatibilityTransformer {
|
||||
static Logger LOGGER = LogManager.getLogger(CompatibilityTransformer.class);
|
||||
|
||||
private static final AutoHintedMatcher<Expression> sildursWaterFract = new AutoHintedMatcher<>(
|
||||
"fract(worldpos.y + 0.001)", Matcher.expressionPattern);
|
||||
private static final ShaderType[] pipeline = {ShaderType.VERTEX, ShaderType.GEOMETRY, ShaderType.FRAGMENT};
|
||||
|
||||
private static StorageQualifier getConstQualifier(TypeQualifier qualifier) {
|
||||
if (qualifier == null) {
|
||||
return null;
|
||||
}
|
||||
for (TypeQualifierPart constQualifier : qualifier.getChildren()) {
|
||||
if (constQualifier instanceof StorageQualifier) {
|
||||
StorageQualifier storageQualifier = (StorageQualifier) constQualifier;
|
||||
if (storageQualifier.storageType == StorageQualifier.StorageType.CONST) {
|
||||
return storageQualifier;
|
||||
}
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public static void transformEach(ASTParser t, TranslationUnit tree, Root root, Parameters parameters) {
|
||||
if (parameters.type == PatchShaderType.VERTEX) {
|
||||
if (root.replaceExpressionMatches(t, sildursWaterFract, "fract(worldpos.y + 0.01)")) {
|
||||
Iris.logger.warn("Patched fract(worldpos.y + 0.001) to fract(worldpos.y + 0.01) to fix " +
|
||||
"waving water disconnecting from other water blocks; See https://github.com/IrisShaders/Iris/issues/509");
|
||||
}
|
||||
}
|
||||
public static void transformEach(GLSLParser.Translation_unitContext translationUnit, Parameters parameters) {
|
||||
if (parameters.type == PatchShaderType.VERTEX) {
|
||||
;
|
||||
// TODO: sildur's jankness
|
||||
// This is a hacky patch for sildur's shaders that changes the way it does it's waving water to make it work better?
|
||||
// Why is this the GLSL transformation code in Iris, tell sildur to fix it and remove this?
|
||||
// it's still there in current, modern Iris
|
||||
// See https://github.com/IrisShaders/Iris/issues/509
|
||||
Util.replaceExpression(translationUnit, "fract(worldpos.y + 0.001)", "fract(worldpos.y + 0.01)");
|
||||
}
|
||||
|
||||
/**
|
||||
* Removes const storage qualifier from declarations in functions if they are
|
||||
* initialized with const parameters. Const parameters are immutable parameters
|
||||
* and can't be used to initialize const declarations because they expect
|
||||
* constant, not just immutable, expressions. This varies between drivers and
|
||||
* versions. Also removes the const qualifier from declarations that use the
|
||||
* identifiers from which the declaration was removed previously.
|
||||
* See https://wiki.shaderlabs.org/wiki/Compiler_Behavior_Notes
|
||||
*/
|
||||
Map<FunctionDefinition, Set<String>> constFunctions = new HashMap<>();
|
||||
Set<String> processingSet = new HashSet<>();
|
||||
List<FunctionDefinition> unusedFunctions = new LinkedList<>();
|
||||
for (FunctionDefinition definition : root.nodeIndex.get(FunctionDefinition.class)) {
|
||||
// check if this function is ever used
|
||||
FunctionPrototype prototype = definition.getFunctionPrototype();
|
||||
String functionName = prototype.getName().getName();
|
||||
if (!functionName.equals("main") && root.identifierIndex.getStream(functionName).count() <= 1) {
|
||||
// remove unused functions
|
||||
// unused function removal can be helpful since some drivers don't do some
|
||||
// checks on unused functions. Additionally, sometimes bugs in unused code can
|
||||
// be avoided this way.
|
||||
// TODO: integrate into debug mode (allow user to disable this behavior for
|
||||
// debugging purposes)
|
||||
unusedFunctions.add(definition);
|
||||
if (PatchedShaderPrinter.prettyPrintShaders) {
|
||||
LOGGER.warn("Removing unused function " + functionName);
|
||||
} else if (unusedFunctions.size() == 1) {
|
||||
LOGGER.warn(
|
||||
"Removing unused function " + functionName
|
||||
+ " and omitting further such messages outside of debug mode. See debugging.md for more information.");
|
||||
}
|
||||
continue;
|
||||
}
|
||||
/**
|
||||
* Removes const storage qualifier from declarations in functions if they are
|
||||
* initialized with const parameters. Const parameters are immutable parameters
|
||||
* and can't be used to initialize const declarations because they expect
|
||||
* constant, not just immutable, expressions. This varies between drivers and
|
||||
* versions. Also removes the const qualifier from declarations that use the
|
||||
* identifiers from which the declaration was removed previously.
|
||||
* See https://wiki.shaderlabs.org/wiki/Compiler_Behavior_Notes
|
||||
*/
|
||||
Util.removeUnusedFunctions(translationUnit);
|
||||
Util.removeConstAssignment(translationUnit);
|
||||
|
||||
// stop on functions without parameters
|
||||
if (prototype.getChildren().isEmpty()) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// find the const parameters
|
||||
Set<String> names = new HashSet<>(prototype.getChildren().size());
|
||||
for (FunctionParameter parameter : prototype.getChildren()) {
|
||||
if (getConstQualifier(parameter.getType().getTypeQualifier()) != null) {
|
||||
String name = parameter.getName().getName();
|
||||
names.add(name);
|
||||
processingSet.add(name);
|
||||
}
|
||||
}
|
||||
if (!names.isEmpty()) {
|
||||
constFunctions.put(definition, names);
|
||||
}
|
||||
}
|
||||
|
||||
// remove collected unused functions
|
||||
for (FunctionDefinition definition : unusedFunctions) {
|
||||
definition.detachAndDelete();
|
||||
}
|
||||
|
||||
// find the reference expressions for the const parameters
|
||||
// and check that they are in the right function and are of the right type
|
||||
boolean constDeclarationHit = false;
|
||||
Deque<String> processingQueue = new ArrayDeque<>(processingSet);
|
||||
while (!processingQueue.isEmpty()) {
|
||||
String name = processingQueue.poll();
|
||||
processingSet.remove(name);
|
||||
for (Identifier id : root.identifierIndex.get(name)) {
|
||||
// since this searches for reference expressions, this won't accidentally find
|
||||
// the name as the name of a declaration member
|
||||
ReferenceExpression reference = id.getAncestor(ReferenceExpression.class);
|
||||
if (reference == null) {
|
||||
continue;
|
||||
}
|
||||
TypeAndInitDeclaration taid = reference.getAncestor(TypeAndInitDeclaration.class);
|
||||
if (taid == null) {
|
||||
continue;
|
||||
}
|
||||
FunctionDefinition inDefinition = taid.getAncestor(FunctionDefinition.class);
|
||||
if (inDefinition == null) {
|
||||
continue;
|
||||
}
|
||||
Set<String> constIdsInFunction = constFunctions.get(inDefinition);
|
||||
if (constIdsInFunction == null) {
|
||||
continue;
|
||||
}
|
||||
if (constIdsInFunction.contains(name)) {
|
||||
// remove the const qualifier from the reference expression
|
||||
TypeQualifier qualifier = taid.getType().getTypeQualifier();
|
||||
StorageQualifier constQualifier = getConstQualifier(qualifier);
|
||||
if (constQualifier == null) {
|
||||
continue;
|
||||
}
|
||||
constQualifier.detachAndDelete();
|
||||
if (qualifier.getChildren().isEmpty()) {
|
||||
qualifier.detachAndDelete();
|
||||
}
|
||||
constDeclarationHit = true;
|
||||
|
||||
// add all members of the declaration to the list of const parameters to process
|
||||
for (DeclarationMember member : taid.getMembers()) {
|
||||
String memberName = member.getName().getName();
|
||||
|
||||
// the name may not be the same as the parameter name
|
||||
if (constIdsInFunction.contains(memberName)) {
|
||||
throw new IllegalStateException("Illegal redefinition of const parameter " + name);
|
||||
}
|
||||
|
||||
constIdsInFunction.add(memberName);
|
||||
|
||||
// don't add to the queue twice if it's already been added by a different scope
|
||||
if (!processingSet.contains(memberName)) {
|
||||
processingQueue.add(memberName);
|
||||
processingSet.add(memberName);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (constDeclarationHit) {
|
||||
LOGGER.warn(
|
||||
"Removed the const keyword from declarations that use const parameters. See debugging.md for more information.");
|
||||
}
|
||||
|
||||
// remove empty external declarations
|
||||
boolean emptyDeclarationHit = root.process(
|
||||
root.nodeIndex.getStream(EmptyDeclaration.class),
|
||||
ASTNode::detachAndDelete);
|
||||
if (emptyDeclarationHit) {
|
||||
LOGGER.warn(
|
||||
"Removed empty external declarations (\";\").");
|
||||
}
|
||||
}
|
||||
|
||||
private static class DeclarationMatcher extends AutoHintedMatcher<ExternalDeclaration> {
|
||||
private final StorageType storageType;
|
||||
|
||||
public DeclarationMatcher(StorageType storageType) {
|
||||
super("out float name;", Matcher.externalDeclarationPattern);
|
||||
this.storageType = storageType;
|
||||
markClassWildcard("qualifier", pattern.getRoot().nodeIndex.getOne(TypeQualifier.class));
|
||||
markClassWildcard("type", pattern.getRoot().nodeIndex.getOne(BuiltinNumericTypeSpecifier.class));
|
||||
markClassWildcard("name*", pattern.getRoot().identifierIndex.getOne("name").getAncestor(DeclarationMember.class));
|
||||
}
|
||||
|
||||
public boolean matchesSpecialized(ExternalDeclaration tree, ShaderType shaderType) {
|
||||
boolean result = super.matchesExtract(tree);
|
||||
if (!result) {
|
||||
return false;
|
||||
}
|
||||
TypeQualifier qualifier = getNodeMatch("qualifier", TypeQualifier.class);
|
||||
for (TypeQualifierPart part : qualifier.getParts()) {
|
||||
if (part instanceof StorageQualifier) {
|
||||
StorageQualifier storageQualifier = (StorageQualifier) part;
|
||||
StorageType qualifierStorageType = storageQualifier.storageType;
|
||||
// TODO: investigate the specified behavior of varying in geometry shaders and
|
||||
// the combination of varying with in or out qualifiers
|
||||
if (qualifierStorageType == storageType ||
|
||||
qualifierStorageType == StorageType.VARYING &&
|
||||
(shaderType == ShaderType.VERTEX && storageType == StorageType.OUT ||
|
||||
shaderType == ShaderType.GEOMETRY && storageType == StorageType.OUT ||
|
||||
shaderType == ShaderType.FRAGMENT && storageType == StorageType.IN)) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
private static final ShaderType[] pipeline = { ShaderType.VERTEX, ShaderType.GEOMETRY, ShaderType.FRAGMENT };
|
||||
private static final DeclarationMatcher outDeclarationMatcher = new DeclarationMatcher(StorageType.OUT);
|
||||
private static final DeclarationMatcher inDeclarationMatcher = new DeclarationMatcher(StorageType.IN);
|
||||
|
||||
private static final String tagPrefix = "iris_template_";
|
||||
private static final Template<ExternalDeclaration> declarationTemplate = Template
|
||||
.withExternalDeclaration("out __type __name;");
|
||||
private static final Template<Statement> initTemplate = Template.withStatement("__decl = __value;");
|
||||
private static final Template<ExternalDeclaration> variableTemplate = Template
|
||||
.withExternalDeclaration("__type __internalDecl;");
|
||||
private static final Template<Statement> statementTemplate = Template
|
||||
.withStatement("__oldDecl = vec3(__internalDecl);");
|
||||
private static final Template<Statement> statementTemplateVector = Template
|
||||
.withStatement("__oldDecl = vec3(__internalDecl, vec4(0));");
|
||||
|
||||
static {
|
||||
declarationTemplate.markLocalReplacement(declarationTemplate.getSourceRoot().nodeIndex.getOne(TypeQualifier.class));
|
||||
declarationTemplate.markLocalReplacement("__type", TypeSpecifier.class);
|
||||
declarationTemplate.markIdentifierReplacement("__name");
|
||||
initTemplate.markIdentifierReplacement("__decl");
|
||||
initTemplate.markLocalReplacement("__value", ReferenceExpression.class);
|
||||
variableTemplate.markLocalReplacement("__type", TypeSpecifier.class);
|
||||
variableTemplate.markIdentifierReplacement("__internalDecl");
|
||||
statementTemplate.markIdentifierReplacement("__oldDecl");
|
||||
statementTemplate.markIdentifierReplacement("__internalDecl");
|
||||
statementTemplate.markLocalReplacement(
|
||||
statementTemplate.getSourceRoot().nodeIndex.getStream(BuiltinNumericTypeSpecifier.class)
|
||||
.filter(specifier -> specifier.type == Type.F32VEC3).findAny().get());
|
||||
statementTemplateVector.markIdentifierReplacement("__oldDecl");
|
||||
statementTemplateVector.markIdentifierReplacement("__internalDecl");
|
||||
statementTemplateVector.markLocalReplacement(
|
||||
statementTemplateVector.getSourceRoot().nodeIndex.getStream(BuiltinNumericTypeSpecifier.class)
|
||||
.filter(specifier -> specifier.type == Type.F32VEC3).findAny().get());
|
||||
}
|
||||
|
||||
private static Statement getInitializer(Root root, String name, Type type) {
|
||||
return initTemplate.getInstanceFor(root,
|
||||
new Identifier(name),
|
||||
type.isScalar()
|
||||
? LiteralExpression.getDefaultValue(type)
|
||||
: Root.indexNodes(root, () -> new FunctionCallExpression(
|
||||
new Identifier(type.getMostCompactName()),
|
||||
Stream.of(LiteralExpression.getDefaultValue(type)))));
|
||||
}
|
||||
|
||||
private static TypeQualifier makeQualifierOut(TypeQualifier typeQualifier) {
|
||||
for (TypeQualifierPart qualifierPart : typeQualifier.getParts()) {
|
||||
if (qualifierPart instanceof StorageQualifier) {
|
||||
StorageQualifier storageQualifier = (StorageQualifier) qualifierPart;
|
||||
if (((StorageQualifier) qualifierPart).storageType == StorageType.IN) {
|
||||
storageQualifier.storageType = StorageType.OUT;
|
||||
}
|
||||
}
|
||||
}
|
||||
return typeQualifier;
|
||||
}
|
||||
// TODO: glsl-transformation-lib doesn't have a way to identify empty declarations
|
||||
// this transformation is not done in current versions of Iris, so not sure it's necessary
|
||||
// boolean emptyDeclarationHit = root.process(
|
||||
// root.nodeIndex.getStream(EmptyDeclaration.class),
|
||||
// ASTNode::detachAndDelete);
|
||||
// if (emptyDeclarationHit) {
|
||||
// LOGGER.warn(
|
||||
// "Removed empty external declarations (\";\").");
|
||||
// }
|
||||
}
|
||||
|
||||
// does transformations that require cross-shader type data
|
||||
public static void transformGrouped(
|
||||
ASTParser t,
|
||||
Map<PatchShaderType, TranslationUnit> trees,
|
||||
Parameters parameters) {
|
||||
public static void transformGrouped(Map<PatchShaderType, GLSLParser.Translation_unitContext> trees, Parameters parameters) {
|
||||
/**
|
||||
* find attributes that are declared as "in" in geometry or fragment but not
|
||||
* declared as "out" in the previous stage. The missing "out" declarations for
|
||||
@@ -320,225 +65,73 @@ public class CompatibilityTransformer {
|
||||
* iris_FogFragCoord if there are geometry shaders present
|
||||
* - improved geometry shader support? They use funky declarations
|
||||
*/
|
||||
ShaderType prevType = null;
|
||||
for (int i = 0; i < pipeline.length; i++) {
|
||||
ShaderType type = pipeline[i];
|
||||
PatchShaderType[] patchTypes = PatchShaderType.fromGlShaderType(type);
|
||||
ShaderType prevType = null;
|
||||
for (ShaderType type : pipeline) {
|
||||
PatchShaderType[] patchTypes = PatchShaderType.fromGlShaderType(type);
|
||||
|
||||
// check if the patch types have sources and continue if not
|
||||
boolean hasAny = false;
|
||||
for (PatchShaderType currentType : patchTypes) {
|
||||
if (trees.get(currentType) != null) {
|
||||
hasAny = true;
|
||||
}
|
||||
}
|
||||
if (!hasAny) {
|
||||
continue;
|
||||
}
|
||||
// check if the patch types have sources and continue if not
|
||||
boolean hasAny = false;
|
||||
for (PatchShaderType currentType : patchTypes) {
|
||||
if (trees.get(currentType) != null) {
|
||||
hasAny = true;
|
||||
}
|
||||
}
|
||||
if (!hasAny) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// if the current type has sources but the previous one doesn't, set the
|
||||
// previous one and continue
|
||||
if (prevType == null) {
|
||||
prevType = type;
|
||||
continue;
|
||||
}
|
||||
// if the current type has sources but the previous one doesn't, set the
|
||||
// previous one and continue
|
||||
if (prevType == null) {
|
||||
prevType = type;
|
||||
continue;
|
||||
}
|
||||
|
||||
PatchShaderType prevPatchTypes = PatchShaderType.fromGlShaderType(prevType)[0];
|
||||
TranslationUnit prevTree = trees.get(prevPatchTypes);
|
||||
Root prevRoot = prevTree.getRoot();
|
||||
PatchShaderType prevPatchTypes = PatchShaderType.fromGlShaderType(prevType)[0];
|
||||
GLSLParser.Translation_unitContext prevTree = trees.get(prevPatchTypes);
|
||||
|
||||
// test if the prefix tag is used for some reason
|
||||
if (prevRoot.identifierIndex.prefixQueryFlat(tagPrefix).findAny().isPresent()) {
|
||||
LOGGER.warn("The prefix tag " + tagPrefix + " is used in the shader, bailing compatibility transformation.");
|
||||
return;
|
||||
}
|
||||
// find out declarations
|
||||
Map<String, GLSLParser.Single_declarationContext> outDec = Util.findQualifiers(prevTree, GLSLLexer.OUT);
|
||||
for (PatchShaderType currentType : patchTypes) {
|
||||
GLSLParser.Translation_unitContext currentTree = trees.get(currentType);
|
||||
|
||||
// find out declarations
|
||||
Map<String, BuiltinNumericTypeSpecifier> outDeclarations = new HashMap<>();
|
||||
for (DeclarationExternalDeclaration declaration : prevRoot.nodeIndex.get(DeclarationExternalDeclaration.class)) {
|
||||
if (outDeclarationMatcher.matchesSpecialized(declaration, prevType)) {
|
||||
BuiltinNumericTypeSpecifier extractedType = outDeclarationMatcher.getNodeMatch("type",
|
||||
BuiltinNumericTypeSpecifier.class);
|
||||
for (DeclarationMember member : outDeclarationMatcher
|
||||
.getNodeMatch("name*", DeclarationMember.class)
|
||||
.getAncestor(TypeAndInitDeclaration.class)
|
||||
.getMembers()) {
|
||||
String name = member.getName().getName();
|
||||
if (!name.startsWith("gl_")) {
|
||||
outDeclarations.put(name, extractedType);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if (currentTree == null) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// add out declarations that are missing for in declarations
|
||||
for (PatchShaderType currentType : patchTypes) {
|
||||
TranslationUnit currentTree = trees.get(currentType);
|
||||
if (currentTree == null) {
|
||||
continue;
|
||||
}
|
||||
Root currentRoot = currentTree.getRoot();
|
||||
Map<String, GLSLParser.Single_declarationContext> inDec = Util.findQualifiers(currentTree, GLSLLexer.IN);
|
||||
for (String in : inDec.keySet()) {
|
||||
if (in.startsWith("gl_")) {
|
||||
continue;
|
||||
}
|
||||
|
||||
for (ExternalDeclaration declaration : currentRoot.nodeIndex.get(DeclarationExternalDeclaration.class)) {
|
||||
if (!inDeclarationMatcher.matchesSpecialized(declaration, currentType.glShaderType)) {
|
||||
continue;
|
||||
}
|
||||
if (!outDec.containsKey(in)) {
|
||||
if (!Util.containsCall(currentTree, in)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
BuiltinNumericTypeSpecifier inTypeSpecifier = inDeclarationMatcher.getNodeMatch("type",
|
||||
BuiltinNumericTypeSpecifier.class);
|
||||
for (DeclarationMember inDeclarationMember : inDeclarationMatcher
|
||||
.getNodeMatch("name*", DeclarationMember.class)
|
||||
.getAncestor(TypeAndInitDeclaration.class)
|
||||
.getMembers()) {
|
||||
String name = inDeclarationMember.getName().getName();
|
||||
if (name.startsWith("gl_")) {
|
||||
continue;
|
||||
}
|
||||
Util.makeOutDeclaration(prevTree, inDec.get(in), in);
|
||||
|
||||
// patch missing declarations with an initialization
|
||||
if (!outDeclarations.containsKey(name)) {
|
||||
// make sure the declared in is actually used
|
||||
if (!currentRoot.identifierIndex.getAncestors(name, ReferenceExpression.class).findAny().isPresent()) {
|
||||
continue;
|
||||
}
|
||||
if (!Util.hasAssigment(prevTree, in)) {
|
||||
Util.initialize(prevTree, inDec.get(in), in);
|
||||
}
|
||||
} else {
|
||||
ParseTree outType = outDec.get(in).fully_specified_type().type_specifier().type_specifier_nonarray().children.get(0);
|
||||
ParseTree inType = inDec.get(in).fully_specified_type().type_specifier().type_specifier_nonarray().children.get(0);
|
||||
|
||||
if (inTypeSpecifier == null) {
|
||||
LOGGER.warn(
|
||||
"The in declaration '" + name + "' in the " + currentType.glShaderType.name()
|
||||
+ " shader that has a missing corresponding out declaration in the previous stage "
|
||||
+ prevType.name() + " has a non-numeric type and could not be compatibility-patched. See debugging.md for more information.");
|
||||
continue;
|
||||
}
|
||||
Type inType = inTypeSpecifier.type;
|
||||
if (outDec.get(in).fully_specified_type().type_specifier().array_specifier() != null) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// insert the new out declaration but copy over the type qualifiers, except for
|
||||
// the in/out qualifier
|
||||
TypeQualifier outQualifier = (TypeQualifier) inDeclarationMatcher
|
||||
.getNodeMatch("qualifier").cloneInto(prevRoot);
|
||||
makeQualifierOut(outQualifier);
|
||||
prevTree.injectNode(ASTInjectionPoint.BEFORE_DECLARATIONS, declarationTemplate.getInstanceFor(prevRoot,
|
||||
outQualifier,
|
||||
inTypeSpecifier.cloneInto(prevRoot),
|
||||
new Identifier(name)));
|
||||
|
||||
// add the initializer to the main function
|
||||
prevTree.prependMain(getInitializer(prevRoot, name, inType));
|
||||
|
||||
// update out declarations to prevent duplicates
|
||||
outDeclarations.put(name, null);
|
||||
|
||||
LOGGER.warn(
|
||||
"The in declaration '" + name + "' in the " + currentType.glShaderType.name()
|
||||
+ " shader is missing a corresponding out declaration in the previous stage "
|
||||
+ prevType.name() + " and has been compatibility-patched. See debugging.md for more information.");
|
||||
}
|
||||
|
||||
// patch mismatching declaration with a local variable and a cast
|
||||
else {
|
||||
// there is an out declaration for this in declaration, check if the types match
|
||||
BuiltinNumericTypeSpecifier outTypeSpecifier = outDeclarations.get(name);
|
||||
|
||||
// skip newly inserted out declarations
|
||||
if (outTypeSpecifier == null) {
|
||||
continue;
|
||||
}
|
||||
|
||||
Type inType = inTypeSpecifier.type;
|
||||
Type outType = outTypeSpecifier.type;
|
||||
|
||||
// skip if the type matches, nothing has to be done
|
||||
if (inType == outType) {
|
||||
// if the types match but it's never assigned a value,
|
||||
// an initialization is added
|
||||
if (prevRoot.identifierIndex.get(name).size() > 1) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// add an initialization statement for this declaration
|
||||
prevTree.prependMain(getInitializer(prevRoot, name, inType));
|
||||
outDeclarations.put(name, null);
|
||||
continue;
|
||||
}
|
||||
|
||||
// bail and warn on mismatching dimensionality
|
||||
if (outType.getDimension() != inType.getDimension()) {
|
||||
LOGGER.warn(
|
||||
"The in declaration '" + name + "' in the " + currentType.glShaderType.name()
|
||||
+ " shader has a mismatching dimensionality (scalar/vector/matrix) with the out declaration in the previous stage "
|
||||
+ prevType.name() + " and could not be compatibility-patched. See debugging.md for more information.");
|
||||
continue;
|
||||
}
|
||||
|
||||
boolean isVector = outType.isVector();
|
||||
|
||||
// rename all references of this out declaration to a new name (iris_)
|
||||
String newName = tagPrefix + name;
|
||||
prevRoot.identifierIndex.rename(name, newName);
|
||||
|
||||
// rename the original out declaration back to the original name
|
||||
TypeAndInitDeclaration outDeclaration = outTypeSpecifier.getAncestor(TypeAndInitDeclaration.class);
|
||||
if (outDeclaration == null) {
|
||||
continue;
|
||||
}
|
||||
|
||||
List<DeclarationMember> outMembers = outDeclaration.getMembers();
|
||||
DeclarationMember outMember = null;
|
||||
for (DeclarationMember member : outMembers) {
|
||||
if (member.getName().getName().equals(newName)) {
|
||||
outMember = member;
|
||||
}
|
||||
}
|
||||
if (outMember == null) {
|
||||
throw new IllegalStateException("The targeted out declaration member is missing!");
|
||||
}
|
||||
outMember.getName().replaceByAndDelete(new Identifier(name));
|
||||
|
||||
// move the declaration member out of the declaration in case there is more than
|
||||
// one member to avoid changing the other member's type as well.
|
||||
if (outMembers.size() > 1) {
|
||||
outMember.detach();
|
||||
outTypeSpecifier = outTypeSpecifier.cloneInto(prevRoot);
|
||||
DeclarationExternalDeclaration singleOutDeclaration = (DeclarationExternalDeclaration) declarationTemplate
|
||||
.getInstanceFor(prevRoot,
|
||||
makeQualifierOut(outDeclaration.getType().getTypeQualifier().cloneInto(prevRoot)),
|
||||
outTypeSpecifier,
|
||||
new Identifier(name));
|
||||
((TypeAndInitDeclaration) singleOutDeclaration.getDeclaration()).getMembers().set(0, outMember);
|
||||
prevTree.injectNode(ASTInjectionPoint.BEFORE_DECLARATIONS, singleOutDeclaration);
|
||||
}
|
||||
|
||||
// add a global variable with the new name and the old type
|
||||
prevTree.injectNode(ASTInjectionPoint.BEFORE_DECLARATIONS, variableTemplate.getInstanceFor(prevRoot,
|
||||
outTypeSpecifier.cloneInto(prevRoot),
|
||||
new Identifier(newName)));
|
||||
|
||||
// insert a statement at the end of the main function that sets the value of the
|
||||
// out declaration to the value of the global variable and does a type cast
|
||||
prevTree.appendMain(
|
||||
(isVector && outType.getDimensions()[0] < inType.getDimensions()[0] ? statementTemplateVector
|
||||
: statementTemplate).getInstanceFor(prevRoot,
|
||||
new Identifier(name),
|
||||
new Identifier(newName),
|
||||
inTypeSpecifier.cloneInto(prevRoot)));
|
||||
|
||||
// make the out declaration use the same type as the fragment shader
|
||||
outTypeSpecifier.replaceByAndDelete(inTypeSpecifier.cloneInto(prevRoot));
|
||||
|
||||
// don't do the patch twice
|
||||
outDeclarations.put(name, null);
|
||||
|
||||
LOGGER.warn(
|
||||
"The out declaration '" + name + "' in the " + prevType.name()
|
||||
+ " shader has a different type " + outType.getMostCompactName()
|
||||
+ " than the corresponding in declaration of type " + inType.getMostCompactName()
|
||||
+ " in the following stage " + currentType.glShaderType.name()
|
||||
+ " and has been compatibility-patched. See debugging.md for more information.");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
prevType = type;
|
||||
}
|
||||
}
|
||||
if (inType.getText().equals(outType.getText())) {
|
||||
if (!Util.hasAssigment(prevTree, in)) {
|
||||
Util.initialize(prevTree, inDec.get(in), in);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
prevType = type;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,30 +1,16 @@
|
||||
package net.coderbot.iris.pipeline.transform;
|
||||
|
||||
import io.github.douira.glsl_transformer.ast.node.TranslationUnit;
|
||||
import io.github.douira.glsl_transformer.ast.node.basic.ASTNode;
|
||||
import io.github.douira.glsl_transformer.ast.node.external_declaration.ExternalDeclaration;
|
||||
import io.github.douira.glsl_transformer.ast.query.Root;
|
||||
import io.github.douira.glsl_transformer.ast.query.match.AutoHintedMatcher;
|
||||
import io.github.douira.glsl_transformer.ast.query.match.Matcher;
|
||||
import io.github.douira.glsl_transformer.ast.transform.ASTInjectionPoint;
|
||||
import io.github.douira.glsl_transformer.ast.transform.ASTParser;
|
||||
import org.taumc.glsl.Util;
|
||||
import org.taumc.glsl.grammar.GLSLParser;
|
||||
|
||||
class CompositeDepthTransformer {
|
||||
private static final AutoHintedMatcher<ExternalDeclaration> uniformFloatCenterDepthSmooth = new AutoHintedMatcher<>(
|
||||
"uniform float centerDepthSmooth;", Matcher.externalDeclarationPattern);
|
||||
|
||||
public static void transform(
|
||||
ASTParser t,
|
||||
TranslationUnit tree,
|
||||
Root root) {
|
||||
public static void transform(GLSLParser.Translation_unitContext translationUnit) {
|
||||
// replace original declaration
|
||||
if (root.processMatches(t, uniformFloatCenterDepthSmooth, ASTNode::detachAndDelete)) {
|
||||
tree.parseAndInjectNode(t, ASTInjectionPoint.BEFORE_DECLARATIONS,
|
||||
"uniform sampler2D iris_centerDepthSmooth;");
|
||||
|
||||
// if centerDepthSmooth is not declared as a uniform, we don't make it available
|
||||
root.replaceReferenceExpressions(t, "centerDepthSmooth",
|
||||
"texture2D(iris_centerDepthSmooth, vec2(0.5)).r");
|
||||
}
|
||||
int type = Util.findType(translationUnit, "centerDepthSmooth");
|
||||
if (type != 0) {
|
||||
Util.injectVariable(translationUnit, "uniform sampler2D iris_centerDepthSmooth;");
|
||||
Util.replaceExpression(translationUnit, "centerDepthSmooth", "texture2D(iris_centerDepthSmooth, vec2(0.5)).r");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,30 +0,0 @@
|
||||
package net.coderbot.iris.pipeline.transform;
|
||||
|
||||
import io.github.douira.glsl_transformer.ast.node.TranslationUnit;
|
||||
import io.github.douira.glsl_transformer.ast.node.expression.unary.FunctionCallExpression;
|
||||
import io.github.douira.glsl_transformer.ast.query.Root;
|
||||
import io.github.douira.glsl_transformer.ast.transform.ASTInjectionPoint;
|
||||
import io.github.douira.glsl_transformer.ast.transform.ASTParser;
|
||||
|
||||
import java.util.stream.Stream;
|
||||
|
||||
class CompositeTransformer {
|
||||
public static void transform(
|
||||
ASTParser t,
|
||||
TranslationUnit tree,
|
||||
Root root) {
|
||||
CompositeDepthTransformer.transform(t, tree, root);
|
||||
|
||||
// if using a lod texture sampler and on version 120, patch in the extension
|
||||
// #extension GL_ARB_shader_texture_lod : require
|
||||
if (tree.getVersionStatement().version.number <= 120
|
||||
&& Stream.concat(
|
||||
root.identifierIndex.getStream("texture2DLod"),
|
||||
root.identifierIndex.getStream("texture3DLod"))
|
||||
.filter(id -> id.getParent() instanceof FunctionCallExpression)
|
||||
.findAny().isPresent()) {
|
||||
tree.parseAndInjectNode(t, ASTInjectionPoint.BEFORE_DECLARATIONS,
|
||||
"#extension GL_ARB_shader_texture_lod : require\n");
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,37 +0,0 @@
|
||||
package net.coderbot.iris.pipeline.transform;
|
||||
|
||||
import io.github.douira.glsl_transformer.job_parameter.JobParameters;
|
||||
|
||||
class Parameters extends JobParameters {
|
||||
public final Patch patch;
|
||||
public PatchShaderType type;
|
||||
|
||||
public Parameters(Patch patch) {
|
||||
this.patch = patch;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
final int prime = 31;
|
||||
int result = 1;
|
||||
result = prime * result + ((patch == null) ? 0 : patch.hashCode());
|
||||
result = prime * result + ((type == null) ? 0 : type.hashCode());
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object obj) {
|
||||
if (this == obj)
|
||||
return true;
|
||||
if (obj == null)
|
||||
return false;
|
||||
if (getClass() != obj.getClass())
|
||||
return false;
|
||||
Parameters other = (Parameters) obj;
|
||||
if (patch != other.patch)
|
||||
return false;
|
||||
if (type != other.type)
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
package net.coderbot.iris.pipeline.transform;
|
||||
|
||||
enum Patch {
|
||||
public enum Patch {
|
||||
ATTRIBUTES,
|
||||
SODIUM_TERRAIN,
|
||||
COMPOSITE
|
||||
|
||||
@@ -0,0 +1,329 @@
|
||||
package net.coderbot.iris.pipeline.transform;
|
||||
|
||||
import com.google.common.base.Stopwatch;
|
||||
import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap;
|
||||
import net.coderbot.iris.Iris;
|
||||
import net.coderbot.iris.gl.shader.ShaderType;
|
||||
import net.coderbot.iris.pipeline.transform.parameter.Parameters;
|
||||
import net.coderbot.iris.pipeline.transform.parameter.AttributeParameters;
|
||||
import org.antlr.v4.runtime.CharStreams;
|
||||
import org.antlr.v4.runtime.CommonTokenStream;
|
||||
import org.antlr.v4.runtime.tree.ParseTree;
|
||||
import org.antlr.v4.runtime.tree.TerminalNode;
|
||||
import org.taumc.glsl.Util;
|
||||
import org.taumc.glsl.grammar.GLSLLexer;
|
||||
import org.taumc.glsl.grammar.GLSLParser;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.EnumMap;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Objects;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
public class ShaderTransformer {
|
||||
static String tab = "";
|
||||
|
||||
private static final Pattern versionPattern = Pattern.compile("#version\\s+(\\d+)(?:\\s+(\\w+))?");
|
||||
|
||||
private static final int CACHE_SIZE = 100;
|
||||
private static final Object2ObjectLinkedOpenHashMap<TransformKey, Map<PatchShaderType, String>> shaderTransformationCache = new Object2ObjectLinkedOpenHashMap<>();
|
||||
private static final boolean useCache = true;
|
||||
|
||||
/**
|
||||
* These are words which need to be renamed by iris if a shader uses them, regardless o the GLSL version.
|
||||
* The words will get caught and renamed to iris_renamed_$WORD
|
||||
*/
|
||||
private static final List<String> fullReservedWords = new ArrayList<>();
|
||||
|
||||
/**
|
||||
* This does the same thing as fullReservedWords, but based on a maximum GLSL version. As an example
|
||||
* if something was register to 400 here, it would get applied on any version below 400.
|
||||
*/
|
||||
private static final Map<Integer, List<String>> versionedReservedWords = new HashMap<>();
|
||||
|
||||
static {
|
||||
// texture seems to be reserved by some drivers but not others, however this is not actually reserved by the GLSL spec
|
||||
fullReservedWords.add("texture");
|
||||
|
||||
// sample was added as a keyword in GLSL 400, many shaders use it
|
||||
versionedReservedWords.put(400, Arrays.asList("sample"));
|
||||
}
|
||||
|
||||
private static final class TransformKey<P extends Parameters> {
|
||||
private final Patch patchType;
|
||||
private final EnumMap<PatchShaderType, String> inputs;
|
||||
private final P params;
|
||||
|
||||
private TransformKey(Patch patchType, EnumMap<PatchShaderType, String> inputs, P params) {
|
||||
this.patchType = patchType;
|
||||
this.inputs = inputs;
|
||||
this.params = params;
|
||||
}
|
||||
|
||||
public Patch patchType() {
|
||||
return patchType;
|
||||
}
|
||||
|
||||
public EnumMap<PatchShaderType, String> inputs() {
|
||||
return inputs;
|
||||
}
|
||||
|
||||
public P params() {
|
||||
return params;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object obj) {
|
||||
if (obj == this) return true;
|
||||
if (obj == null || obj.getClass() != this.getClass()) return false;
|
||||
var that = (TransformKey) obj;
|
||||
return Objects.equals(this.patchType, that.patchType) &&
|
||||
Objects.equals(this.inputs, that.inputs) &&
|
||||
Objects.equals(this.params, that.params);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return Objects.hash(patchType, inputs, params);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "TransformKey[" +
|
||||
"patchType=" + patchType + ", " +
|
||||
"inputs=" + inputs + ", " +
|
||||
"params=" + params + ']';
|
||||
}
|
||||
}
|
||||
|
||||
public static <P extends Parameters> Map<PatchShaderType, String> transform(String vertex, String geometry, String fragment, P parameters) {
|
||||
if (vertex == null && geometry == null && fragment == null) {
|
||||
return null;
|
||||
} else {
|
||||
Map<PatchShaderType, String> result;
|
||||
|
||||
var patchType = parameters.patch;
|
||||
|
||||
EnumMap<PatchShaderType, String> inputs = new EnumMap<>(PatchShaderType.class);
|
||||
inputs.put(PatchShaderType.VERTEX, vertex);
|
||||
inputs.put(PatchShaderType.GEOMETRY, geometry);
|
||||
inputs.put(PatchShaderType.FRAGMENT, fragment);
|
||||
|
||||
var key = new TransformKey(patchType, inputs, parameters);
|
||||
|
||||
result = shaderTransformationCache.getAndMoveToFirst(key);
|
||||
if(result == null || !useCache) {
|
||||
result = transformInternal(inputs, patchType, parameters);
|
||||
// Clear this, we don't want whatever random type was last transformed being considered for the key
|
||||
parameters.type = null;
|
||||
if(shaderTransformationCache.size() >= CACHE_SIZE) {
|
||||
shaderTransformationCache.removeLast();
|
||||
}
|
||||
shaderTransformationCache.putAndMoveToLast(key, result);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
private static <P extends Parameters> Map<PatchShaderType, String> transformInternal(EnumMap<PatchShaderType, String> inputs, Patch patchType, P parameters) {
|
||||
EnumMap<PatchShaderType, String> result = new EnumMap<>(PatchShaderType.class);
|
||||
EnumMap<PatchShaderType, GLSLParser.Translation_unitContext> types = new EnumMap<>(PatchShaderType.class);
|
||||
EnumMap<PatchShaderType, String> prepatched = new EnumMap<>(PatchShaderType.class);
|
||||
List<GLSLParser.Translation_unitContext> textureLodExtensionPatches = new ArrayList<>();
|
||||
|
||||
Stopwatch watch = Stopwatch.createStarted();
|
||||
|
||||
for (PatchShaderType type : PatchShaderType.values()) {
|
||||
parameters.type = type;
|
||||
if (inputs.get(type) == null) {
|
||||
continue;
|
||||
}
|
||||
|
||||
String input = inputs.get(type);
|
||||
|
||||
Matcher matcher = versionPattern.matcher(input);
|
||||
if (!matcher.find()) {
|
||||
throw new IllegalArgumentException("No #version directive found in source code!");
|
||||
}
|
||||
|
||||
String versionString = matcher.group(1);
|
||||
if (versionString == null) {
|
||||
continue;
|
||||
}
|
||||
|
||||
String profile = "";
|
||||
int versionInt = Integer.parseInt(versionString);
|
||||
if (versionInt >= 150) {
|
||||
profile = matcher.group(2);
|
||||
if (profile == null) {
|
||||
profile = "core";
|
||||
}
|
||||
}
|
||||
|
||||
String profileString = "#version " + versionString + " " + profile + "\n";
|
||||
|
||||
// The primary reason we rename words here using regex, is because if the words cause invalid
|
||||
// GLSL, regardless of the version being used, it will cause glsl-transformation-lib to fail
|
||||
// so we need to rename them prior to passing the shader input to glsl-transformation-lib.
|
||||
for (String reservedWord : fullReservedWords) {
|
||||
String newName = "iris_renamed_" + reservedWord;
|
||||
input = input.replaceAll("\\b" + reservedWord + "\\b", newName);
|
||||
}
|
||||
for (int version : versionedReservedWords.keySet()) {
|
||||
if (versionInt < version) {
|
||||
for (String reservedWord : versionedReservedWords.get(version)) {
|
||||
String newName = "iris_renamed_" + reservedWord;
|
||||
input = input.replaceAll("\\b" + reservedWord + "\\b", newName);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
GLSLLexer lexer = new GLSLLexer(CharStreams.fromString(input));
|
||||
GLSLParser parser = new GLSLParser(new CommonTokenStream(lexer));
|
||||
parser.setBuildParseTree(true);
|
||||
var translationUnit = parser.translation_unit();
|
||||
|
||||
switch(patchType) {
|
||||
case SODIUM_TERRAIN:
|
||||
SodiumTransformer.transform(translationUnit, parameters);
|
||||
break;
|
||||
case COMPOSITE:
|
||||
CompositeDepthTransformer.transform(translationUnit);
|
||||
break;
|
||||
case ATTRIBUTES:
|
||||
AttributeTransformer.transform(translationUnit, (AttributeParameters) parameters, profile, versionInt);
|
||||
break;
|
||||
default:
|
||||
throw new IllegalStateException("Unknown patch type: " + patchType.name());
|
||||
}
|
||||
|
||||
// Check if we need to patch in texture LOD extension enabling
|
||||
if (versionInt <= 120 && (Util.containsCall(translationUnit, "texture2DLod") || Util.containsCall(translationUnit, "texture3DLod"))) {
|
||||
textureLodExtensionPatches.add(translationUnit);
|
||||
}
|
||||
|
||||
CompatibilityTransformer.transformEach(translationUnit, parameters);
|
||||
types.put(type, translationUnit);
|
||||
prepatched.put(type, profileString);
|
||||
}
|
||||
CompatibilityTransformer.transformGrouped(types, parameters);
|
||||
for (var entry : types.entrySet()) {
|
||||
// This is a hack to inject an extension declaration when the GLSL version is less than 120
|
||||
// Doing this as a string manipulation on the final shader output since it needs to put this
|
||||
// before variables, didn't see an easy way to do that with glsl-transformation-lib
|
||||
// Eventually this can probably be moved to use glsl-transformation-lib
|
||||
String formattedShader = getFormattedShader(entry.getValue(), prepatched.get(entry.getKey()));
|
||||
if (textureLodExtensionPatches.contains(entry.getValue())) {
|
||||
String[] parts = formattedShader.split("\n", 2);
|
||||
parts[1] = "#extension GL_ARB_shader_texture_lod : require\n" + parts[1];
|
||||
formattedShader = parts[0] + "\n" + parts[1];
|
||||
}
|
||||
result.put(entry.getKey(), formattedShader);
|
||||
}
|
||||
watch.stop();
|
||||
Iris.logger.info("Transformed shader for {} in {}", patchType.name(), watch);
|
||||
return result;
|
||||
}
|
||||
|
||||
public static void applyIntelHd4000Workaround(GLSLParser.Translation_unitContext translationUnit) {
|
||||
Util.renameFunctionCall(translationUnit, "ftransform", "iris_ftransform");
|
||||
}
|
||||
|
||||
|
||||
public static void replaceGlMultiTexCoordBounded(GLSLParser.Translation_unitContext translationUnit, int min, int max) {
|
||||
for (int i = min; i <= max; i++) {
|
||||
Util.replaceExpression(translationUnit, "gl_MultiTexCoord" + i, "vec4(0.0, 0.0, 0.0, 1.0)");
|
||||
}
|
||||
}
|
||||
|
||||
public static void patchMultiTexCoord3(GLSLParser.Translation_unitContext translationUnit, Parameters parameters) {
|
||||
if (parameters.type.glShaderType == ShaderType.VERTEX && Util.hasVariable(translationUnit, "gl_MultiTexCoord3") && !Util.hasVariable(translationUnit, "mc_midTexCoord")) {
|
||||
Util.rename(translationUnit, "gl_MultiTexCoord3", "mc_midTexCoord");
|
||||
Util.injectVariable(translationUnit, "attribute vec4 mc_midTexCoord;");
|
||||
}
|
||||
}
|
||||
|
||||
public static void replaceMidTexCoord(GLSLParser.Translation_unitContext translationUnit, float textureScale) {
|
||||
int type = Util.findType(translationUnit, "mc_midTexCoord");
|
||||
if (type != 0) {
|
||||
Util.removeVariable(translationUnit, "mc_midTexCoord");
|
||||
}
|
||||
Util.replaceExpression(translationUnit, "mc_midTexCoord", "iris_MidTex");
|
||||
switch (type) {
|
||||
case 0:
|
||||
return;
|
||||
case GLSLLexer.BOOL:
|
||||
return;
|
||||
case GLSLLexer.FLOAT:
|
||||
Util.injectFunction(translationUnit, "float iris_MidTex = (mc_midTexCoord.x * " + textureScale + ").x;"); //TODO go back to variable if order is fixed
|
||||
break;
|
||||
case GLSLLexer.VEC2:
|
||||
Util.injectFunction(translationUnit, "vec2 iris_MidTex = (mc_midTexCoord.xy * " + textureScale + ").xy;");
|
||||
break;
|
||||
case GLSLLexer.VEC3:
|
||||
Util.injectFunction(translationUnit, "vec3 iris_MidTex = vec3(mc_midTexCoord.xy * " + textureScale + ", 0.0);");
|
||||
break;
|
||||
case GLSLLexer.VEC4:
|
||||
Util.injectFunction(translationUnit, "vec4 iris_MidTex = vec4(mc_midTexCoord.xy * " + textureScale + ", 0.0, 1.0);");
|
||||
break;
|
||||
default:
|
||||
|
||||
}
|
||||
|
||||
Util.injectVariable(translationUnit, "in vec2 mc_midTexCoord;"); //TODO why is this inserted oddly?
|
||||
|
||||
}
|
||||
|
||||
public static void addIfNotExists(GLSLParser.Translation_unitContext translationUnit, String name, String code) {
|
||||
if (!Util.hasVariable(translationUnit, name)) {
|
||||
Util.injectVariable(translationUnit, code);
|
||||
}
|
||||
}
|
||||
|
||||
public static void addIfNotExistsType(GLSLParser.Translation_unitContext translationUnit, String name, String type) {
|
||||
if (!Util.hasVariable(translationUnit, name)) {
|
||||
Util.injectVariable(translationUnit, type + " " + name + ";");
|
||||
}
|
||||
}
|
||||
|
||||
public static String getFormattedShader(ParseTree tree, String string) {
|
||||
StringBuilder sb = new StringBuilder(string + "\n");
|
||||
getFormattedShader(tree, sb);
|
||||
return sb.toString();
|
||||
}
|
||||
|
||||
private static void getFormattedShader(ParseTree tree, StringBuilder stringBuilder) {
|
||||
if (tree instanceof TerminalNode) {
|
||||
String text = tree.getText();
|
||||
if (text.equals("<EOF>")) {
|
||||
return;
|
||||
}
|
||||
if (text.equals("#")) {
|
||||
stringBuilder.append("\n#");
|
||||
return;
|
||||
}
|
||||
stringBuilder.append(text);
|
||||
if (text.equals("{")) {
|
||||
stringBuilder.append(" \n\t");
|
||||
tab = "\t";
|
||||
}
|
||||
|
||||
if (text.equals("}")) {
|
||||
stringBuilder.deleteCharAt(stringBuilder.length() - 2);
|
||||
tab = "";
|
||||
}
|
||||
stringBuilder.append(text.equals(";") ? " \n" + tab : " ");
|
||||
} else {
|
||||
for(int i = 0; i < tree.getChildCount(); ++i) {
|
||||
getFormattedShader(tree.getChild(i), stringBuilder);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,112 +0,0 @@
|
||||
package net.coderbot.iris.pipeline.transform;
|
||||
|
||||
import io.github.douira.glsl_transformer.ast.node.TranslationUnit;
|
||||
import io.github.douira.glsl_transformer.ast.node.expression.Expression;
|
||||
import io.github.douira.glsl_transformer.ast.query.Root;
|
||||
import io.github.douira.glsl_transformer.ast.query.match.AutoHintedMatcher;
|
||||
import io.github.douira.glsl_transformer.ast.query.match.Matcher;
|
||||
import io.github.douira.glsl_transformer.ast.transform.ASTInjectionPoint;
|
||||
import io.github.douira.glsl_transformer.ast.transform.ASTParser;
|
||||
|
||||
/**
|
||||
* Does the sodium terrain transformations using glsl-transformer AST.
|
||||
*/
|
||||
class SodiumTerrainTransformer {
|
||||
public static void transform(
|
||||
ASTParser t,
|
||||
TranslationUnit tree,
|
||||
Root root,
|
||||
Parameters parameters) {
|
||||
switch (parameters.type) {
|
||||
// For Sodium patching, treat fragment and geometry the same
|
||||
case FRAGMENT:
|
||||
case GEOMETRY:
|
||||
transformFragment(t, tree, root, parameters);
|
||||
break;
|
||||
case VERTEX:
|
||||
transformVertex(t, tree, root, parameters);
|
||||
break;
|
||||
default:
|
||||
throw new IllegalStateException("Unexpected Sodium terrain patching shader type: " + parameters.type);
|
||||
}
|
||||
}
|
||||
|
||||
private static final AutoHintedMatcher<Expression> glTextureMatrix0 = new AutoHintedMatcher<>(
|
||||
"gl_TextureMatrix[0]", Matcher.expressionPattern);
|
||||
|
||||
/**
|
||||
* Transforms vertex shaders.
|
||||
*/
|
||||
public static void transformVertex(
|
||||
ASTParser t,
|
||||
TranslationUnit tree,
|
||||
Root root,
|
||||
Parameters parameters) {
|
||||
tree.parseAndInjectNodes(t, ASTInjectionPoint.BEFORE_DECLARATIONS,
|
||||
"attribute vec3 iris_Pos;",
|
||||
"attribute vec4 iris_Color;",
|
||||
"attribute vec2 iris_TexCoord;",
|
||||
"attribute vec2 iris_LightCoord;",
|
||||
"attribute vec3 iris_Normal;", // some are shared
|
||||
"uniform vec3 u_ModelScale;",
|
||||
"uniform vec2 u_TextureScale;",
|
||||
"attribute vec4 iris_ModelOffset;",
|
||||
"vec4 iris_LightTexCoord = vec4(iris_LightCoord, 0, 1);",
|
||||
"vec4 ftransform() { return gl_ModelViewProjectionMatrix * gl_Vertex; }");
|
||||
|
||||
transformShared(t, tree, root, parameters);
|
||||
|
||||
root.replaceReferenceExpressions(t, "gl_Vertex",
|
||||
"vec4((iris_Pos * u_ModelScale) + iris_ModelOffset.xyz, 1.0)");
|
||||
root.replaceReferenceExpressions(t, "gl_MultiTexCoord0",
|
||||
"vec4(iris_TexCoord * u_TextureScale, 0.0, 1.0)");
|
||||
root.replaceReferenceExpressions(t, "gl_MultiTexCoord1",
|
||||
"iris_LightTexCoord");
|
||||
root.replaceReferenceExpressions(t, "gl_MultiTexCoord2",
|
||||
"iris_LightTexCoord");
|
||||
root.rename("gl_Color", "iris_Color");
|
||||
root.rename("gl_Normal", "iris_Normal");
|
||||
root.rename("ftransform", "iris_ftransform");
|
||||
}
|
||||
|
||||
/**
|
||||
* Transforms fragment shaders. The fragment shader does only the shared things
|
||||
* from the vertex shader.
|
||||
*/
|
||||
public static void transformFragment(
|
||||
ASTParser t,
|
||||
TranslationUnit tree,
|
||||
Root root,
|
||||
Parameters parameters) {
|
||||
// interestingly there is nothing that isn't shared
|
||||
transformShared(t, tree, root, parameters);
|
||||
}
|
||||
|
||||
/**
|
||||
* Does the things that transformVertex and transformFragment have in common.
|
||||
*/
|
||||
private static void transformShared(
|
||||
ASTParser t,
|
||||
TranslationUnit tree,
|
||||
Root root,
|
||||
Parameters parameters) {
|
||||
tree.parseAndInjectNodes(t, ASTInjectionPoint.BEFORE_DECLARATIONS,
|
||||
"uniform mat4 iris_ModelViewMatrix;",
|
||||
"uniform mat4 u_ModelViewProjectionMatrix;",
|
||||
"uniform mat4 iris_NormalMatrix;",
|
||||
"uniform mat4 iris_LightmapTextureMatrix;");
|
||||
root.rename("gl_ModelViewMatrix", "iris_ModelViewMatrix");
|
||||
root.rename("gl_ModelViewProjectionMatrix", "u_ModelViewProjectionMatrix");
|
||||
root.replaceReferenceExpressions(t,
|
||||
"gl_NormalMatrix", "mat3(iris_NormalMatrix)");
|
||||
|
||||
root.replaceExpressionMatches(
|
||||
t,
|
||||
glTextureMatrix0,
|
||||
"mat4(1.0)");
|
||||
root.replaceExpressionMatches(t, glTextureMatrix1, "iris_LightmapTextureMatrix");
|
||||
}
|
||||
private static final String lightmapCoordsExpression = "iris_LightCoord";
|
||||
private static final AutoHintedMatcher<Expression> glTextureMatrix1 = new AutoHintedMatcher<>(
|
||||
"gl_TextureMatrix[1]", Matcher.expressionPattern);
|
||||
}
|
||||
@@ -0,0 +1,75 @@
|
||||
package net.coderbot.iris.pipeline.transform;
|
||||
|
||||
import net.coderbot.iris.pipeline.transform.parameter.Parameters;
|
||||
import org.taumc.glsl.Util;
|
||||
import org.taumc.glsl.grammar.GLSLParser;
|
||||
|
||||
class SodiumTransformer {
|
||||
public static void transform(GLSLParser.Translation_unitContext translationUnit, Parameters parameters) {
|
||||
switch (parameters.type) {
|
||||
// For Sodium patching, treat fragment and geometry the same
|
||||
case FRAGMENT:
|
||||
case GEOMETRY:
|
||||
transformFragment(translationUnit, parameters);
|
||||
break;
|
||||
case VERTEX:
|
||||
transformVertex(translationUnit, parameters);
|
||||
break;
|
||||
default:
|
||||
throw new IllegalStateException("Unexpected Sodium terrain patching shader type: " + parameters.type);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Transforms vertex shaders.
|
||||
*/
|
||||
public static void transformVertex(GLSLParser.Translation_unitContext translationUnit, Parameters parameters) {
|
||||
|
||||
Util.injectVariable(translationUnit, "attribute vec3 iris_Pos;");
|
||||
Util.injectVariable(translationUnit, "attribute vec4 iris_Color;");
|
||||
Util.injectVariable(translationUnit, "attribute vec2 iris_TexCoord;");
|
||||
Util.injectVariable(translationUnit, "attribute vec2 iris_LightCoord;");
|
||||
Util.injectVariable(translationUnit, "attribute vec3 iris_Normal;");
|
||||
Util.injectVariable(translationUnit, "uniform vec3 u_ModelScale;");
|
||||
Util.injectVariable(translationUnit, "uniform vec2 u_TextureScale;");
|
||||
Util.injectVariable(translationUnit, "attribute vec4 iris_ModelOffset;");
|
||||
Util.injectFunction(translationUnit, "vec4 iris_LightTexCoord = vec4(iris_LightCoord, 0, 1);");
|
||||
Util.injectFunction(translationUnit, "vec4 ftransform() { return gl_ModelViewProjectionMatrix * gl_Vertex; }");
|
||||
|
||||
transformShared(translationUnit, parameters);
|
||||
|
||||
Util.replaceExpression(translationUnit, "gl_Vertex", "vec4((iris_Pos * u_ModelScale) + iris_ModelOffset.xyz, 1.0)");
|
||||
Util.replaceExpression(translationUnit, "gl_MultiTexCoord0", "vec4(iris_TexCoord * u_TextureScale, 0.0, 1.0)");
|
||||
Util.replaceExpression(translationUnit, "gl_MultiTexCoord1", "iris_LightTexCoord");
|
||||
Util.replaceExpression(translationUnit, "gl_MultiTexCoord2", "iris_LightTexCoord");
|
||||
Util.rename(translationUnit, "gl_Color", "iris_Color");
|
||||
Util.rename(translationUnit, "gl_Normal", "iris_Normal");
|
||||
Util.rename(translationUnit, "ftransform", "iris_ftransform");
|
||||
}
|
||||
|
||||
/**
|
||||
* Transforms fragment shaders. The fragment shader does only the shared things
|
||||
* from the vertex shader.
|
||||
*/
|
||||
public static void transformFragment(GLSLParser.Translation_unitContext translationUnit, Parameters parameters) {
|
||||
// interestingly there is nothing that isn't shared
|
||||
transformShared(translationUnit, parameters);
|
||||
}
|
||||
|
||||
/**
|
||||
* Does the things that transformVertex and transformFragment have in common.
|
||||
*/
|
||||
private static void transformShared(GLSLParser.Translation_unitContext translationUnit, Parameters parameters) {
|
||||
Util.injectVariable(translationUnit, "uniform mat4 iris_ModelViewMatrix;");
|
||||
Util.injectVariable(translationUnit, "uniform mat4 u_ModelViewProjectionMatrix;");
|
||||
Util.injectVariable(translationUnit, "uniform mat4 iris_NormalMatrix;");
|
||||
Util.injectVariable(translationUnit, "uniform mat4 iris_LightmapTextureMatrix;");
|
||||
|
||||
Util.rename(translationUnit, "gl_ModelViewMatrix", "iris_ModelViewMatrix");
|
||||
Util.rename(translationUnit, "gl_ModelViewProjectionMatrix", "u_ModelViewProjectionMatrix");
|
||||
Util.replaceExpression(translationUnit, "gl_NormalMatrix", "mat3(iris_NormalMatrix)");
|
||||
|
||||
Util.replaceExpression(translationUnit, "gl_TextureMatrix[0]", "mat4(1.0)");
|
||||
Util.replaceExpression(translationUnit, "gl_TextureMatrix[1]", "iris_LightmapTextureMatrix");
|
||||
}
|
||||
}
|
||||
@@ -1,226 +1,115 @@
|
||||
package net.coderbot.iris.pipeline.transform;
|
||||
|
||||
import io.github.douira.glsl_transformer.ast.node.Identifier;
|
||||
import io.github.douira.glsl_transformer.ast.node.TranslationUnit;
|
||||
import io.github.douira.glsl_transformer.ast.node.Version;
|
||||
import io.github.douira.glsl_transformer.ast.print.PrintType;
|
||||
import io.github.douira.glsl_transformer.ast.query.Root;
|
||||
import io.github.douira.glsl_transformer.ast.transform.EnumASTTransformer;
|
||||
import io.github.douira.glsl_transformer.cst.core.SemanticException;
|
||||
import io.github.douira.glsl_transformer.cst.token_filter.ChannelFilter;
|
||||
import io.github.douira.glsl_transformer.cst.token_filter.TokenChannel;
|
||||
import io.github.douira.glsl_transformer.cst.token_filter.TokenFilter;
|
||||
import io.github.douira.glsl_transformer.util.LRUCache;
|
||||
import net.coderbot.iris.gbuffer_overrides.matching.InputAvailability;
|
||||
import net.coderbot.iris.pipeline.PatchedShaderPrinter;
|
||||
import org.antlr.v4.runtime.RecognitionException;
|
||||
import org.antlr.v4.runtime.Token;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import net.coderbot.iris.pipeline.transform.parameter.AttributeParameters;
|
||||
import net.coderbot.iris.pipeline.transform.parameter.Parameters;
|
||||
|
||||
import java.util.EnumMap;
|
||||
import java.util.LinkedHashMap;
|
||||
import java.util.Map;
|
||||
import java.util.Optional;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
/**
|
||||
* The transform patcher (triforce 2) uses glsl-transformer's ASTTransformer to
|
||||
* do shader transformation.
|
||||
*
|
||||
* The TransformPatcher does caching on the source string and associated
|
||||
* parameters. For this to work, all objects contained in a parameter must have
|
||||
* an equals method and they must never be changed after having been used for
|
||||
* patching. Since the cache also contains the source string, it doesn't need to
|
||||
* be disabled when developing shaderpacks. However, when changes are made to
|
||||
* the patcher, the cache should be disabled with {@link #useCache}.
|
||||
*
|
||||
* NOTE: This patcher expects (and ensures) that the string doesn't contain any
|
||||
* (!) preprocessor directives. The only allowed ones are #extension and #pragma
|
||||
* as they are considered "parsed" directives. If any other directive appears in
|
||||
* the string, it will throw.
|
||||
*/
|
||||
public class TransformPatcher {
|
||||
static Logger LOGGER = LogManager.getLogger(TransformPatcher.class);
|
||||
private static EnumASTTransformer<Parameters, PatchShaderType> transformer;
|
||||
private static final boolean useCache = true;
|
||||
private static final Map<CacheKey, Map<PatchShaderType, String>> cache = new LRUCache<>(400);
|
||||
|
||||
private static class CacheKey {
|
||||
final Parameters parameters;
|
||||
final String vertex;
|
||||
final String geometry;
|
||||
final String fragment;
|
||||
private static final int MAX_CACHE_ENTRIES = 400;
|
||||
private static final Map<TransformPatcher.CacheKey, Map<PatchShaderType, String>> cache = new LinkedHashMap<>(MAX_CACHE_ENTRIES + 1, .75F, true) {
|
||||
public boolean removeEldestEntry(Map.Entry eldest) {
|
||||
return size() > MAX_CACHE_ENTRIES;
|
||||
}
|
||||
};
|
||||
|
||||
public CacheKey(Parameters parameters, String vertex, String geometry, String fragment) {
|
||||
this.parameters = parameters;
|
||||
this.vertex = vertex;
|
||||
this.geometry = geometry;
|
||||
this.fragment = fragment;
|
||||
}
|
||||
private static final boolean useCache = true;
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
final int prime = 31;
|
||||
int result = 1;
|
||||
result = prime * result + ((fragment == null) ? 0 : fragment.hashCode());
|
||||
result = prime * result + ((geometry == null) ? 0 : geometry.hashCode());
|
||||
result = prime * result + ((parameters == null) ? 0 : parameters.hashCode());
|
||||
result = prime * result + ((vertex == null) ? 0 : vertex.hashCode());
|
||||
return result;
|
||||
}
|
||||
private static class CacheKey {
|
||||
final Parameters parameters;
|
||||
final String vertex;
|
||||
final String geometry;
|
||||
final String fragment;
|
||||
|
||||
@Override
|
||||
public boolean equals(Object obj) {
|
||||
if (this == obj)
|
||||
return true;
|
||||
if (obj == null)
|
||||
return false;
|
||||
if (getClass() != obj.getClass())
|
||||
return false;
|
||||
CacheKey other = (CacheKey) obj;
|
||||
if (fragment == null) {
|
||||
if (other.fragment != null)
|
||||
return false;
|
||||
} else if (!fragment.equals(other.fragment))
|
||||
return false;
|
||||
if (geometry == null) {
|
||||
if (other.geometry != null)
|
||||
return false;
|
||||
} else if (!geometry.equals(other.geometry))
|
||||
return false;
|
||||
if (parameters == null) {
|
||||
if (other.parameters != null)
|
||||
return false;
|
||||
} else if (!parameters.equals(other.parameters))
|
||||
return false;
|
||||
if (vertex == null) {
|
||||
if (other.vertex != null)
|
||||
return false;
|
||||
} else if (!vertex.equals(other.vertex))
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
public CacheKey(Parameters parameters, String vertex, String geometry, String fragment) {
|
||||
this.parameters = parameters;
|
||||
this.vertex = vertex;
|
||||
this.geometry = geometry;
|
||||
this.fragment = fragment;
|
||||
}
|
||||
|
||||
// TODO: Only do the NewLines patches if the source code isn't from
|
||||
// gbuffers_lines (what does this mean?)
|
||||
@Override
|
||||
public int hashCode() {
|
||||
final int prime = 31;
|
||||
int result = 1;
|
||||
result = prime * result + ((fragment == null) ? 0 : fragment.hashCode());
|
||||
result = prime * result + ((geometry == null) ? 0 : geometry.hashCode());
|
||||
result = prime * result + ((parameters == null) ? 0 : parameters.hashCode());
|
||||
result = prime * result + ((vertex == null) ? 0 : vertex.hashCode());
|
||||
return result;
|
||||
}
|
||||
|
||||
static TokenFilter<Parameters> parseTokenFilter = new ChannelFilter<Parameters>(TokenChannel.PREPROCESSOR) {
|
||||
@Override
|
||||
public boolean isTokenAllowed(Token token) {
|
||||
if (!super.isTokenAllowed(token)) {
|
||||
throw new SemanticException("Unparsed preprocessor directives such as '" + token.getText()
|
||||
+ "' may not be present at this stage of shader processing!");
|
||||
}
|
||||
return true;
|
||||
}
|
||||
};
|
||||
@Override
|
||||
public boolean equals(Object obj) {
|
||||
if (this == obj)
|
||||
return true;
|
||||
if (obj == null)
|
||||
return false;
|
||||
if (getClass() != obj.getClass())
|
||||
return false;
|
||||
TransformPatcher.CacheKey other = (TransformPatcher.CacheKey) obj;
|
||||
if (fragment == null) {
|
||||
if (other.fragment != null)
|
||||
return false;
|
||||
} else if (!fragment.equals(other.fragment))
|
||||
return false;
|
||||
if (geometry == null) {
|
||||
if (other.geometry != null)
|
||||
return false;
|
||||
} else if (!geometry.equals(other.geometry))
|
||||
return false;
|
||||
if (parameters == null) {
|
||||
if (other.parameters != null)
|
||||
return false;
|
||||
} else if (!parameters.equals(other.parameters))
|
||||
return false;
|
||||
if (vertex == null) {
|
||||
if (other.vertex != null)
|
||||
return false;
|
||||
} else if (!vertex.equals(other.vertex))
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
static {
|
||||
transformer = new EnumASTTransformer<Parameters, PatchShaderType>(PatchShaderType.class) {
|
||||
@Override
|
||||
public TranslationUnit parseTranslationUnit(String input) throws RecognitionException {
|
||||
// parse #version directive using an efficient regex before parsing so that the
|
||||
// parser can be set to the correct version
|
||||
Matcher matcher = versionPattern.matcher(input);
|
||||
if (!matcher.find()) {
|
||||
throw new IllegalArgumentException("No #version directive found in source code! See debugging.md for more information.");
|
||||
}
|
||||
Version version = Version.fromNumber(Integer.parseInt(matcher.group(1)));
|
||||
transformer.getLexer().version = version;
|
||||
private static Map<PatchShaderType, String> transform(String vertex, String geometry, String fragment, Parameters parameters) {
|
||||
if (vertex == null && geometry == null && fragment == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return super.parseTranslationUnit(input);
|
||||
}
|
||||
};
|
||||
transformer.setTransformation((trees, parameters) -> {
|
||||
for (PatchShaderType type : PatchShaderType.values()) {
|
||||
TranslationUnit tree = trees.get(type);
|
||||
if (tree == null) {
|
||||
continue;
|
||||
}
|
||||
// @Asek3 I have old GLSL-Transformer on JRE8, so I will off this
|
||||
//tree.outputOptions.enablePrintInfo();
|
||||
// check if this has been cached
|
||||
TransformPatcher.CacheKey key;
|
||||
Map<PatchShaderType, String> result = null;
|
||||
if (useCache) {
|
||||
key = new TransformPatcher.CacheKey(parameters, vertex, geometry, fragment);
|
||||
if (cache.containsKey(key)) {
|
||||
result = cache.get(key);
|
||||
}
|
||||
}
|
||||
|
||||
parameters.type = type;
|
||||
Root root = tree.getRoot();
|
||||
// if there is no cache result, transform the shaders
|
||||
if (result == null) {
|
||||
result = ShaderTransformer.transform(vertex, geometry, fragment, parameters);
|
||||
if (useCache) {
|
||||
cache.put(key, result);
|
||||
}
|
||||
}
|
||||
|
||||
// check for illegal references to internal Iris shader interfaces
|
||||
Optional<Identifier> violation = root.identifierIndex.prefixQueryFlat("iris_").findAny();
|
||||
if (!violation.isPresent()) {
|
||||
violation = root.identifierIndex.prefixQueryFlat("irisMain").findAny();
|
||||
}
|
||||
violation.ifPresent(id -> {
|
||||
throw new SemanticException(
|
||||
"Detected a potential reference to unstable and internal Iris shader interfaces (iris_ and irisMain). This isn't currently supported. Violation: "
|
||||
+ id.getName() + ". See debugging.md for more information.");
|
||||
});
|
||||
return result;
|
||||
}
|
||||
|
||||
Root.indexBuildSession(tree, () -> {
|
||||
switch (parameters.patch) {
|
||||
case ATTRIBUTES:
|
||||
AttributeTransformer.transform(transformer, tree, root, (AttributeParameters) parameters);
|
||||
break;
|
||||
case SODIUM_TERRAIN:
|
||||
SodiumTerrainTransformer.transform(transformer, tree, root, parameters);
|
||||
break;
|
||||
case COMPOSITE:
|
||||
CompositeTransformer.transform(transformer, tree, root);
|
||||
break;
|
||||
}
|
||||
CompatibilityTransformer.transformEach(transformer, tree, root, parameters);
|
||||
});
|
||||
}
|
||||
public static Map<PatchShaderType, String> patchAttributes(String vertex, String geometry, String fragment, InputAvailability inputs) {
|
||||
return transform(vertex, geometry, fragment, new AttributeParameters(Patch.ATTRIBUTES, geometry != null, inputs));
|
||||
}
|
||||
|
||||
// the compatibility transformer does a grouped transformation
|
||||
CompatibilityTransformer.transformGrouped(transformer, trees, parameters);
|
||||
});
|
||||
transformer.setParseTokenFilter(parseTokenFilter);
|
||||
}
|
||||
public static Map<PatchShaderType, String> patchSodiumTerrain(String vertex, String geometry, String fragment) {
|
||||
return transform(vertex, geometry, fragment, new Parameters(Patch.SODIUM_TERRAIN));
|
||||
}
|
||||
|
||||
private static final Pattern versionPattern = Pattern.compile("^.*#version\\s+(\\d+)", Pattern.DOTALL);
|
||||
|
||||
private static Map<PatchShaderType, String> transform(String vertex, String geometry, String fragment, Parameters parameters) {
|
||||
// stop if all are null
|
||||
if (vertex == null && geometry == null && fragment == null) {
|
||||
return null;
|
||||
}
|
||||
|
||||
// check if this has been cached
|
||||
CacheKey key;
|
||||
Map<PatchShaderType, String> result = null;
|
||||
if (useCache) {
|
||||
key = new CacheKey(parameters, vertex, geometry, fragment);
|
||||
if (cache.containsKey(key)) {
|
||||
result = cache.get(key);
|
||||
}
|
||||
}
|
||||
|
||||
// if there is no cache result, transform the shaders
|
||||
if (result == null) {
|
||||
transformer.setPrintType(PatchedShaderPrinter.prettyPrintShaders ? PrintType.INDENTED : PrintType.SIMPLE);
|
||||
EnumMap<PatchShaderType, String> inputs = new EnumMap<>(PatchShaderType.class);
|
||||
inputs.put(PatchShaderType.VERTEX, vertex);
|
||||
inputs.put(PatchShaderType.GEOMETRY, geometry);
|
||||
inputs.put(PatchShaderType.FRAGMENT, fragment);
|
||||
result = transformer.transform(inputs, parameters);
|
||||
if (useCache) {
|
||||
cache.put(key, result);
|
||||
}
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
public static Map<PatchShaderType, String> patchAttributes(String vertex, String geometry, String fragment, InputAvailability inputs) {
|
||||
return transform(vertex, geometry, fragment, new AttributeParameters(Patch.ATTRIBUTES, geometry != null, inputs));
|
||||
}
|
||||
|
||||
public static Map<PatchShaderType, String> patchSodiumTerrain(String vertex, String geometry, String fragment) {
|
||||
return transform(vertex, geometry, fragment, new Parameters(Patch.SODIUM_TERRAIN));
|
||||
}
|
||||
|
||||
public static Map<PatchShaderType, String> patchComposite(String vertex, String geometry, String fragment) {
|
||||
return transform(vertex, geometry, fragment, new Parameters(Patch.COMPOSITE));
|
||||
}
|
||||
public static Map<PatchShaderType, String> patchComposite(String vertex, String geometry, String fragment) {
|
||||
return transform(vertex, geometry, fragment, new Parameters(Patch.COMPOSITE));
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,43 @@
|
||||
package net.coderbot.iris.pipeline.transform.parameter;
|
||||
|
||||
import net.coderbot.iris.gbuffer_overrides.matching.InputAvailability;
|
||||
import net.coderbot.iris.pipeline.transform.Patch;
|
||||
|
||||
public class AttributeParameters extends Parameters {
|
||||
public final boolean hasGeometry;
|
||||
public final InputAvailability inputs;
|
||||
|
||||
public AttributeParameters(Patch patch, boolean hasGeometry, InputAvailability inputs) {
|
||||
super(patch);
|
||||
this.hasGeometry = hasGeometry;
|
||||
this.inputs = inputs;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
final int prime = 31;
|
||||
int result = super.hashCode();
|
||||
result = prime * result + (hasGeometry ? 1231 : 1237);
|
||||
result = prime * result + ((inputs == null) ? 0 : inputs.hashCode());
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object obj) {
|
||||
if (this == obj)
|
||||
return true;
|
||||
if (!super.equals(obj))
|
||||
return false;
|
||||
if (getClass() != obj.getClass())
|
||||
return false;
|
||||
AttributeParameters other = (AttributeParameters) obj;
|
||||
if (hasGeometry != other.hasGeometry)
|
||||
return false;
|
||||
if (inputs == null) {
|
||||
if (other.inputs != null)
|
||||
return false;
|
||||
} else if (!inputs.equals(other.inputs))
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,20 @@
|
||||
package net.coderbot.iris.pipeline.transform.parameter;
|
||||
|
||||
public interface JobParameters {
|
||||
|
||||
JobParameters EMPTY = new JobParameters() {
|
||||
@Override
|
||||
public boolean equals(Object other) {
|
||||
return other == this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return 0;
|
||||
}
|
||||
};
|
||||
|
||||
boolean equals(Object other);
|
||||
|
||||
int hashCode();
|
||||
}
|
||||
@@ -0,0 +1,37 @@
|
||||
package net.coderbot.iris.pipeline.transform.parameter;
|
||||
|
||||
import net.coderbot.iris.pipeline.transform.Patch;
|
||||
import net.coderbot.iris.pipeline.transform.PatchShaderType;
|
||||
|
||||
public class Parameters implements JobParameters {
|
||||
public final Patch patch;
|
||||
public PatchShaderType type; // may only be set by TransformPatcher
|
||||
// WARNING: adding new fields requires updating hashCode and equals methods!
|
||||
|
||||
// name of the shader, this should not be part of hash/equals
|
||||
public String name; // set by TransformPatcher
|
||||
|
||||
public Parameters(Patch patch) {
|
||||
this.patch = patch;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
final int prime = 31;
|
||||
int result = 1;
|
||||
result = prime * result + ((patch == null) ? 0 : patch.hashCode());
|
||||
return result;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object obj) {
|
||||
if (this == obj)
|
||||
return true;
|
||||
if (obj == null)
|
||||
return false;
|
||||
if (getClass() != obj.getClass())
|
||||
return false;
|
||||
Parameters other = (Parameters) obj;
|
||||
return patch == other.patch;
|
||||
}
|
||||
}
|
||||
@@ -71,7 +71,7 @@ public class PackDirectives {
|
||||
sun = properties.getSun().orElse(true);
|
||||
moon = properties.getMoon().orElse(true);
|
||||
rainDepth = properties.getRainDepth().orElse(false);
|
||||
separateAo = properties.getSeparateAo().orElse(false);
|
||||
separateAo = false; //properties.getSeparateAo().orElse(false);
|
||||
oldLighting = properties.getOldLighting().orElse(false);
|
||||
concurrentCompute = properties.getConcurrentCompute().orElse(false);
|
||||
oldHandLight = properties.getOldHandLight().orElse(true);
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
package net.coderbot.iris.uniforms;
|
||||
|
||||
import com.gtnewhorizons.angelica.config.AngelicaConfig;
|
||||
import com.gtnewhorizons.angelica.rendering.RenderingState;
|
||||
import net.coderbot.iris.gl.uniform.UniformHolder;
|
||||
import net.coderbot.iris.gl.uniform.UniformUpdateFrequency;
|
||||
import net.coderbot.iris.uniforms.transforms.SmoothedFloat;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.multiplayer.WorldClient;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import org.joml.Math;
|
||||
import org.joml.Vector3d;
|
||||
@@ -157,7 +159,8 @@ public class HardcodedCustomUniforms {
|
||||
}
|
||||
|
||||
private static int getWorldDayTime() {
|
||||
return (int) (Minecraft.getMinecraft().theWorld.getWorldTime() % 24000L);
|
||||
final WorldClient world = Minecraft.getMinecraft().theWorld;
|
||||
return (int) ((AngelicaConfig.useTotalWorldTime ? world.getWorldTime() : world.getTotalWorldTime()) % 24000L);
|
||||
// Level level = Minecraft.getMinecraft().theWorld;
|
||||
// long timeOfDay = level.getDayTime();
|
||||
// long dayTime = ((DimensionTypeAccessor) level.dimensionType()).getFixedTime().orElse(timeOfDay % 24000L);
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
package net.coderbot.iris.uniforms;
|
||||
|
||||
import static net.coderbot.iris.gl.uniform.UniformUpdateFrequency.PER_TICK;
|
||||
|
||||
import com.gtnewhorizons.angelica.config.AngelicaConfig;
|
||||
import java.util.Objects;
|
||||
import net.coderbot.iris.gl.uniform.UniformHolder;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.multiplayer.WorldClient;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
import static net.coderbot.iris.gl.uniform.UniformUpdateFrequency.PER_TICK;
|
||||
|
||||
public final class WorldTimeUniforms {
|
||||
private WorldTimeUniforms() {
|
||||
}
|
||||
@@ -25,13 +25,14 @@ public final class WorldTimeUniforms {
|
||||
}
|
||||
|
||||
static int getWorldDayTime() {
|
||||
return (int) (getWorld().getWorldTime() % 24000L);
|
||||
final WorldClient world = getWorld();
|
||||
return (int) ((AngelicaConfig.useTotalWorldTime ? world.getWorldTime() : world.getTotalWorldTime()) % 24000L);
|
||||
|
||||
// long dayTime = ((DimensionTypeAccessor) getWorld().dimensionType()).getFixedTime().orElse(timeOfDay % 24000L);
|
||||
}
|
||||
|
||||
private static int getWorldDay() {
|
||||
return (int) (getWorld().getWorldTime() / 24000L);
|
||||
return (int) (getWorld().getTotalWorldTime() / 24000L);
|
||||
}
|
||||
|
||||
private static WorldClient getWorld() {
|
||||
|
||||
@@ -1,6 +1,13 @@
|
||||
public net.minecraft.block.Block func_149641_N()Ljava/lang/String; # getTextureName
|
||||
|
||||
public net.minecraft.client.renderer.EntityRenderer func_78476_b(FI)V # void renderHand(float, int)
|
||||
public net.minecraft.client.renderer.EntityRenderer func_78481_a(FZ)F # float getFOVModifier(float, boolean)
|
||||
public net.minecraft.client.renderer.EntityRenderer func_78482_e(F)V # void hurtCameraEffect(float)
|
||||
public net.minecraft.client.renderer.EntityRenderer func_78475_f(F)V # void setupViewBobbing(float)
|
||||
public net.minecraft.client.renderer.EntityRenderer field_78503_V # cameraZoom
|
||||
public net.minecraft.client.renderer.EntityRenderer field_78502_W # cameraYaw
|
||||
public net.minecraft.client.renderer.EntityRenderer field_78509_X # cameraPitch
|
||||
public net.minecraft.client.renderer.EntityRenderer field_78530_s # farPlaneDistance
|
||||
|
||||
public net.minecraft.client.renderer.RenderGlobal field_72765_l # worldRenderers
|
||||
|
||||
|
||||
@@ -132,7 +132,9 @@ options.iris.shadowDistance.disabled=Your current shader pack has already set a
|
||||
options.iris.gui.hide=Hide GUI
|
||||
options.iris.gui.show=Show GUI
|
||||
options.dynamic_lights=Dynamic Lights
|
||||
options.dynamic_lights.tooltip=Enables dynamic lights. Modes: OFF - off, FASTEST - 500ms delay, FAST - 250ms delay, FANCY - no delay. Disabled if shaders are in use.
|
||||
options.dynamic_lights.tooltip=Enables dynamic lights. Modes: OFF - off, FASTEST - 500ms delay, FAST - 250ms delay, FANCY - 50ms delay, REALTIME - no delay.
|
||||
options.dynamic_lights_shader_force=Dynamic Lights - Forced With Shaders
|
||||
options.dynamic_lights_shader_force.tooltip=Enabled - Dynamic Lights are shown even when a shader is active, Disabled - Dynamic Lights are disabled when a shader is active.
|
||||
options.angelica.droppedItemLimit=Dropped Item Render Limit
|
||||
options.angelica.droppedItemLimit.tooltip=The maximum number of dropped items that will be rendered. Lower values can improve performance.
|
||||
pack.iris.select.title=Select
|
||||
|
||||
@@ -1,18 +0,0 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.angelica;
|
||||
|
||||
import com.gtnewhorizons.angelica.AngelicaMod;
|
||||
import net.minecraft.client.renderer.texture.TextureMap;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
@Mixin(TextureMap.class)
|
||||
public class MixinTextureMap {
|
||||
|
||||
@Inject(method = "registerIcons", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/Minecraft;getMinecraft()Lnet/minecraft/client/Minecraft;"))
|
||||
private void angelica$registerErrorBlockIcon(CallbackInfo ci) {
|
||||
TextureMap thisObject = (TextureMap)(Object)this;
|
||||
AngelicaMod.blockError.registerBlockIcons(thisObject);
|
||||
}
|
||||
}
|
||||
+41
@@ -0,0 +1,41 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.angelica.bugfixes;
|
||||
|
||||
import com.gtnewhorizons.angelica.glsm.GLStateManager;
|
||||
import com.gtnewhorizons.angelica.glsm.texture.TextureInfo;
|
||||
import com.gtnewhorizons.angelica.glsm.texture.TextureInfoCache;
|
||||
import com.llamalad7.mixinextras.sugar.Share;
|
||||
import com.llamalad7.mixinextras.sugar.ref.LocalIntRef;
|
||||
import net.minecraft.client.renderer.RenderGlobal;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
@Mixin(RenderGlobal.class)
|
||||
public class MixinRenderGlobal_DestroyBlock {
|
||||
@Inject(
|
||||
method = "drawBlockDamageTexture(Lnet/minecraft/client/renderer/Tessellator;Lnet/minecraft/entity/EntityLivingBase;F)V",
|
||||
at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/Tessellator;startDrawingQuads()V"),
|
||||
remap = false
|
||||
)
|
||||
private void iris$beginDrawBlockDamageTexture(Tessellator tessellator, EntityLivingBase entity, float partialTicks, CallbackInfo ci, @Share("lastMin") LocalIntRef lastMin, @Share("lastMag") LocalIntRef lastMag) {
|
||||
TextureInfo info = TextureInfoCache.INSTANCE.getInfo(GLStateManager.getBoundTexture());
|
||||
lastMin.set(info.getMinFilter());
|
||||
lastMag.set(info.getMagFilter());
|
||||
GLStateManager.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, GL11.GL_NEAREST);
|
||||
GLStateManager.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, GL11.GL_NEAREST);
|
||||
}
|
||||
|
||||
@Inject(
|
||||
method = "drawBlockDamageTexture(Lnet/minecraft/client/renderer/Tessellator;Lnet/minecraft/entity/EntityLivingBase;F)V",
|
||||
at = @At(value = "INVOKE", target = "Lorg/lwjgl/opengl/GL11;glPopMatrix()V"),
|
||||
remap = false
|
||||
)
|
||||
private void iris$endDrawBlockDamageTexture(Tessellator tessellator, EntityLivingBase entity, float partialTicks, CallbackInfo ci, @Share("lastMin") LocalIntRef lastMin, @Share("lastMag") LocalIntRef lastMag) {
|
||||
GLStateManager.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MIN_FILTER, lastMin.get());
|
||||
GLStateManager.glTexParameteri(GL11.GL_TEXTURE_2D, GL11.GL_TEXTURE_MAG_FILTER, lastMag.get());
|
||||
}
|
||||
}
|
||||
-15
@@ -73,19 +73,6 @@ public abstract class MixinEntity implements IDynamicLightSource {
|
||||
this.angelica$lastLuminance = 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean angelica$shouldUpdateDynamicLight() {
|
||||
if (DynamicLights.Mode.hasDelay()) {
|
||||
long currentTime = System.currentTimeMillis();
|
||||
if (currentTime < angelica$lastUpdate + DynamicLights.Mode.getDelay())
|
||||
return false;
|
||||
|
||||
angelica$lastUpdate = currentTime;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@Inject(method = "onEntityUpdate", at = @At("TAIL"))
|
||||
public void angelica$onUpdate(CallbackInfo ci) {
|
||||
@@ -111,8 +98,6 @@ public abstract class MixinEntity implements IDynamicLightSource {
|
||||
|
||||
@Override
|
||||
public boolean angelica$updateDynamicLight(@NotNull SodiumWorldRenderer renderer) {
|
||||
if (!this.angelica$shouldUpdateDynamicLight())
|
||||
return false;
|
||||
double deltaX = this.posX - this.angelica$prevX;
|
||||
double deltaY = this.posY - this.angelica$prevY;
|
||||
double deltaZ = this.posZ - this.angelica$prevZ;
|
||||
|
||||
+21
-4
@@ -12,11 +12,15 @@ import net.coderbot.iris.pipeline.WorldRenderingPhase;
|
||||
import net.coderbot.iris.pipeline.WorldRenderingPipeline;
|
||||
import net.coderbot.iris.uniforms.CapturedRenderingState;
|
||||
import net.coderbot.iris.uniforms.SystemTimeUniforms;
|
||||
import net.irisshaders.iris.api.v0.IrisApi;
|
||||
import net.minecraft.client.Minecraft;
|
||||
import net.minecraft.client.renderer.EntityRenderer;
|
||||
import net.minecraft.client.renderer.ItemRenderer;
|
||||
import net.minecraft.client.renderer.RenderGlobal;
|
||||
import net.minecraft.client.renderer.Tessellator;
|
||||
import net.minecraft.client.resources.IResourceManagerReloadListener;
|
||||
import net.minecraft.client.settings.GameSettings;
|
||||
import net.minecraft.entity.EntityLivingBase;
|
||||
import org.lwjgl.opengl.GL11;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.Shadow;
|
||||
@@ -33,7 +37,7 @@ public abstract class MixinEntityRenderer implements IResourceManagerReloadListe
|
||||
private void iris$beginRender(float partialTicks, long startTime, CallbackInfo ci, @Share("pipeline") LocalRef<WorldRenderingPipeline> pipeline) {
|
||||
CapturedRenderingState.INSTANCE.setTickDelta(partialTicks);
|
||||
SystemTimeUniforms.COUNTER.beginFrame();
|
||||
SystemTimeUniforms.TIMER.beginFrame(startTime);
|
||||
SystemTimeUniforms.TIMER.beginFrame(System.nanoTime());
|
||||
|
||||
Program.unbind();
|
||||
|
||||
@@ -42,18 +46,25 @@ public abstract class MixinEntityRenderer implements IResourceManagerReloadListe
|
||||
pipeline.get().beginLevelRendering();
|
||||
}
|
||||
|
||||
@Inject(method = "renderWorld(FJ)V", at = @At(value = "RETURN", shift = At.Shift.BEFORE))
|
||||
@Inject(method = "renderWorld(FJ)V", at = @At(value = "INVOKE", target = "Lnet/minecraftforge/client/ForgeHooksClient;dispatchRenderLast(Lnet/minecraft/client/renderer/RenderGlobal;F)V"))
|
||||
private void iris$endLevelRender(float partialTicks, long limitTime, CallbackInfo callback, @Share("pipeline") LocalRef<WorldRenderingPipeline> pipeline) {
|
||||
// TODO: Iris
|
||||
final Camera camera = new Camera(mc.renderViewEntity, partialTicks);
|
||||
HandRenderer.INSTANCE.renderTranslucent(null /*poseStack*/, partialTicks, camera, mc.renderGlobal, pipeline.get());
|
||||
HandRenderer.INSTANCE.renderTranslucent(partialTicks, camera, mc.renderGlobal, pipeline.get());
|
||||
Minecraft.getMinecraft().mcProfiler.endStartSection("iris_final");
|
||||
pipeline.get().finalizeLevelRendering();
|
||||
pipeline.set(null);
|
||||
Program.unbind();
|
||||
}
|
||||
|
||||
@Inject(at = @At(value= "INVOKE", target="Lnet/minecraft/client/renderer/RenderGlobal;clipRenderersByFrustum(Lnet/minecraft/client/renderer/culling/ICamera;F)V", shift=At.Shift.AFTER), method = "renderWorld(FJ)V")
|
||||
@WrapOperation(method = "renderHand", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/ItemRenderer;renderItemInFirstPerson(F)V"))
|
||||
private void iris$disableVanillaRenderHand(ItemRenderer instance, float partialTicks, Operation<Void> original) {
|
||||
if (!IrisApi.getInstance().isShaderPackInUse()) {
|
||||
original.call(instance, partialTicks);
|
||||
}
|
||||
}
|
||||
|
||||
@Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/RenderGlobal;clipRenderersByFrustum(Lnet/minecraft/client/renderer/culling/ICamera;F)V", shift = At.Shift.AFTER), method = "renderWorld(FJ)V")
|
||||
private void iris$beginEntities(float partialTicks, long startTime, CallbackInfo ci, @Share("pipeline") LocalRef<WorldRenderingPipeline> pipeline) {
|
||||
final Camera camera = new Camera(mc.renderViewEntity, partialTicks);
|
||||
pipeline.get().renderShadows((EntityRenderer) (Object) this, camera);
|
||||
@@ -98,4 +109,10 @@ public abstract class MixinEntityRenderer implements IResourceManagerReloadListe
|
||||
pipeline.get().setPhase(WorldRenderingPhase.NONE);
|
||||
}
|
||||
|
||||
@WrapOperation(method = "renderWorld", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/renderer/RenderGlobal;drawBlockDamageTexture(Lnet/minecraft/client/renderer/Tessellator;Lnet/minecraft/entity/EntityLivingBase;F)V"))
|
||||
private void iris$blockDamageTexture(RenderGlobal instance, Tessellator tessellator, EntityLivingBase entity, float partialTicks, Operation<Void> original, @Share("pipeline") LocalRef<WorldRenderingPipeline> pipeline) {
|
||||
pipeline.get().setPhase(WorldRenderingPhase.DESTROY);
|
||||
original.call(instance, tessellator, entity, partialTicks);
|
||||
pipeline.get().setPhase(WorldRenderingPhase.NONE);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
package com.gtnewhorizons.angelica.mixins.early.shaders;
|
||||
|
||||
import com.gtnewhorizons.angelica.compat.mojang.InteractionHand;
|
||||
import net.coderbot.iris.pipeline.HandRenderer;
|
||||
import net.irisshaders.iris.api.v0.IrisApi;
|
||||
import net.minecraft.client.renderer.ItemRenderer;
|
||||
import org.spongepowered.asm.mixin.Mixin;
|
||||
import org.spongepowered.asm.mixin.injection.At;
|
||||
import org.spongepowered.asm.mixin.injection.Inject;
|
||||
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
|
||||
|
||||
@Mixin(ItemRenderer.class)
|
||||
public class MixinItemRenderer {
|
||||
@Inject(method = "renderItemInFirstPerson", at = @At("HEAD"), cancellable = true)
|
||||
private void iris$skipTranslucentHands(float partialTicks, CallbackInfo ci) {
|
||||
if (IrisApi.getInstance().isShaderPackInUse()) {
|
||||
// TODO: Offhand
|
||||
boolean isHandTranslucent = HandRenderer.INSTANCE.isHandTranslucent(InteractionHand.MAIN_HAND);
|
||||
if (HandRenderer.INSTANCE.isRenderingSolid() && isHandTranslucent) {
|
||||
ci.cancel();
|
||||
} else if (!HandRenderer.INSTANCE.isRenderingSolid() && !isHandTranslucent) {
|
||||
ci.cancel();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
+1
-1
@@ -24,7 +24,7 @@ public class MixinRendererLivingEntity {
|
||||
final float r = (j >> 16 & 255) / 255.0F;
|
||||
final float g = (j >> 8 & 255) / 255.0F;
|
||||
final float b = (j & 255) / 255.0F;
|
||||
CapturedRenderingState.INSTANCE.setCurrentEntityColor(r, g, b, 1.0F - a);
|
||||
CapturedRenderingState.INSTANCE.setCurrentEntityColor(r, g, b, a);
|
||||
return j;
|
||||
}
|
||||
|
||||
|
||||
+13
-6
@@ -140,6 +140,14 @@ public class MixinRenderGlobal implements IRenderGlobalExt {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Unique
|
||||
private void iris$beginTranslucents(WorldRenderingPipeline pipeline, Camera camera) {
|
||||
pipeline.beginHand();
|
||||
HandRenderer.INSTANCE.renderSolid(camera.getPartialTicks(), camera, mc.renderGlobal, pipeline);
|
||||
mc.mcProfiler.endStartSection("iris_pre_translucent");
|
||||
pipeline.beginTranslucents();
|
||||
}
|
||||
|
||||
/**
|
||||
* @author Sodium
|
||||
* @reason Redirect to our renderer
|
||||
@@ -154,14 +162,13 @@ public class MixinRenderGlobal implements IRenderGlobalExt {
|
||||
if(pass == 0) {
|
||||
pipeline.setPhase(WorldRenderingPhase.TERRAIN_CUTOUT);
|
||||
} else if(pass == 1) {
|
||||
pipeline.setPhase(WorldRenderingPhase.TERRAIN_TRANSLUCENT);
|
||||
final Camera camera = new Camera(mc.renderViewEntity, (float) partialTicks);
|
||||
|
||||
// iris$beginTranslucents
|
||||
pipeline.beginHand();
|
||||
HandRenderer.INSTANCE.renderSolid(null /*poseStack*/, (float) partialTicks, camera, mc.renderGlobal, pipeline);
|
||||
mc.mcProfiler.endStartSection("iris_pre_translucent");
|
||||
pipeline.beginTranslucents();
|
||||
if (!ShadowRenderer.ACTIVE) {
|
||||
iris$beginTranslucents(pipeline, camera);
|
||||
}
|
||||
|
||||
pipeline.setPhase(WorldRenderingPhase.TERRAIN_TRANSLUCENT);
|
||||
this.renderEngine.bindTexture(TextureMap.locationBlocksTexture);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user