sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix merge error

Browse Source
This commit is contained in:
Kirill Vainer 2017-09-17 22:45:42 -04:00
parent 7326c45ee8
commit eba997cfb6
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jme3-core/src/main/java/com/jme3/renderer/opengl/GLRenderer.java
View File

@ -2206,22 +2206,17 @@ public final class GLRenderer implements Renderer {
} else if (img.hasMipmaps()) { } else if (img.hasMipmaps()) {
// Image already has mipmaps, set the max level based on the // Image already has mipmaps, set the max level based on the
// number of mipmaps we have. // number of mipmaps we have.
gl.glTexParameteri(target, GL.GL_TEXTURE_MAX_LEVEL, img.getMipMapSizes().length - 1); gl.glTexParameteri(target, GL2.GL_TEXTURE_MAX_LEVEL, img.getMipMapSizes().length - 1);
} else { } else {
// Image does not have mipmaps and they are not required. // Image does not have mipmaps and they are not required.
// Specify that that the texture has no mipmaps. // Specify that that the texture has no mipmaps.
gl.glTexParameteri(target, GL.GL_TEXTURE_MAX_LEVEL, 0); gl.glTexParameteri(target, GL2.GL_TEXTURE_MAX_LEVEL, 0);
} }
(??) } else if (img.hasMipmaps()) {
(??) // Image already has mipmaps, set the max level based on the
(??) // number of mipmaps we have.
(??) gl.glTexParameteri(target, GL.GL_TEXTURE_MAX_LEVEL, img.getMipMapSizes().length - 1);
} else { } else {
// Check if graphics card doesn't support multisample textures // Check if graphics card doesn't support multisample textures
if (!caps.contains(Caps.TextureMultisample)) { if (!caps.contains(Caps.TextureMultisample)) {
throw new RendererException("Multisample textures are not supported by the video hardware"); throw new RendererException("Multisample textures are not supported by the video hardware");
} }
(??)
if (img.isGeneratedMipmapsRequired() || img.hasMipmaps()) { if (img.isGeneratedMipmapsRequired() || img.hasMipmaps()) {
throw new RendererException("Multisample textures do not support mipmaps"); throw new RendererException("Multisample textures do not support mipmaps");