wisplite/distant-horizons-core-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reformat GL objects

Browse Source
This commit is contained in:
James Seibel
2023-10-24 07:30:17 -05:00
parent b1e97214ec
commit 0d76a8edfe
12 changed files with 499 additions and 401 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/seibel/distanthorizons/core/render/glObject/texture/DHDepthTexture.java
+2 -2
View File
@@ -9,7 +9,7 @@ import java.nio.ByteBuffer;
public class DHDepthTexture
{
private int id;
public DHDepthTexture(int width, int height, DHDepthBufferFormat format)
public DHDepthTexture(int width, int height, EDhDepthBufferFormat format)
{
this.id = GL43C.glGenTextures();
@@ -28,7 +28,7 @@ public class DHDepthTexture
this.id = id;
}
public void resize(int width, int height, DHDepthBufferFormat format)
public void resize(int width, int height, EDhDepthBufferFormat format)
{
GL43C.glBindTexture(GL43C.GL_TEXTURE_2D, getTextureId());
GL43C.glTexImage2D(GL11C.GL_TEXTURE_2D, 0, format.getGlInternalFormat(), width, height, 0,
core/src/main/java/com/seibel/distanthorizons/core/render/glObject/texture/DHInternalTextureFormat.java
-108
View File
@@ -1,108 +0,0 @@
package com.seibel.distanthorizons.core.render.glObject.texture;
import org.lwjgl.opengl.GL11C;
import org.lwjgl.opengl.GL30C;
import org.lwjgl.opengl.GL31C;
import java.util.Locale;
import java.util.Optional;
public enum DHInternalTextureFormat {
// Default
// TODO: This technically shouldn't be exposed to shaders since it's not in the specification, it's the default anyways
RGBA(GL11C.GL_RGBA, GlVersion.GL_11, DHPixelFormat.RGBA),
// 8-bit normalized
R8(GL30C.GL_R8, GlVersion.GL_30, DHPixelFormat.RED),
RG8(GL30C.GL_RG8, GlVersion.GL_30, DHPixelFormat.RG),
RGB8(GL11C.GL_RGB8, GlVersion.GL_11, DHPixelFormat.RGB),
RGBA8(GL11C.GL_RGBA8, GlVersion.GL_11, DHPixelFormat.RGBA),
// 8-bit signed normalized
R8_SNORM(GL31C.GL_R8_SNORM, GlVersion.GL_31, DHPixelFormat.RED),
RG8_SNORM(GL31C.GL_RG8_SNORM, GlVersion.GL_31, DHPixelFormat.RG),
RGB8_SNORM(GL31C.GL_RGB8_SNORM, GlVersion.GL_31, DHPixelFormat.RGB),
RGBA8_SNORM(GL31C.GL_RGBA8_SNORM, GlVersion.GL_31, DHPixelFormat.RGBA),
// 16-bit normalized
R16(GL30C.GL_R16, GlVersion.GL_30, DHPixelFormat.RED),
RG16(GL30C.GL_RG16, GlVersion.GL_30, DHPixelFormat.RG),
RGB16(GL11C.GL_RGB16, GlVersion.GL_11, DHPixelFormat.RGB),
RGBA16(GL11C.GL_RGBA16, GlVersion.GL_11, DHPixelFormat.RGBA),
// 16-bit signed normalized
R16_SNORM(GL31C.GL_R16_SNORM, GlVersion.GL_31, DHPixelFormat.RED),
RG16_SNORM(GL31C.GL_RG16_SNORM, GlVersion.GL_31, DHPixelFormat.RG),
RGB16_SNORM(GL31C.GL_RGB16_SNORM, GlVersion.GL_31, DHPixelFormat.RGB),
RGBA16_SNORM(GL31C.GL_RGBA16_SNORM, GlVersion.GL_31, DHPixelFormat.RGBA),
// 16-bit float
R16F(GL30C.GL_R16F, GlVersion.GL_30, DHPixelFormat.RED),
RG16F(GL30C.GL_RG16F, GlVersion.GL_30, DHPixelFormat.RG),
RGB16F(GL30C.GL_RGB16F, GlVersion.GL_30, DHPixelFormat.RGB),
RGBA16F(GL30C.GL_RGBA16F, GlVersion.GL_30, DHPixelFormat.RGBA),
// 32-bit float
R32F(GL30C.GL_R32F, GlVersion.GL_30, DHPixelFormat.RED),
RG32F(GL30C.GL_RG32F, GlVersion.GL_30, DHPixelFormat.RG),
RGB32F(GL30C.GL_RGB32F, GlVersion.GL_30, DHPixelFormat.RGB),
RGBA32F(GL30C.GL_RGBA32F, GlVersion.GL_30, DHPixelFormat.RGBA),
// 8-bit integer
R8I(GL30C.GL_R8I, GlVersion.GL_30, DHPixelFormat.RED_INTEGER),
RG8I(GL30C.GL_RG8I, GlVersion.GL_30, DHPixelFormat.RG_INTEGER),
RGB8I(GL30C.GL_RGB8I, GlVersion.GL_30, DHPixelFormat.RGB_INTEGER),
RGBA8I(GL30C.GL_RGBA8I, GlVersion.GL_30, DHPixelFormat.RGBA_INTEGER),
// 8-bit unsigned integer
R8UI(GL30C.GL_R8UI, GlVersion.GL_30, DHPixelFormat.RED_INTEGER),
RG8UI(GL30C.GL_RG8UI, GlVersion.GL_30, DHPixelFormat.RG_INTEGER),
RGB8UI(GL30C.GL_RGB8UI, GlVersion.GL_30, DHPixelFormat.RGB_INTEGER),
RGBA8UI(GL30C.GL_RGBA8UI, GlVersion.GL_30, DHPixelFormat.RGBA_INTEGER),
// 16-bit integer
R16I(GL30C.GL_R16I, GlVersion.GL_30, DHPixelFormat.RED_INTEGER),
RG16I(GL30C.GL_RG16I, GlVersion.GL_30, DHPixelFormat.RG_INTEGER),
RGB16I(GL30C.GL_RGB16I, GlVersion.GL_30, DHPixelFormat.RGB_INTEGER),
RGBA16I(GL30C.GL_RGBA16I, GlVersion.GL_30, DHPixelFormat.RGBA_INTEGER),
// 16-bit unsigned integer
R16UI(GL30C.GL_R16UI, GlVersion.GL_30, DHPixelFormat.RED_INTEGER),
RG16UI(GL30C.GL_RG16UI, GlVersion.GL_30, DHPixelFormat.RG_INTEGER),
RGB16UI(GL30C.GL_RGB16UI, GlVersion.GL_30, DHPixelFormat.RGB_INTEGER),
RGBA16UI(GL30C.GL_RGBA16UI, GlVersion.GL_30, DHPixelFormat.RGBA_INTEGER),
// 32-bit integer
R32I(GL30C.GL_R32I, GlVersion.GL_30, DHPixelFormat.RED_INTEGER),
RG32I(GL30C.GL_RG32I, GlVersion.GL_30, DHPixelFormat.RG_INTEGER),
RGB32I(GL30C.GL_RGB32I, GlVersion.GL_30, DHPixelFormat.RGB_INTEGER),
RGBA32I(GL30C.GL_RGBA32I, GlVersion.GL_30, DHPixelFormat.RGBA_INTEGER),
// 32-bit unsigned integer
R32UI(GL30C.GL_R32UI, GlVersion.GL_30, DHPixelFormat.RED_INTEGER),
RG32UI(GL30C.GL_RG32UI, GlVersion.GL_30, DHPixelFormat.RG_INTEGER),
RGB32UI(GL30C.GL_RGB32UI, GlVersion.GL_30, DHPixelFormat.RGB_INTEGER),
RGBA32UI(GL30C.GL_RGBA32UI, GlVersion.GL_30, DHPixelFormat.RGBA_INTEGER),
// Mixed
R3_G3_B2(GL11C.GL_R3_G3_B2, GlVersion.GL_11, DHPixelFormat.RGB),
RGB5_A1(GL11C.GL_RGB5_A1, GlVersion.GL_11, DHPixelFormat.RGBA),
RGB10_A2(GL11C.GL_RGB10_A2, GlVersion.GL_11, DHPixelFormat.RGBA),
R11F_G11F_B10F(GL30C.GL_R11F_G11F_B10F, GlVersion.GL_30, DHPixelFormat.RGB),
RGB9_E5(GL30C.GL_RGB9_E5, GlVersion.GL_30, DHPixelFormat.RGB);
private final int glFormat;
private final GlVersion minimumGlVersion;
private final DHPixelFormat expectedPixelFormat;
DHInternalTextureFormat(int glFormat, GlVersion minimumGlVersion, DHPixelFormat expectedPixelFormat) {
this.glFormat = glFormat;
this.minimumGlVersion = minimumGlVersion;
this.expectedPixelFormat = expectedPixelFormat;
}
public static Optional<DHInternalTextureFormat> fromString(String name) {
try {
return Optional.of(DHInternalTextureFormat.valueOf(name.toUpperCase(Locale.US)));
} catch (IllegalArgumentException e) {
return Optional.empty();
}
}
public int getGlFormat() {
return glFormat;
}
public DHPixelFormat getPixelFormat() { return expectedPixelFormat; }
public GlVersion getMinimumGlVersion() {
return minimumGlVersion;
}
}
core/src/main/java/com/seibel/distanthorizons/core/render/glObject/texture/DHPixelFormat.java
-53
View File
@@ -1,53 +0,0 @@
package com.seibel.distanthorizons.core.render.glObject.texture;
import org.lwjgl.opengl.GL11C;
import org.lwjgl.opengl.GL12C;
import org.lwjgl.opengl.GL30C;
import java.util.Locale;
import java.util.Optional;
public enum DHPixelFormat {
RED(GL11C.GL_RED, GlVersion.GL_11, false),
RG(GL30C.GL_RG, GlVersion.GL_30, false),
RGB(GL11C.GL_RGB, GlVersion.GL_11, false),
BGR(GL12C.GL_BGR, GlVersion.GL_12, false),
RGBA(GL11C.GL_RGBA, GlVersion.GL_11, false),
BGRA(GL12C.GL_BGRA, GlVersion.GL_12, false),
RED_INTEGER(GL30C.GL_RED_INTEGER, GlVersion.GL_30, true),
RG_INTEGER(GL30C.GL_RG_INTEGER, GlVersion.GL_30, true),
RGB_INTEGER(GL30C.GL_RGB_INTEGER, GlVersion.GL_30, true),
BGR_INTEGER(GL30C.GL_BGR_INTEGER, GlVersion.GL_30, true),
RGBA_INTEGER(GL30C.GL_RGBA_INTEGER, GlVersion.GL_30, true),
BGRA_INTEGER(GL30C.GL_BGRA_INTEGER, GlVersion.GL_30, true);
private final int glFormat;
private final GlVersion minimumGlVersion;
private final boolean isInteger;
DHPixelFormat(int glFormat, GlVersion minimumGlVersion, boolean isInteger) {
this.glFormat = glFormat;
this.minimumGlVersion = minimumGlVersion;
this.isInteger = isInteger;
}
public static Optional<DHPixelFormat> fromString(String name) {
try {
return Optional.of(DHPixelFormat.valueOf(name.toUpperCase(Locale.US)));
} catch (IllegalArgumentException e) {
return Optional.empty();
}
}
public int getGlFormat() {
return glFormat;
}
public GlVersion getMinimumGlVersion() {
return minimumGlVersion;
}
public boolean isInteger() {
return isInteger;
}
}
core/src/main/java/com/seibel/distanthorizons/core/render/glObject/texture/DHPixelType.java
-55
View File
@@ -1,55 +0,0 @@
package com.seibel.distanthorizons.core.render.glObject.texture;
import org.lwjgl.opengl.GL11C;
import org.lwjgl.opengl.GL12C;
import org.lwjgl.opengl.GL30C;
import java.util.Locale;
import java.util.Optional;
public enum DHPixelType {
BYTE(GL11C.GL_BYTE, GlVersion.GL_11),
SHORT(GL11C.GL_SHORT, GlVersion.GL_11),
INT(GL11C.GL_INT, GlVersion.GL_11),
HALF_FLOAT(GL30C.GL_HALF_FLOAT, GlVersion.GL_30),
FLOAT(GL11C.GL_FLOAT, GlVersion.GL_11),
UNSIGNED_BYTE(GL11C.GL_UNSIGNED_BYTE, GlVersion.GL_11),
UNSIGNED_BYTE_3_3_2(GL12C.GL_UNSIGNED_BYTE_3_3_2, GlVersion.GL_12),
UNSIGNED_BYTE_2_3_3_REV(GL12C.GL_UNSIGNED_BYTE_2_3_3_REV, GlVersion.GL_12),
UNSIGNED_SHORT(GL11C.GL_UNSIGNED_SHORT, GlVersion.GL_11),
UNSIGNED_SHORT_5_6_5(GL12C.GL_UNSIGNED_SHORT_5_6_5, GlVersion.GL_12),
UNSIGNED_SHORT_5_6_5_REV(GL12C.GL_UNSIGNED_SHORT_5_6_5_REV, GlVersion.GL_12),
UNSIGNED_SHORT_4_4_4_4(GL12C.GL_UNSIGNED_SHORT_4_4_4_4, GlVersion.GL_12),
UNSIGNED_SHORT_4_4_4_4_REV(GL12C.GL_UNSIGNED_SHORT_4_4_4_4_REV, GlVersion.GL_12),
UNSIGNED_SHORT_5_5_5_1(GL12C.GL_UNSIGNED_SHORT_5_5_5_1, GlVersion.GL_12),
UNSIGNED_SHORT_1_5_5_5_REV(GL12C.GL_UNSIGNED_SHORT_1_5_5_5_REV, GlVersion.GL_12),
UNSIGNED_INT(GL11C.GL_UNSIGNED_INT, GlVersion.GL_11),
UNSIGNED_INT_8_8_8_8(GL12C.GL_UNSIGNED_INT_8_8_8_8, GlVersion.GL_12),
UNSIGNED_INT_8_8_8_8_REV(GL12C.GL_UNSIGNED_INT_8_8_8_8_REV, GlVersion.GL_12),
UNSIGNED_INT_10_10_10_2(GL12C.GL_UNSIGNED_INT_10_10_10_2, GlVersion.GL_12),
UNSIGNED_INT_2_10_10_10_REV(GL12C.GL_UNSIGNED_INT_2_10_10_10_REV, GlVersion.GL_12);
private final int glFormat;
private final GlVersion minimumGlVersion;
DHPixelType(int glFormat, GlVersion minimumGlVersion) {
this.glFormat = glFormat;
this.minimumGlVersion = minimumGlVersion;
}
public static Optional<DHPixelType> fromString(String name) {
try {
return Optional.of(DHPixelType.valueOf(name.toUpperCase(Locale.US)));
} catch (IllegalArgumentException e) {
return Optional.empty();
}
}
public int getGlFormat() {
return glFormat;
}
public GlVersion getMinimumGlVersion() {
return minimumGlVersion;
}
}
core/src/main/java/com/seibel/distanthorizons/core/render/glObject/texture/DHColorTexture.java → core/src/main/java/com/seibel/distanthorizons/core/render/glObject/texture/DhColorTexture.java
+96 -76
View File
@@ -7,11 +7,11 @@ import org.lwjgl.opengl.GL43C;
import java.nio.ByteBuffer;
public class DHColorTexture
public class DhColorTexture
{
private final DHInternalTextureFormat internalFormat;
private final DHPixelFormat format;
private final DHPixelType type;
private final EDhInternalTextureFormat internalFormat;
private final EDhPixelFormat format;
private final EDhPixelType type;
private int width;
private int height;
@@ -19,136 +19,156 @@ public class DHColorTexture
private final int texture;
private static final ByteBuffer NULL_BUFFER = null;
public DHColorTexture(Builder builder) {
//=============//
// constructor //
//=============//
public DhColorTexture(Builder builder)
{
this.isValid = true;
this.internalFormat = builder.internalFormat;
this.format = builder.format;
this.type = builder.type;
this.width = builder.width;
this.height = builder.height;
this.texture = GL43C.glGenTextures();
boolean isPixelFormatInteger = builder.internalFormat.getPixelFormat().isInteger();
setupTexture(texture, builder.width, builder.height, !isPixelFormatInteger);
// Clean up after ourselves
// This is strictly defensive to ensure that other buggy code doesn't tamper with our textures
GL43C.glBindTexture(GL43C.GL_TEXTURE_2D, 0);
}
private void setupTexture(int texture, int width, int height, boolean allowsLinear) {
//=========//
// methods //
//=========//
private void setupTexture(int texture, int width, int height, boolean allowsLinear)
{
resizeTexture(texture, width, height);
GL43C.glTexParameteri(GL11C.GL_TEXTURE_2D, GL11C.GL_TEXTURE_MIN_FILTER, allowsLinear ? GL11C.GL_LINEAR : GL11C.GL_NEAREST);
GL43C.glTexParameteri(GL11C.GL_TEXTURE_2D, GL11C.GL_TEXTURE_MAG_FILTER, allowsLinear ? GL11C.GL_LINEAR : GL11C.GL_NEAREST);
GL43C.glTexParameteri(GL11C.GL_TEXTURE_2D, GL11C.GL_TEXTURE_WRAP_S, GL13C.GL_CLAMP_TO_EDGE);
GL43C.glTexParameteri(GL11C.GL_TEXTURE_2D, GL11C.GL_TEXTURE_WRAP_T, GL13C.GL_CLAMP_TO_EDGE);
}
private void resizeTexture(int texture, int width, int height) {
private void resizeTexture(int texture, int width, int height)
{
GL43C.glBindTexture(GL43C.GL_TEXTURE_2D, texture);
GL43C.glTexImage2D(GL11C.GL_TEXTURE_2D, 0, internalFormat.getGlFormat(), width, height, 0, format.getGlFormat(), type.getGlFormat(), NULL_BUFFER);
}
void resize(Vector2i textureScaleOverride) {
this.resize(textureScaleOverride.x, textureScaleOverride.y);
}
void resize(Vector2i textureScaleOverride) { this.resize(textureScaleOverride.x, textureScaleOverride.y); }
// Package private, call CompositeRenderTargets#resizeIfNeeded instead.
public void resize(int width, int height) {
public void resize(int width, int height)
{
requireValid();
this.width = width;
this.height = height;
resizeTexture(texture, width, height);
}
public DHInternalTextureFormat getInternalFormat() {
return internalFormat;
}
public int getTexture() {
public EDhInternalTextureFormat getInternalFormat() { return internalFormat; }
public int getTexture()
{
requireValid();
return texture;
}
public int getWidth() {
return width;
}
public int getHeight() {
return height;
}
public void destroy() {
public int getWidth() { return width; }
public int getHeight() { return height; }
public void destroy()
{
requireValid();
isValid = false;
GL43C.glDeleteTextures(texture);
}
private void requireValid() {
if (!isValid) {
private void requireValid()
{
if (!isValid)
{
throw new IllegalStateException("Attempted to use a deleted composite render target");
}
}
public static Builder builder() {
return new Builder();
}
public static class Builder {
private DHInternalTextureFormat internalFormat = DHInternalTextureFormat.RGBA8;
public static Builder builder() { return new Builder(); }
//================//
// helper classes //
//================//
public static class Builder
{
private EDhInternalTextureFormat internalFormat = EDhInternalTextureFormat.RGBA8;
private int width = 0;
private int height = 0;
private DHPixelFormat format = DHPixelFormat.RGBA;
private DHPixelType type = DHPixelType.UNSIGNED_BYTE;
private Builder() {
private EDhPixelFormat format = EDhPixelFormat.RGBA;
private EDhPixelType type = EDhPixelType.UNSIGNED_BYTE;
private Builder()
{
// No-op
}
public Builder setInternalFormat(DHInternalTextureFormat format) {
public Builder setInternalFormat(EDhInternalTextureFormat format)
{
this.internalFormat = format;
return this;
}
public Builder setDimensions(int width, int height) {
if (width <= 0) {
public Builder setDimensions(int width, int height)
{
if (width <= 0)
{
throw new IllegalArgumentException("Width must be greater than zero");
}
if (height <= 0) {
if (height <= 0)
{
throw new IllegalArgumentException("Height must be greater than zero");
}
this.width = width;
this.height = height;
return this;
}
public Builder setPixelFormat(DHPixelFormat pixelFormat) {
public Builder setPixelFormat(EDhPixelFormat pixelFormat)
{
this.format = pixelFormat;
return this;
}
public Builder setPixelType(DHPixelType pixelType) {
public Builder setPixelType(EDhPixelType pixelType)
{
this.type = pixelType;
return this;
}
public DHColorTexture build() {
return new DHColorTexture(this);
}
public DhColorTexture build() { return new DhColorTexture(this); }
}
}
core/src/main/java/com/seibel/distanthorizons/core/render/glObject/texture/DHFramebuffer.java → core/src/main/java/com/seibel/distanthorizons/core/render/glObject/texture/DhFramebuffer.java
+80 -57
View File
@@ -5,14 +5,23 @@ import it.unimi.dsi.fastutil.ints.Int2IntMap;
import org.lwjgl.opengl.GL30C;
import org.lwjgl.opengl.GL43C;
public class DHFramebuffer {
// TODO lowercase
public class DhFramebuffer
{
private final Int2IntMap attachments;
private final int maxDrawBuffers;
private final int maxColorAttachments;
private boolean hasDepthAttachment;
private int id;
public DHFramebuffer() {
//=============//
// constructor //
//=============//
public DhFramebuffer()
{
id = GL43C.glGenFramebuffers();
this.attachments = new Int2IntArrayMap();
@@ -21,8 +30,9 @@ public class DHFramebuffer {
this.hasDepthAttachment = false;
}
// For internal use in Iris. Do not use in DH.
public DHFramebuffer(int id) {
/** For internal use in Iris. Do not use in DH. */
public DhFramebuffer(int id)
{
this.id = id;
this.attachments = new Int2IntArrayMap();
@@ -30,20 +40,31 @@ public class DHFramebuffer {
this.maxColorAttachments = GL43C.glGetInteger(GL30C.GL_MAX_COLOR_ATTACHMENTS);
this.hasDepthAttachment = false;
}
public void addDepthAttachment(int texture, DHDepthBufferFormat depthBufferFormat) {
//=========//
// methods //
//=========//
public void addDepthAttachment(int texture, EDhDepthBufferFormat depthBufferFormat)
{
bind();
if (depthBufferFormat.isCombinedStencil()) {
if (depthBufferFormat.isCombinedStencil())
{
GL43C.glFramebufferTexture2D(GL30C.GL_FRAMEBUFFER, GL30C.GL_DEPTH_STENCIL_ATTACHMENT, GL30C.GL_TEXTURE_2D, texture, 0);
} else {
}
else
{
GL43C.glFramebufferTexture2D(GL30C.GL_FRAMEBUFFER, GL30C.GL_DEPTH_ATTACHMENT, GL30C.GL_TEXTURE_2D, texture, 0);
}
this.hasDepthAttachment = true;
}
public void addColorAttachment(int index, int texture) {
public void addColorAttachment(int index, int texture)
{
int fb = id;
bind();
@@ -51,70 +72,72 @@ public class DHFramebuffer {
attachments.put(index, texture);
}
public void noDrawBuffers() {
bind();
GL43C.glDrawBuffers(new int[] { GL30C.GL_NONE });
public void noDrawBuffers()
{
bind();
GL43C.glDrawBuffers(new int[]{GL30C.GL_NONE});
}
public void drawBuffers(int[] buffers) {
int[] glBuffers = new int[buffers.length];
int index = 0;
if (buffers.length > maxDrawBuffers) {
public void drawBuffers(int[] buffers)
{
int[] glBuffers = new int[buffers.length]; int index = 0;
if (buffers.length > maxDrawBuffers)
{
throw new IllegalArgumentException("Cannot write to more than " + maxDrawBuffers + " draw buffers on this GPU");
}
for (int buffer : buffers) {
if (buffer >= maxColorAttachments) {
for (int buffer : buffers)
{
if (buffer >= maxColorAttachments)
{
throw new IllegalArgumentException("Only " + maxColorAttachments + " color attachments are supported on this GPU, but an attempt was made to write to a color attachment with index " + buffer);
}
glBuffers[index++] = GL30C.GL_COLOR_ATTACHMENT0 + buffer;
}
bind();
GL43C.glDrawBuffers(new int[] { GL30C.GL_NONE });
bind();
GL43C.glDrawBuffers(new int[]{GL30C.GL_NONE});
}
public void readBuffer(int buffer) {
public void readBuffer(int buffer)
{
bind();
GL43C.glReadBuffer(GL30C.GL_COLOR_ATTACHMENT0 + buffer);
}
public int getColorAttachment(int index) {
return attachments.get(index);
}
public boolean hasDepthAttachment() {
return hasDepthAttachment;
}
public void bind() {
if (id == -1) throw new IllegalStateException("Framebuffer does not exist!");
public int getColorAttachment(int index) { return attachments.get(index); }
public boolean hasDepthAttachment() { return hasDepthAttachment; }
public void bind()
{
if (id == -1)
{
throw new IllegalStateException("Framebuffer does not exist!");
}
GL43C.glBindFramebuffer(GL30C.GL_FRAMEBUFFER, id);
}
public void bindAsReadBuffer() {
GL43C.glBindFramebuffer(GL30C.GL_READ_FRAMEBUFFER, id);
}
public void bindAsDrawBuffer() {
GL43C.glBindFramebuffer(GL30C.GL_DRAW_FRAMEBUFFER, id);
}
public void destroyInternal() {
GL43C.glDeleteFramebuffers(id);
public void bindAsReadBuffer() { GL43C.glBindFramebuffer(GL30C.GL_READ_FRAMEBUFFER, id); }
public void bindAsDrawBuffer() { GL43C.glBindFramebuffer(GL30C.GL_DRAW_FRAMEBUFFER, id); }
public void destroyInternal()
{
GL43C.glDeleteFramebuffers(id);
this.id = -1;
}
public int getStatus() {
bind();
public int getStatus()
{
bind();
int status = GL43C.glCheckFramebufferStatus(GL30C.GL_FRAMEBUFFER);
return status;
}
public int getId() {
return id;
}
public int getId() { return id; }
}
core/src/main/java/com/seibel/distanthorizons/core/render/glObject/texture/DHDepthBufferFormat.java → core/src/main/java/com/seibel/distanthorizons/core/render/glObject/texture/EDhDepthBufferFormat.java
+56 -39
View File
@@ -4,7 +4,8 @@ import org.jetbrains.annotations.Nullable;
import org.lwjgl.opengl.GL30C;
import org.lwjgl.opengl.GL43C;
public enum DHDepthBufferFormat {
public enum EDhDepthBufferFormat
{
DEPTH(false),
DEPTH16(false),
DEPTH24(false),
@@ -13,39 +14,56 @@ public enum DHDepthBufferFormat {
DEPTH_STENCIL(true),
DEPTH24_STENCIL8(true),
DEPTH32F_STENCIL8(true);
private final boolean combinedStencil;
DHDepthBufferFormat(boolean combinedStencil) {
this.combinedStencil = combinedStencil;
}
EDhDepthBufferFormat(boolean combinedStencil) { this.combinedStencil = combinedStencil; }
@Nullable
public static DHDepthBufferFormat fromGlEnum(int glenum) {
switch (glenum) {
case GL30C.GL_DEPTH_COMPONENT: return DHDepthBufferFormat.DEPTH;
case GL30C.GL_DEPTH_COMPONENT16: return DHDepthBufferFormat.DEPTH16;
case GL30C.GL_DEPTH_COMPONENT24: return DHDepthBufferFormat.DEPTH24;
case GL30C.GL_DEPTH_COMPONENT32: return DHDepthBufferFormat.DEPTH32;
case GL30C.GL_DEPTH_COMPONENT32F: return DHDepthBufferFormat.DEPTH32F;
case GL30C.GL_DEPTH_STENCIL: return DHDepthBufferFormat.DEPTH_STENCIL;
case GL30C.GL_DEPTH24_STENCIL8: return DHDepthBufferFormat.DEPTH24_STENCIL8;
case GL30C.GL_DEPTH32F_STENCIL8: return DHDepthBufferFormat.DEPTH32F_STENCIL8;
default: return null;
public static EDhDepthBufferFormat fromGlEnum(int glenum)
{
switch (glenum)
{
case GL30C.GL_DEPTH_COMPONENT:
return EDhDepthBufferFormat.DEPTH;
case GL30C.GL_DEPTH_COMPONENT16:
return EDhDepthBufferFormat.DEPTH16;
case GL30C.GL_DEPTH_COMPONENT24:
return EDhDepthBufferFormat.DEPTH24;
case GL30C.GL_DEPTH_COMPONENT32:
return EDhDepthBufferFormat.DEPTH32;
case GL30C.GL_DEPTH_COMPONENT32F:
return EDhDepthBufferFormat.DEPTH32F;
case GL30C.GL_DEPTH_STENCIL:
return EDhDepthBufferFormat.DEPTH_STENCIL;
case GL30C.GL_DEPTH24_STENCIL8:
return EDhDepthBufferFormat.DEPTH24_STENCIL8;
case GL30C.GL_DEPTH32F_STENCIL8:
return EDhDepthBufferFormat.DEPTH32F_STENCIL8;
default:
return null;
}
}
public static DHDepthBufferFormat fromGlEnumOrDefault(int glenum) {
DHDepthBufferFormat format = fromGlEnum(glenum);
if (format == null) {
public static EDhDepthBufferFormat fromGlEnumOrDefault(int glenum)
{
EDhDepthBufferFormat format = fromGlEnum(glenum);
if (format == null)
{
// yolo, just assume it's GL_DEPTH_COMPONENT
return DHDepthBufferFormat.DEPTH;
return EDhDepthBufferFormat.DEPTH;
}
return format;
}
public int getGlInternalFormat() {
switch (this) {
public int getGlInternalFormat()
{
switch (this)
{
case DEPTH:
return GL30C.GL_DEPTH_COMPONENT;
case DEPTH16:
@@ -63,16 +81,16 @@ public enum DHDepthBufferFormat {
case DEPTH32F_STENCIL8:
return GL30C.GL_DEPTH32F_STENCIL8;
}
throw new AssertionError("unreachable");
}
public int getGlType() {
return isCombinedStencil() ? GL30C.GL_DEPTH_STENCIL : GL30C.GL_DEPTH_COMPONENT;
}
public int getGlFormat() {
switch (this) {
public int getGlType() { return isCombinedStencil() ? GL30C.GL_DEPTH_STENCIL : GL30C.GL_DEPTH_COMPONENT; }
public int getGlFormat()
{
switch (this)
{
case DEPTH:
case DEPTH16:
return GL43C.GL_UNSIGNED_SHORT;
@@ -87,11 +105,10 @@ public enum DHDepthBufferFormat {
case DEPTH32F_STENCIL8:
return GL30C.GL_FLOAT_32_UNSIGNED_INT_24_8_REV;
}
throw new AssertionError("unreachable");
}
public boolean isCombinedStencil() {
return combinedStencil;
}
public boolean isCombinedStencil() { return combinedStencil; }
}
core/src/main/java/com/seibel/distanthorizons/core/render/glObject/texture/EDhInternalTextureFormat.java
+129
View File
@@ -0,0 +1,129 @@
package com.seibel.distanthorizons.core.render.glObject.texture;
import org.lwjgl.opengl.GL11C;
import org.lwjgl.opengl.GL30C;
import org.lwjgl.opengl.GL31C;
import java.util.Locale;
import java.util.Optional;
public enum EDhInternalTextureFormat
{
// Default
/** TODO: This technically shouldn't be exposed to shaders since it's not in the specification, it's the default anyways */
RGBA(GL11C.GL_RGBA, EGlVersion.GL_11, EDhPixelFormat.RGBA),
// 8-bit normalized
R8(GL30C.GL_R8, EGlVersion.GL_30, EDhPixelFormat.RED),
RG8(GL30C.GL_RG8, EGlVersion.GL_30, EDhPixelFormat.RG),
RGB8(GL11C.GL_RGB8, EGlVersion.GL_11, EDhPixelFormat.RGB),
RGBA8(GL11C.GL_RGBA8, EGlVersion.GL_11, EDhPixelFormat.RGBA),
// 8-bit signed normalized
R8_SNORM(GL31C.GL_R8_SNORM, EGlVersion.GL_31, EDhPixelFormat.RED),
RG8_SNORM(GL31C.GL_RG8_SNORM, EGlVersion.GL_31, EDhPixelFormat.RG),
RGB8_SNORM(GL31C.GL_RGB8_SNORM, EGlVersion.GL_31, EDhPixelFormat.RGB),
RGBA8_SNORM(GL31C.GL_RGBA8_SNORM, EGlVersion.GL_31, EDhPixelFormat.RGBA),
// 16-bit normalized
R16(GL30C.GL_R16, EGlVersion.GL_30, EDhPixelFormat.RED),
RG16(GL30C.GL_RG16, EGlVersion.GL_30, EDhPixelFormat.RG),
RGB16(GL11C.GL_RGB16, EGlVersion.GL_11, EDhPixelFormat.RGB),
RGBA16(GL11C.GL_RGBA16, EGlVersion.GL_11, EDhPixelFormat.RGBA),
// 16-bit signed normalized
R16_SNORM(GL31C.GL_R16_SNORM, EGlVersion.GL_31, EDhPixelFormat.RED),
RG16_SNORM(GL31C.GL_RG16_SNORM, EGlVersion.GL_31, EDhPixelFormat.RG),
RGB16_SNORM(GL31C.GL_RGB16_SNORM, EGlVersion.GL_31, EDhPixelFormat.RGB),
RGBA16_SNORM(GL31C.GL_RGBA16_SNORM, EGlVersion.GL_31, EDhPixelFormat.RGBA),
// 16-bit float
R16F(GL30C.GL_R16F, EGlVersion.GL_30, EDhPixelFormat.RED),
RG16F(GL30C.GL_RG16F, EGlVersion.GL_30, EDhPixelFormat.RG),
RGB16F(GL30C.GL_RGB16F, EGlVersion.GL_30, EDhPixelFormat.RGB),
RGBA16F(GL30C.GL_RGBA16F, EGlVersion.GL_30, EDhPixelFormat.RGBA),
// 32-bit float
R32F(GL30C.GL_R32F, EGlVersion.GL_30, EDhPixelFormat.RED),
RG32F(GL30C.GL_RG32F, EGlVersion.GL_30, EDhPixelFormat.RG),
RGB32F(GL30C.GL_RGB32F, EGlVersion.GL_30, EDhPixelFormat.RGB),
RGBA32F(GL30C.GL_RGBA32F, EGlVersion.GL_30, EDhPixelFormat.RGBA),
// 8-bit integer
R8I(GL30C.GL_R8I, EGlVersion.GL_30, EDhPixelFormat.RED_INTEGER),
RG8I(GL30C.GL_RG8I, EGlVersion.GL_30, EDhPixelFormat.RG_INTEGER),
RGB8I(GL30C.GL_RGB8I, EGlVersion.GL_30, EDhPixelFormat.RGB_INTEGER),
RGBA8I(GL30C.GL_RGBA8I, EGlVersion.GL_30, EDhPixelFormat.RGBA_INTEGER),
// 8-bit unsigned integer
R8UI(GL30C.GL_R8UI, EGlVersion.GL_30, EDhPixelFormat.RED_INTEGER),
RG8UI(GL30C.GL_RG8UI, EGlVersion.GL_30, EDhPixelFormat.RG_INTEGER),
RGB8UI(GL30C.GL_RGB8UI, EGlVersion.GL_30, EDhPixelFormat.RGB_INTEGER),
RGBA8UI(GL30C.GL_RGBA8UI, EGlVersion.GL_30, EDhPixelFormat.RGBA_INTEGER),
// 16-bit integer
R16I(GL30C.GL_R16I, EGlVersion.GL_30, EDhPixelFormat.RED_INTEGER),
RG16I(GL30C.GL_RG16I, EGlVersion.GL_30, EDhPixelFormat.RG_INTEGER),
RGB16I(GL30C.GL_RGB16I, EGlVersion.GL_30, EDhPixelFormat.RGB_INTEGER),
RGBA16I(GL30C.GL_RGBA16I, EGlVersion.GL_30, EDhPixelFormat.RGBA_INTEGER),
// 16-bit unsigned integer
R16UI(GL30C.GL_R16UI, EGlVersion.GL_30, EDhPixelFormat.RED_INTEGER),
RG16UI(GL30C.GL_RG16UI, EGlVersion.GL_30, EDhPixelFormat.RG_INTEGER),
RGB16UI(GL30C.GL_RGB16UI, EGlVersion.GL_30, EDhPixelFormat.RGB_INTEGER),
RGBA16UI(GL30C.GL_RGBA16UI, EGlVersion.GL_30, EDhPixelFormat.RGBA_INTEGER),
// 32-bit integer
R32I(GL30C.GL_R32I, EGlVersion.GL_30, EDhPixelFormat.RED_INTEGER),
RG32I(GL30C.GL_RG32I, EGlVersion.GL_30, EDhPixelFormat.RG_INTEGER),
RGB32I(GL30C.GL_RGB32I, EGlVersion.GL_30, EDhPixelFormat.RGB_INTEGER),
RGBA32I(GL30C.GL_RGBA32I, EGlVersion.GL_30, EDhPixelFormat.RGBA_INTEGER),
// 32-bit unsigned integer
R32UI(GL30C.GL_R32UI, EGlVersion.GL_30, EDhPixelFormat.RED_INTEGER),
RG32UI(GL30C.GL_RG32UI, EGlVersion.GL_30, EDhPixelFormat.RG_INTEGER),
RGB32UI(GL30C.GL_RGB32UI, EGlVersion.GL_30, EDhPixelFormat.RGB_INTEGER),
RGBA32UI(GL30C.GL_RGBA32UI, EGlVersion.GL_30, EDhPixelFormat.RGBA_INTEGER),
// Mixed
R3_G3_B2(GL11C.GL_R3_G3_B2, EGlVersion.GL_11, EDhPixelFormat.RGB),
RGB5_A1(GL11C.GL_RGB5_A1, EGlVersion.GL_11, EDhPixelFormat.RGBA),
RGB10_A2(GL11C.GL_RGB10_A2, EGlVersion.GL_11, EDhPixelFormat.RGBA),
R11F_G11F_B10F(GL30C.GL_R11F_G11F_B10F, EGlVersion.GL_30, EDhPixelFormat.RGB),
RGB9_E5(GL30C.GL_RGB9_E5, EGlVersion.GL_30, EDhPixelFormat.RGB);
private final int glFormat;
private final EGlVersion minimumGlVersion;
private final EDhPixelFormat expectedPixelFormat;
EDhInternalTextureFormat(int glFormat, EGlVersion minimumGlVersion, EDhPixelFormat expectedPixelFormat)
{
this.glFormat = glFormat;
this.minimumGlVersion = minimumGlVersion;
this.expectedPixelFormat = expectedPixelFormat;
}
public static Optional<EDhInternalTextureFormat> fromString(String name)
{
try
{
return Optional.of(EDhInternalTextureFormat.valueOf(name.toUpperCase(Locale.US)));
}
catch (IllegalArgumentException e)
{
return Optional.empty();
}
}
public int getGlFormat() { return glFormat; }
public EDhPixelFormat getPixelFormat() { return expectedPixelFormat; }
public EGlVersion getMinimumGlVersion() { return minimumGlVersion; }
}
core/src/main/java/com/seibel/distanthorizons/core/render/glObject/texture/EDhPixelFormat.java
+60
View File
@@ -0,0 +1,60 @@
package com.seibel.distanthorizons.core.render.glObject.texture;
import org.lwjgl.opengl.GL11C;
import org.lwjgl.opengl.GL12C;
import org.lwjgl.opengl.GL30C;
import java.util.Locale;
import java.util.Optional;
public enum EDhPixelFormat
{
RED(GL11C.GL_RED, EGlVersion.GL_11, false),
RG(GL30C.GL_RG, EGlVersion.GL_30, false),
RGB(GL11C.GL_RGB, EGlVersion.GL_11, false),
BGR(GL12C.GL_BGR, EGlVersion.GL_12, false),
RGBA(GL11C.GL_RGBA, EGlVersion.GL_11, false),
BGRA(GL12C.GL_BGRA, EGlVersion.GL_12, false),
RED_INTEGER(GL30C.GL_RED_INTEGER, EGlVersion.GL_30, true),
RG_INTEGER(GL30C.GL_RG_INTEGER, EGlVersion.GL_30, true),
RGB_INTEGER(GL30C.GL_RGB_INTEGER, EGlVersion.GL_30, true),
BGR_INTEGER(GL30C.GL_BGR_INTEGER, EGlVersion.GL_30, true),
RGBA_INTEGER(GL30C.GL_RGBA_INTEGER, EGlVersion.GL_30, true),
BGRA_INTEGER(GL30C.GL_BGRA_INTEGER, EGlVersion.GL_30, true);
private final int glFormat;
private final EGlVersion minimumGlVersion;
private final boolean isInteger;
EDhPixelFormat(int glFormat, EGlVersion minimumGlVersion, boolean isInteger)
{
this.glFormat = glFormat;
this.minimumGlVersion = minimumGlVersion;
this.isInteger = isInteger;
}
public static Optional<EDhPixelFormat> fromString(String name)
{
try
{
return Optional.of(EDhPixelFormat.valueOf(name.toUpperCase(Locale.US)));
}
catch (IllegalArgumentException e)
{
return Optional.empty();
}
}
public int getGlFormat() { return glFormat; }
public EGlVersion getMinimumGlVersion() { return minimumGlVersion; }
public boolean isInteger() { return isInteger; }
}
core/src/main/java/com/seibel/distanthorizons/core/render/glObject/texture/EDhPixelType.java
+64
View File
@@ -0,0 +1,64 @@
package com.seibel.distanthorizons.core.render.glObject.texture;
import org.lwjgl.opengl.GL11C;
import org.lwjgl.opengl.GL12C;
import org.lwjgl.opengl.GL30C;
import java.util.Locale;
import java.util.Optional;
public enum EDhPixelType
{
BYTE(GL11C.GL_BYTE, EGlVersion.GL_11),
SHORT(GL11C.GL_SHORT, EGlVersion.GL_11),
INT(GL11C.GL_INT, EGlVersion.GL_11),
HALF_FLOAT(GL30C.GL_HALF_FLOAT, EGlVersion.GL_30),
FLOAT(GL11C.GL_FLOAT, EGlVersion.GL_11),
UNSIGNED_BYTE(GL11C.GL_UNSIGNED_BYTE, EGlVersion.GL_11),
UNSIGNED_BYTE_3_3_2(GL12C.GL_UNSIGNED_BYTE_3_3_2, EGlVersion.GL_12),
UNSIGNED_BYTE_2_3_3_REV(GL12C.GL_UNSIGNED_BYTE_2_3_3_REV, EGlVersion.GL_12),
UNSIGNED_SHORT(GL11C.GL_UNSIGNED_SHORT, EGlVersion.GL_11),
UNSIGNED_SHORT_5_6_5(GL12C.GL_UNSIGNED_SHORT_5_6_5, EGlVersion.GL_12),
UNSIGNED_SHORT_5_6_5_REV(GL12C.GL_UNSIGNED_SHORT_5_6_5_REV, EGlVersion.GL_12),
UNSIGNED_SHORT_4_4_4_4(GL12C.GL_UNSIGNED_SHORT_4_4_4_4, EGlVersion.GL_12),
UNSIGNED_SHORT_4_4_4_4_REV(GL12C.GL_UNSIGNED_SHORT_4_4_4_4_REV, EGlVersion.GL_12),
UNSIGNED_SHORT_5_5_5_1(GL12C.GL_UNSIGNED_SHORT_5_5_5_1, EGlVersion.GL_12),
UNSIGNED_SHORT_1_5_5_5_REV(GL12C.GL_UNSIGNED_SHORT_1_5_5_5_REV, EGlVersion.GL_12),
UNSIGNED_INT(GL11C.GL_UNSIGNED_INT, EGlVersion.GL_11),
UNSIGNED_INT_8_8_8_8(GL12C.GL_UNSIGNED_INT_8_8_8_8, EGlVersion.GL_12),
UNSIGNED_INT_8_8_8_8_REV(GL12C.GL_UNSIGNED_INT_8_8_8_8_REV, EGlVersion.GL_12),
UNSIGNED_INT_10_10_10_2(GL12C.GL_UNSIGNED_INT_10_10_10_2, EGlVersion.GL_12),
UNSIGNED_INT_2_10_10_10_REV(GL12C.GL_UNSIGNED_INT_2_10_10_10_REV, EGlVersion.GL_12);
private final int glFormat;
private final EGlVersion minimumGlVersion;
EDhPixelType(int glFormat, EGlVersion minimumGlVersion)
{
this.glFormat = glFormat;
this.minimumGlVersion = minimumGlVersion;
}
public static Optional<EDhPixelType> fromString(String name)
{
try
{
return Optional.of(EDhPixelType.valueOf(name.toUpperCase(Locale.US)));
}
catch (IllegalArgumentException e)
{
return Optional.empty();
}
}
public int getGlFormat() { return glFormat; }
public EGlVersion getMinimumGlVersion() { return minimumGlVersion; }
}
core/src/main/java/com/seibel/distanthorizons/core/render/glObject/texture/GlVersion.java → core/src/main/java/com/seibel/distanthorizons/core/render/glObject/texture/EGlVersion.java
+2 -1
View File
@@ -1,6 +1,7 @@
package com.seibel.distanthorizons.core.render.glObject.texture;
public enum GlVersion {
public enum EGlVersion
{
GL_11,
GL_12,
GL_30,
core/src/main/java/com/seibel/distanthorizons/core/render/renderer/LodRenderer.java
+10 -10
View File
@@ -152,8 +152,8 @@ public class LodRenderer
public boolean isSetupComplete = false;
// frameBuffer and texture ID's for this renderer
private DHFramebuffer framebuffer;
private DHColorTexture colorTexture;
private DhFramebuffer framebuffer;
private DhColorTexture colorTexture;
private DHDepthTexture depthTexture;
@@ -198,7 +198,7 @@ public class LodRenderer
public void resize(int width, int height) {
colorTexture.resize(width, height);
depthTexture.resize(width, height, DHDepthBufferFormat.DEPTH32F);
depthTexture.resize(width, height, EDhDepthBufferFormat.DEPTH32F);
}
@@ -486,15 +486,15 @@ public class LodRenderer
}
// Generate framebuffer, color texture, and depth render buffer
this.framebuffer = new DHFramebuffer();
this.colorTexture = DHColorTexture.builder().setDimensions(MC_RENDER.getTargetFrameBufferViewportWidth(), MC_RENDER.getTargetFrameBufferViewportHeight())
.setInternalFormat(DHInternalTextureFormat.RGBA8)
.setPixelType(DHPixelType.UNSIGNED_BYTE)
.setPixelFormat(DHPixelFormat.RGBA)
this.framebuffer = new DhFramebuffer();
this.colorTexture = DhColorTexture.builder().setDimensions(MC_RENDER.getTargetFrameBufferViewportWidth(), MC_RENDER.getTargetFrameBufferViewportHeight())
.setInternalFormat(EDhInternalTextureFormat.RGBA8)
.setPixelType(EDhPixelType.UNSIGNED_BYTE)
.setPixelFormat(EDhPixelFormat.RGBA)
.build();
this.depthTexture = new DHDepthTexture(MC_RENDER.getTargetFrameBufferViewportWidth(), MC_RENDER.getTargetFrameBufferViewportHeight(), DHDepthBufferFormat.DEPTH32F);
this.depthTexture = new DHDepthTexture(MC_RENDER.getTargetFrameBufferViewportWidth(), MC_RENDER.getTargetFrameBufferViewportHeight(), EDhDepthBufferFormat.DEPTH32F);
this.framebuffer.addDepthAttachment(depthTexture.getTextureId(), DHDepthBufferFormat.DEPTH32F);
this.framebuffer.addDepthAttachment(depthTexture.getTextureId(), EDhDepthBufferFormat.DEPTH32F);
this.framebuffer.addColorAttachment(0, colorTexture.getTexture());
this.cachedWidth = MC_RENDER.getTargetFrameBufferViewportWidth();