Skip to content

GLRenderer.modifyTexture on GLES fix #1235

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
stephengold merged 8 commits into from
Dec 23, 2019
Merged

GLRenderer.modifyTexture on GLES fix #1235

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
28f509d
Update GLImageFormats.java
joliver82 May 17, 2018
71fcaa9
Merge remote-tracking branch 'upstream/master'
joliver82 May 23, 2018
4f8a2cc
Merge pull request #3 from jMonkeyEngine/master
joliver82 Nov 14, 2018
05db003
Merge pull request #4 from jMonkeyEngine/master
joliver82 Jun 1, 2019
38e330b
Merge pull request #5 from jMonkeyEngine/master
joliver82 Nov 20, 2019
7026362
First implementation to solve the glTexSubImage issue
joliver82 Dec 19, 2019
75cad8b
Setting proper format to the image
joliver82 Dec 19, 2019
b18586f
Removed the Image.convertToFormat method and its usage from GLRendere…
Dec 20, 2019
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
6 changes: 6 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 @@ -2549,6 +2549,9 @@ public void setTexture(int unit, Texture tex) {
@Deprecated
public void modifyTexture(Texture tex, Image pixels, int x, int y) {
setTexture(0, tex);
if(caps.contains(Caps.OpenGLES20) && pixels.getFormat()!=tex.getImage().getFormat() ) {
logger.log(Level.WARNING, "Incompatible texture subimage");
}
int target = convertTextureType(tex.getType(), pixels.getMultiSamples(), -1);
texUtil.uploadSubTexture(target,pixels, 0, x, y,0,0,pixels.getWidth(),pixels.getHeight(), linearizeSrgbImages);
}
Expand All @@ -2566,6 +2569,9 @@ public void modifyTexture(Texture tex, Image pixels, int x, int y) {
*/
public void modifyTexture(Texture2D dest, Image src, int destX, int destY, int srcX, int srcY, int areaW, int areaH) {
setTexture(0, dest);
if(caps.contains(Caps.OpenGLES20) && src.getFormat()!=dest.getImage().getFormat() ) {
logger.log(Level.WARNING, "Incompatible texture subimage");
}
int target = convertTextureType(dest.getType(), src.getMultiSamples(), -1);
texUtil.uploadSubTexture(target, src, 0, destX, destY, srcX, srcY, areaW, areaH, linearizeSrgbImages);
}
Expand Down
28 changes: 28 additions & 0 deletions jme3-niftygui/src/main/java/com/jme3/niftygui/JmeBatchRenderBackend.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@
import com.jme3.asset.TextureKey;
import com.jme3.material.Material;
import com.jme3.material.RenderState;
import com.jme3.math.ColorRGBA;
import com.jme3.math.Matrix4f;
import com.jme3.renderer.Caps;
import com.jme3.renderer.RenderManager;
import com.jme3.renderer.Renderer;
import com.jme3.scene.Geometry;
Expand All @@ -52,6 +54,7 @@
import com.jme3.scene.VertexBuffer.Type;
import com.jme3.scene.VertexBuffer.Usage;
import com.jme3.texture.Image.Format;
import com.jme3.texture.image.ImageRaster;
import com.jme3.texture.Texture.MagFilter;
import com.jme3.texture.Texture.MinFilter;
import com.jme3.texture.Texture2D;
Expand Down Expand Up @@ -214,6 +217,31 @@ public Image loadImage(final String filename) {
key.setGenerateMips(false);

Texture2D texture = (Texture2D) display.getAssetManager().loadTexture(key);
// Fix GLES format incompatibility issue with glTexSubImage
Renderer renderer = display.getRenderer();
if(renderer==null || renderer.getCaps().contains(Caps.OpenGLES20)) {
if(texture.getImage().getFormat()!=Format.RGBA8) {
com.jme3.texture.Image sourceImage = texture.getImage();
int size = sourceImage.getWidth() * sourceImage.getHeight() * 4;
ByteBuffer buffer = BufferUtils.createByteBuffer(size);
com.jme3.texture.Image rgba8Image = new com.jme3.texture.Image(Format.RGBA8,
sourceImage.getWidth(),
sourceImage.getHeight(),
buffer,
sourceImage.getColorSpace());

ImageRaster input = ImageRaster.create(sourceImage, 0, 0, false);
ImageRaster output = ImageRaster.create(rgba8Image, 0, 0, false);
ColorRGBA color = new ColorRGBA();

for (int y = 0; y < sourceImage.getHeight(); y++) {
for (int x = 0; x < sourceImage.getWidth(); x++) {
output.setPixel(x, y, input.getPixel(x, y, color));
}
}
return new ImageImpl(rgba8Image);
}
}
return new ImageImpl(texture.getImage());
}

Expand Down