Added support for hardware srgb output (gamma correction).

It can be toggled at render time. Works with lwjgl Couldn't test with Jogl and might be not working Not supported by mobile renderers
jMonkeyEngine · May 26, 2014 · 77a4002 · 77a4002 · shadowislord · May 31, 2014
1 parent a230384
commit 77a4002
Show file tree

Hide file tree

Showing 14 changed files with 78 additions and 10 deletions.
diff --git a/jme3-android/src/main/java/com/jme3/renderer/android/OGLESShaderRenderer.java b/jme3-android/src/main/java/com/jme3/renderer/android/OGLESShaderRenderer.java
@@ -2532,4 +2532,8 @@ public void invalidateState() {
         boundShader = null;
         lastFb = null;
     }
+
+    public void setMainFrameBufferSrgb(boolean srgb) {
+        //TODO once opglES3.0 is supported maybe....        
+    }
 }
diff --git a/jme3-core/src/main/java/com/jme3/renderer/Renderer.java b/jme3-core/src/main/java/com/jme3/renderer/Renderer.java
@@ -313,4 +313,26 @@ public interface Renderer {
      * </p>
      */
     public void setAlphaToCoverage(boolean value);
+
+      /**
+      * If enabled, color values rendered to the main framebuffer undergo 
+      * linear -> sRGB conversion.
+      * 
+      * This is identical to {@link FrameBuffer#setSrgb(boolean)} except it is toggled
+      * for the main framebuffer instead of an offscreen buffer.
+      *
+      * This should be set together with {@link Renderer#setLinearizeSrgbImages(boolean)}
+      *
+      * As a shorthand, the user can set {@link AppSettings#setSrgbPipeline(boolean)} to true
+      * to toggle both {@link Renderer#setLinearizeSrgbImages(boolean)} and
+      * {@link Renderer#setMainFrameBufferSrgb(boolean)} if the 
+      * {@link Caps#} is supported by the GPU.
+      *
+      * @throws RendererException If the GPU hardware does not support sRGB.
+      *
+      * @seealso FrameBuffer#setSrgb(boolean)
+      *
+      * @seealso Caps#Srgb
+      */
+     public void setMainFrameBufferSrgb(boolean srgb);
 }
diff --git a/jme3-core/src/main/java/com/jme3/system/NullRenderer.java b/jme3-core/src/main/java/com/jme3/system/NullRenderer.java
@@ -152,4 +152,7 @@ public void deleteImage(Image image) {
     public void setAlphaToCoverage(boolean value) {
     }
 
+    public void setMainFrameBufferSrgb(boolean srgb) {     
+    }
+
 }
diff --git a/jme3-ios/src/main/java/com/jme3/renderer/ios/IGLESShaderRenderer.java b/jme3-ios/src/main/java/com/jme3/renderer/ios/IGLESShaderRenderer.java
@@ -2572,4 +2572,8 @@ private int convertTestFunction(RenderState.TestFunction testFunc) {
 				throw new UnsupportedOperationException("Unrecognized test function: " + testFunc);
 		}
 	}    	
+
+    public void setMainFrameBufferSrgb(boolean srgb) {
+
+    }
 }
diff --git a/jme3-jogl/src/main/java/com/jme3/renderer/jogl/JoglGL1Renderer.java b/jme3-jogl/src/main/java/com/jme3/renderer/jogl/JoglGL1Renderer.java
@@ -1258,4 +1258,7 @@ public void updateBufferData(VertexBuffer vb) {
 
     public void deleteBuffer(VertexBuffer vb) {
     }
+
+    public void setMainFrameBufferSrgb(boolean srgb) {        
+    }
 }
diff --git a/jme3-jogl/src/main/java/com/jme3/renderer/jogl/JoglRenderer.java b/jme3-jogl/src/main/java/com/jme3/renderer/jogl/JoglRenderer.java
@@ -2589,4 +2589,15 @@ public void renderMesh(Mesh mesh, int lod, int count) {
         renderMeshDefault(mesh, lod, count);
 //        }
     }
+
+    public void setMainFrameBufferSrgb(boolean srgb) {
+        //Gamma correction
+        if(srgb && GLContext.getCurrent().isExtensionAvailable("GL_ARB_framebuffer_sRGB")){
+            GLContext.getCurrentGL().glEnable(GL3.GL_FRAMEBUFFER_SRGB);
+            logger.log(Level.FINER, "SRGB FrameBuffer enabled (Gamma Correction)");
+        }else{
+            GLContext.getCurrentGL().glDisable(GL3.GL_FRAMEBUFFER_SRGB);
+        }         
+
+    }
 }
diff --git a/jme3-jogl/src/main/java/com/jme3/system/jogl/JoglAbstractDisplay.java b/jme3-jogl/src/main/java/com/jme3/system/jogl/JoglAbstractDisplay.java
@@ -164,6 +164,8 @@ public boolean run(GLAutoDrawable glad) {
         }
 
         renderer = new JoglRenderer();
+
+        renderer.setMainFrameBufferSrgb(settings.getGammaCorrection());
     }
 
     protected void startGLCanvas() {

diff --git a/jme3-jogl/src/main/java/com/jme3/system/jogl/JoglNewtAbstractDisplay.java b/jme3-jogl/src/main/java/com/jme3/system/jogl/JoglNewtAbstractDisplay.java
@@ -144,6 +144,8 @@ public boolean run(GLAutoDrawable glad) {
         }
 
         renderer = new JoglRenderer();
+
+        renderer.setMainFrameBufferSrgb(settings.getGammaCorrection());
     }
 
     protected void startGLCanvas() {

diff --git a/jme3-lwjgl/src/main/java/com/jme3/renderer/lwjgl/LwjglGL1Renderer.java b/jme3-lwjgl/src/main/java/com/jme3/renderer/lwjgl/LwjglGL1Renderer.java
@@ -1198,4 +1198,8 @@ public void updateBufferData(VertexBuffer vb) {
 
     public void deleteBuffer(VertexBuffer vb) {
     }
+
+    public void setMainFrameBufferSrgb(boolean srgb) {
+
+    }
 }
diff --git a/jme3-lwjgl/src/main/java/com/jme3/renderer/lwjgl/LwjglRenderer.java b/jme3-lwjgl/src/main/java/com/jme3/renderer/lwjgl/LwjglRenderer.java
@@ -55,9 +55,7 @@
 import com.jme3.texture.Texture.WrapAxis;
 import com.jme3.util.BufferUtils;
 import com.jme3.util.ListMap;
-import com.jme3.util.NativeObject;
 import com.jme3.util.NativeObjectManager;
-import com.jme3.util.SafeArrayList;
 import java.nio.*;
 import java.util.EnumSet;
 import java.util.List;
@@ -371,7 +369,7 @@ public void initialize() {
                 caps.add(Caps.FrameBufferMRT);
                 logger.log(Level.FINER, "FBO Max MRT renderbuffers: {0}", maxMRTFBOAttachs);
             }
-
+            
 //            if (ctxCaps.GL_ARB_draw_buffers) {
 //                caps.add(Caps.FrameBufferMRT);
 //                glGetInteger(ARBDrawBuffers.GL_MAX_DRAW_BUFFERS_ARB, intBuf16);
@@ -2488,4 +2486,14 @@ public void renderMesh(Mesh mesh, int lod, int count) {
         renderMeshDefault(mesh, lod, count);
 //        }
     }
+
+    public void setMainFrameBufferSrgb(boolean srgb) {
+        //Gamma correction
+        if(srgb && GLContext.getCapabilities().GL_ARB_framebuffer_sRGB){
+            glEnable(GL30.GL_FRAMEBUFFER_SRGB);
+            logger.log(Level.FINER, "SRGB FrameBuffer enabled (Gamma Correction)");
+        }else{
+            glDisable(GL30.GL_FRAMEBUFFER_SRGB);
+        }         
+    }
 }
diff --git a/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglCanvas.java b/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglCanvas.java
@@ -308,7 +308,8 @@ protected PixelFormat acquirePixelFormat(boolean forPbuffer){
                                                 0,
                                                 0, 
                                                 0, 
-                                                settings.useStereo3D());
+                                                settings.useStereo3D())
+                                    .withSRGB(settings.getGammaCorrection());
             }
             return pbufferFormat;
         }else{
@@ -322,7 +323,8 @@ protected PixelFormat acquirePixelFormat(boolean forPbuffer){
                                                0,
                                                0, 
                                                0, 
-                                               settings.useStereo3D());
+                                               settings.useStereo3D())
+                                    .withSRGB(settings.getGammaCorrection());
             }
             return canvasFormat;
         }
@@ -467,7 +469,7 @@ protected void createContext(AppSettings settings) {
                 }else{
                     Display.create(acquirePixelFormat(false));
                 }
-                
+
                 renderer.invalidateState();
             }else{
                 // First create the pbuffer, if it is needed.

diff --git a/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglContext.java b/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglContext.java
@@ -237,6 +237,7 @@ protected void initContextFirstTime(){
         }else{
             assert false;
         }
+        renderer.setMainFrameBufferSrgb(settings.getGammaCorrection());
 
         // Init input
         if (keyInput != null) {

diff --git a/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglDisplay.java b/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglDisplay.java
@@ -91,8 +91,9 @@ protected void createContext(AppSettings settings) throws LWJGLException{
                                          0, 
                                          0, 
                                          0, 
-                                         settings.useStereo3D());
-
+                                         settings.useStereo3D())
+                                .withSRGB(settings.getGammaCorrection());
+
         frameRate = settings.getFrameRate();
         logger.log(Level.FINE, "Selected display mode: {0}", displayMode);
 

diff --git a/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglOffscreenBuffer.java b/jme3-lwjgl/src/main/java/com/jme3/system/lwjgl/LwjglOffscreenBuffer.java
@@ -65,8 +65,9 @@ protected void initInThread(){
                                       0,
                                       settings.getDepthBits(),
                                       settings.getStencilBits(),
-                                      samples);
-
+                                      samples)
+                            .withSRGB(settings.getGammaCorrection());
+
         width = settings.getWidth();
         height = settings.getHeight();
         try{