mirror of
https://github.com/GTNewHorizons/Angelica.git
synced 2026-11-17 02:55:02 +00:00
Pass texturemap to composite shader and honor texture replacements (#1589)
This commit is contained in:
1 parent
52b0db2566
commit
29f8d718cc
6 files changed
+84
-15
No files matched your search
@@ -146,7 +146,7 @@ public class FinalPassRenderer {
|
||||
GLStateManager.glBindFramebuffer(GL30.GL_READ_FRAMEBUFFER, 0);
|
||||
}
|
||||
|
||||
private static Map<PatchShaderType, String> getTransformed(ProgramSource source, CompletableFuture<Map<PatchShaderType, String>> precomputedTransformFuture, String stageName) {
|
||||
private Map<PatchShaderType, String> getTransformed(ProgramSource source, CompletableFuture<Map<PatchShaderType, String>> precomputedTransformFuture, String stageName) {
|
||||
if (precomputedTransformFuture != null) {
|
||||
try {
|
||||
final Map<PatchShaderType, String> result = precomputedTransformFuture.join();
|
||||
@@ -157,7 +157,14 @@ public class FinalPassRenderer {
|
||||
throw new RuntimeException("Shader transformation failed for '" + source.getName() + "' in stage '" + stageName + "'", e.getCause() != null ? e.getCause() : e);
|
||||
}
|
||||
}
|
||||
return TransformPatcher.patchComposite(source.getVertexSource().orElseThrow(NullPointerException::new), source.getGeometrySource().orElse(null), source.getTessControlSource().orElse(null), source.getTessEvalSource().orElse(null), source.getFragmentSource().orElseThrow(NullPointerException::new));
|
||||
return TransformPatcher.patchComposite(
|
||||
source.getVertexSource().orElseThrow(NullPointerException::new),
|
||||
source.getGeometrySource().orElse(null),
|
||||
source.getTessControlSource().orElse(null),
|
||||
source.getTessEvalSource().orElse(null),
|
||||
source.getFragmentSource().orElseThrow(NullPointerException::new),
|
||||
TextureStage.COMPOSITE_AND_FINAL,
|
||||
pipeline != null ? pipeline.getTextureMap() : null);
|
||||
}
|
||||
|
||||
private static final class Pass {
|
||||
|
||||
Reference in new issue
Block a user