remove instanced rendering config option
This commit is contained in:
+3
-6
@@ -417,9 +417,6 @@ public class GlGenericObjectRenderer implements IDhGenericRenderer
|
||||
|
||||
this.init();
|
||||
|
||||
boolean useInstancedRendering = this.instancedRenderingAvailable
|
||||
&& Config.Client.Advanced.Graphics.GenericRendering.enableInstancedRendering.get();
|
||||
|
||||
ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeGenericRenderSetupEvent.class, renderEventParam);
|
||||
|
||||
|
||||
@@ -439,7 +436,7 @@ public class GlGenericObjectRenderer implements IDhGenericRenderer
|
||||
GL32.glBlendEquation(GL32.GL_FUNC_ADD);
|
||||
GLMC.glBlendFuncSeparate(GL32.GL_SRC_ALPHA, GL32.GL_ONE_MINUS_SRC_ALPHA, GL32.GL_ONE, GL32.GL_ONE_MINUS_SRC_ALPHA);
|
||||
|
||||
IDhApiGenericObjectShaderProgram shaderProgram = useInstancedRendering ? this.instancedShaderProgram : this.directShaderProgram;
|
||||
IDhApiGenericObjectShaderProgram shaderProgram = this.instancedRenderingAvailable ? this.instancedShaderProgram : this.directShaderProgram;
|
||||
IDhApiGenericObjectShaderProgram shaderProgramOverride = OverrideInjector.INSTANCE.get(IDhApiGenericObjectShaderProgram.class);
|
||||
if (shaderProgramOverride != null && shaderProgram.overrideThisFrame())
|
||||
{
|
||||
@@ -491,7 +488,7 @@ public class GlGenericObjectRenderer implements IDhGenericRenderer
|
||||
}
|
||||
|
||||
// update instanced data if needed
|
||||
if (useInstancedRendering)
|
||||
if (this.instancedRenderingAvailable)
|
||||
{
|
||||
boxGroup.tryUpdateInstancedDataAsync();
|
||||
|
||||
@@ -509,7 +506,7 @@ public class GlGenericObjectRenderer implements IDhGenericRenderer
|
||||
profiler.popPush("rendering");
|
||||
profiler.push(boxGroup.getResourceLocationNamespace());
|
||||
profiler.push(boxGroup.getResourceLocationPath());
|
||||
if (useInstancedRendering)
|
||||
if (this.instancedRenderingAvailable)
|
||||
{
|
||||
this.renderBoxGroupInstanced(shaderProgram, renderEventParam, boxGroup, camPos, profiler);
|
||||
}
|
||||
|
||||
+1
-10
@@ -220,16 +220,7 @@ public class GLProxy
|
||||
return instance;
|
||||
}
|
||||
|
||||
public EDhApiGpuUploadMethod getGpuUploadMethod()
|
||||
{
|
||||
EDhApiGpuUploadMethod uploadOverride = Config.Client.Advanced.Debugging.OpenGl.glUploadMode.get();
|
||||
if (uploadOverride == EDhApiGpuUploadMethod.AUTO)
|
||||
{
|
||||
return this.preferredUploadMethod;
|
||||
}
|
||||
|
||||
return uploadOverride;
|
||||
}
|
||||
public EDhApiGpuUploadMethod getGpuUploadMethod() { return this.preferredUploadMethod; }
|
||||
|
||||
public static boolean runningOnRenderThread()
|
||||
{
|
||||
|
||||
+1
-1
Submodule coreSubProjects updated: 6aad156a32...13895fec51
Reference in New Issue
Block a user