mirrors/Flywheel
0
0
Fork 0
mirror of https://github.com/Jozufozu/Flywheel.git synced 2024-12-26 23:18:04 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #162 from marchermans/1.18/dev

Browse source 
Switch to the block vertex format for instancing
This commit is contained in:
PepperCode1 2022-12-08 15:05:16 -08:00 committed by GitHub
commit 8a64d56d6c
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/com/jozufozu/flywheel/backend/instancing/instancing/InstancedMaterialGroup.java
View file

@ -94,7 +94,7 @@ public class InstancedMaterialGroup<P extends WorldProgram> implements MaterialG
if (material.nothingToRender()) continue; if (material.nothingToRender()) continue;
P program = owner.context.getProgram(ProgramContext.create(entry.getKey() P program = owner.context.getProgram(ProgramContext.create(entry.getKey()
.getProgramSpec(), Formats.POS_TEX_NORMAL, layer)); .getProgramSpec(), Formats.BLOCK, layer));
// XXX Shader is bound and not reset or restored // XXX Shader is bound and not reset or restored
program.bind(); program.bind();
@ -155,7 +155,7 @@ public class InstancedMaterialGroup<P extends WorldProgram> implements MaterialG
.onAMDWindows()) { .onAMDWindows()) {
return FallbackAllocator.INSTANCE; return FallbackAllocator.INSTANCE;
} else { } else {
return new ModelPool(Formats.POS_TEX_NORMAL); return new ModelPool(Formats.BLOCK);
} }
} }
} }

2
src/main/java/com/jozufozu/flywheel/backend/model/FallbackAllocator.java
View file

@ -8,7 +8,7 @@ public enum FallbackAllocator implements ModelAllocator {
@Override @Override
public BufferedModel alloc(Model model, Callback allocationCallback) { public BufferedModel alloc(Model model, Callback allocationCallback) {
IndexedModel out = new IndexedModel(model, Formats.POS_TEX_NORMAL); IndexedModel out = new IndexedModel(model, Formats.BLOCK);
allocationCallback.onAlloc(out); allocationCallback.onAlloc(out);
return out; return out;
} }