DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.13 is dead (followup to 8bc0b0a)

Browse Source
This commit is contained in:
Jonas Herzig
2020-03-30 01:27:57 +02:00
parent 49ea1ae40a
commit 8b7ef8d1e3
105 changed files with 300 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/com/replaymod/render/utils/PixelBufferObject.java
View File

@@ -5,7 +5,7 @@ import com.replaymod.core.ReplayMod;
import lombok.RequiredArgsConstructor;
import org.apache.logging.log4j.LogManager;
//#if MC>=11300
//#if MC>=11400
import org.lwjgl.opengl.ARBVertexBufferObject;
import org.lwjgl.opengl.GL;
//#else
@@ -20,7 +20,7 @@ import static org.lwjgl.opengl.ARBPixelBufferObject.*;
import static org.lwjgl.opengl.GL15.*;
import static org.lwjgl.opengl.GL21.GL_PIXEL_PACK_BUFFER;
//#if MC>=11300
//#if MC>=11400
import static org.lwjgl.opengl.ARBVertexBufferObject.*;
//#endif
@@ -34,7 +34,7 @@ public class PixelBufferObject {
private final int arb, gl15;
}
//#if MC>=11300
//#if MC>=11400
public static final boolean SUPPORTED = GL.getCapabilities().GL_ARB_pixel_buffer_object || GL.getCapabilities().OpenGL15;
private static final boolean arb = !GL.getCapabilities().OpenGL15;
//#else
@@ -54,7 +54,7 @@ public class PixelBufferObject {
}
this.size = size;
//#if MC>=11300
//#if MC>=11400
this.handle = arb ? ARBVertexBufferObject.glGenBuffersARB() : glGenBuffers();
//#else
//$$ this.handle = arb ? ARBBufferObject.glGenBuffersARB() : glGenBuffers();
@@ -63,7 +63,7 @@ public class PixelBufferObject {
bind();
if (arb) {
//#if MC>=11300
//#if MC>=11400
ARBVertexBufferObject.glBufferDataARB(GL_PIXEL_PACK_BUFFER_ARB, size, usage.arb);
//#else
//$$ ARBBufferObject.glBufferDataARB(GL_PIXEL_PACK_BUFFER_ARB, size, usage.arb);
@@ -84,7 +84,7 @@ public class PixelBufferObject {
public void bind() {
if (arb) {
//#if MC>=11300
//#if MC>=11400
ARBVertexBufferObject.glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, getHandle());
//#else
//$$ ARBBufferObject.glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, getHandle());
@@ -98,7 +98,7 @@ public class PixelBufferObject {
public void unbind() {
checkBound();
if (arb) {
//#if MC>=11300
//#if MC>=11400
ARBVertexBufferObject.glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, 0);
//#else
//$$ ARBBufferObject.glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, 0);
@@ -126,7 +126,7 @@ public class PixelBufferObject {
checkNotMapped();
ByteBuffer buffer;
if (arb) {
//#if MC>=11300
//#if MC>=11400
buffer = ARBVertexBufferObject.glMapBufferARB(GL_PIXEL_PACK_BUFFER_ARB, GL_READ_ONLY_ARB, size, null);
//#else
//$$ buffer = ARBBufferObject.glMapBufferARB(GL_PIXEL_PACK_BUFFER_ARB, GL_READ_ONLY_ARB, size, null);
@@ -134,7 +134,7 @@ public class PixelBufferObject {
} else {
buffer = glMapBuffer(GL_PIXEL_PACK_BUFFER, GL_READ_ONLY, size, null);
}
//#if MC<11300
//#if MC<11400
//$$ if (buffer == null) {
//$$ Util.checkGLError();
//$$ }
@@ -148,7 +148,7 @@ public class PixelBufferObject {
checkNotMapped();
ByteBuffer buffer;
if (arb) {
//#if MC>=11300
//#if MC>=11400
buffer = ARBVertexBufferObject.glMapBufferARB(GL_PIXEL_PACK_BUFFER_ARB, GL_WRITE_ONLY_ARB, size, null);
//#else
//$$ buffer = ARBBufferObject.glMapBufferARB(GL_PIXEL_PACK_BUFFER_ARB, GL_WRITE_ONLY_ARB, size, null);
@@ -156,7 +156,7 @@ public class PixelBufferObject {
} else {
buffer = glMapBuffer(GL_PIXEL_PACK_BUFFER, GL_WRITE_ONLY, size, null);
}
//#if MC<11300
//#if MC<11400
//$$ if (buffer == null) {
//$$ Util.checkGLError();
//$$ }
@@ -170,7 +170,7 @@ public class PixelBufferObject {
checkNotMapped();
ByteBuffer buffer;
if (arb) {
//#if MC>=11300
//#if MC>=11400
buffer = ARBVertexBufferObject.glMapBufferARB(GL_PIXEL_PACK_BUFFER_ARB, GL_READ_WRITE_ARB, size, null);
//#else
//$$ buffer = ARBBufferObject.glMapBufferARB(GL_PIXEL_PACK_BUFFER_ARB, GL_READ_WRITE_ARB, size, null);
@@ -178,7 +178,7 @@ public class PixelBufferObject {
} else {
buffer = glMapBuffer(GL_PIXEL_PACK_BUFFER, GL_READ_WRITE, size, null);
}
//#if MC<11300
//#if MC<11400
//$$ if (buffer == null) {
//$$ Util.checkGLError();
//$$ }
@@ -193,7 +193,7 @@ public class PixelBufferObject {
throw new IllegalStateException("Buffer not mapped.");
}
if (arb) {
//#if MC>=11300
//#if MC>=11400
ARBVertexBufferObject.glUnmapBufferARB(GL_PIXEL_PACK_BUFFER_ARB);
//#else
//$$ ARBBufferObject.glUnmapBufferARB(GL_PIXEL_PACK_BUFFER_ARB);
@@ -207,7 +207,7 @@ public class PixelBufferObject {
public void delete() {
if (handle != -1) {
if (arb) {
//#if MC>=11300
//#if MC>=11400
ARBVertexBufferObject.glDeleteBuffersARB(getHandle());
//#else
//$$ ARBBufferObject.glDeleteBuffersARB(getHandle());