Skip to content

Integer Texture Support #570

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
empirephoenix merged 5 commits into from
Nov 22, 2016
Merged

Integer Texture Support #570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
af11f87
Update GL3.java
TehLeo Nov 12, 2016
d90ee20
Update GLImageFormats.java
TehLeo Nov 12, 2016
7693e78
Update Image.java
TehLeo Nov 12, 2016
85f1e6a
Update GLRenderer.java
TehLeo Nov 12, 2016
7ed6185
Update Caps.java
TehLeo Nov 12, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion jme3-core/src/main/java/com/jme3/renderer/Caps.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,12 @@ public enum Caps {
* Supports floating point & half textures (Format.RGB16F)
*/
FloatTexture,


/**
* Supports integer textures
*/
IntegerTexture,

/**
* Supports floating point FBO color buffers (Format.RGB16F)
*/
Expand Down
28 changes: 28 additions & 0 deletions jme3-core/src/main/java/com/jme3/renderer/opengl/GL3.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,34 @@ public interface GL3 extends GL2 {
public static final int GL_TEXTURE_SWIZZLE_B = 0x8E44;
public static final int GL_TEXTURE_SWIZZLE_G = 0x8E43;
public static final int GL_TEXTURE_SWIZZLE_R = 0x8E42;
public static final int GL_R8I = 33329;
public static final int GL_R8UI = 33330;
public static final int GL_R16I = 33331;
public static final int GL_R16UI = 33332;
public static final int GL_R32I = 33333;
public static final int GL_R32UI = 33334;
public static final int GL_RG8I = 33335;
public static final int GL_RG8UI = 33336;
public static final int GL_RG16I = 33337;
public static final int GL_RG16UI = 33338;
public static final int GL_RG32I = 33339;
public static final int GL_RG32UI = 33340;
public static final int GL_RGBA32UI = 36208;
public static final int GL_RGB32UI = 36209;
public static final int GL_RGBA16UI = 36214;
public static final int GL_RGB16UI = 36215;
public static final int GL_RGBA8UI = 36220;
public static final int GL_RGB8UI = 36221;
public static final int GL_RGBA32I = 36226;
public static final int GL_RGB32I = 36227;
public static final int GL_RGBA16I = 36232;
public static final int GL_RGB16I = 36233;
public static final int GL_RGBA8I = 36238;
public static final int GL_RGB8I = 36239;
public static final int GL_RED_INTEGER = 36244;
public static final int GL_RG_INTEGER = 33320;
public static final int GL_RGB_INTEGER = 36248;
public static final int GL_RGBA_INTEGER = 36249;

public void glBindFragDataLocation(int param1, int param2, String param3); /// GL3+
public void glBindVertexArray(int param1); /// GL3+
Expand Down
31 changes: 31 additions & 0 deletions jme3-core/src/main/java/com/jme3/renderer/opengl/GLImageFormats.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,37 @@ public static GLImageFormat[][] getFormatsForCaps(EnumSet<Caps> caps) {
formatComp(formatToGL, Format.ETC1, GLExt.GL_ETC1_RGB8_OES, GL.GL_RGB, GL.GL_UNSIGNED_BYTE);
}

// Integer formats
if(caps.contains(Caps.IntegerTexture)) {
format(formatToGL, Format.R8I, GL3.GL_R8I, GL3.GL_RED_INTEGER, GL.GL_BYTE);
format(formatToGL, Format.R8UI, GL3.GL_R8UI, GL3.GL_RED_INTEGER, GL.GL_UNSIGNED_BYTE);
format(formatToGL, Format.R16I, GL3.GL_R16I, GL3.GL_RED_INTEGER, GL.GL_SHORT);
format(formatToGL, Format.R16UI, GL3.GL_R16UI, GL3.GL_RED_INTEGER, GL.GL_UNSIGNED_SHORT);
format(formatToGL, Format.R32I, GL3.GL_R32I, GL3.GL_RED_INTEGER, GL.GL_INT);
format(formatToGL, Format.R32UI, GL3.GL_R32UI, GL3.GL_RED_INTEGER, GL.GL_UNSIGNED_INT);

format(formatToGL, Format.RG8I, GL3.GL_RG8I, GL3.GL_RG_INTEGER, GL.GL_BYTE);
format(formatToGL, Format.RG8UI, GL3.GL_RG8UI, GL3.GL_RG_INTEGER, GL.GL_UNSIGNED_BYTE);
format(formatToGL, Format.RG16I, GL3.GL_RG16I, GL3.GL_RG_INTEGER, GL.GL_SHORT);
format(formatToGL, Format.RG16UI, GL3.GL_RG16UI, GL3.GL_RG_INTEGER, GL.GL_UNSIGNED_SHORT);
format(formatToGL, Format.RG32I, GL3.GL_RG32I, GL3.GL_RG_INTEGER, GL.GL_INT);
format(formatToGL, Format.RG32UI, GL3.GL_RG32UI, GL3.GL_RG_INTEGER, GL.GL_UNSIGNED_INT);

format(formatToGL, Format.RGB8I, GL3.GL_RGB8I, GL3.GL_RGB_INTEGER, GL.GL_BYTE);
format(formatToGL, Format.RGB8UI, GL3.GL_RGB8UI, GL3.GL_RGB_INTEGER, GL.GL_UNSIGNED_BYTE);
format(formatToGL, Format.RGB16I, GL3.GL_RGB16I, GL3.GL_RGB_INTEGER, GL.GL_SHORT);
format(formatToGL, Format.RGB16UI, GL3.GL_RGB16UI, GL3.GL_RGB_INTEGER, GL.GL_UNSIGNED_SHORT);
format(formatToGL, Format.RGB32I, GL3.GL_RGB32I, GL3.GL_RGB_INTEGER, GL.GL_INT);
format(formatToGL, Format.RGB32UI, GL3.GL_RGB32UI, GL3.GL_RGB_INTEGER, GL.GL_UNSIGNED_INT);

format(formatToGL, Format.RGBA8I, GL3.GL_RGBA8I, GL3.GL_RGBA_INTEGER, GL.GL_BYTE);
format(formatToGL, Format.RGBA8UI, GL3.GL_RGBA8UI, GL3.GL_RGBA_INTEGER, GL.GL_UNSIGNED_BYTE);
format(formatToGL, Format.RGBA16I, GL3.GL_RGBA16I, GL3.GL_RGBA_INTEGER, GL.GL_SHORT);
format(formatToGL, Format.RGBA16UI, GL3.GL_RGBA16UI, GL3.GL_RGBA_INTEGER, GL.GL_UNSIGNED_SHORT);
format(formatToGL, Format.RGBA32I, GL3.GL_RGBA32I, GL3.GL_RGBA_INTEGER, GL.GL_INT);
format(formatToGL, Format.RGBA32UI, GL3.GL_RGBA32UI, GL3.GL_RGBA_INTEGER, GL.GL_UNSIGNED_INT);
}

return formatToGL;
}
}
4 changes: 4 additions & 0 deletions jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,10 @@ private void loadCapabilitiesCommon() {
if (hasFloatTexture) {
caps.add(Caps.FloatTexture);
}

// integer texture format extensions
if(hasExtension("GL_EXT_texture_integer") || caps.contains(Caps.OpenGL30))
caps.add(Caps.IntegerTexture);

if (hasExtension("GL_OES_depth_texture") || gl2 != null) {
caps.add(Caps.DepthTexture);
Expand Down
28 changes: 27 additions & 1 deletion jme3-core/src/main/java/com/jme3/texture/Image.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,33 @@ public enum Format {
*
* Requires {@link Caps#TextureCompressionETC1}.
*/
ETC1(4, false, true, false);
ETC1(4, false, true, false),

R8I(8),
R8UI(8),
R16I(16),
R16UI(16),
R32I(32),
R32UI(32),
RG8I(16),
RG8UI(16),
RG16I(32),
RG16UI(32),
RG32I(64),
RG32UI(64),
RGB8I(24),
RGB8UI(24),
RGB16I(48),
RGB16UI(48),
RGB32I(96),
RGB32UI(96),
RGBA8I(32),
RGBA8UI(32),
RGBA16I(64),
RGBA16UI(64),
RGBA32I(128),
RGBA32UI(128)
;

private int bpp;
private boolean isDepth;
Expand Down