Add option to force SRGB off within opengl

Cargo.toml

@@ -26,6 +26,7 @@ notify = "4.0.3"
 reqwest = "~0.9"
 clippy = { version = "0.*", optional = true }
 anyhow = "1.0.0"
+gfx_gl = "0.6.1"
 
 [[bin]]
 path = "src/main.rs"

README.md

@@ -46,11 +46,12 @@ Federico Menozzi <federicogmenozzi@gmail.com>
 Desktop client for Shadertoy
 
 USAGE:
-    shadertoy [OPTIONS] [shader] [SUBCOMMAND]
+    shadertoy [FLAGS] [OPTIONS] [shader] [SUBCOMMAND]
 
 FLAGS:
-    -h, --help       Prints help information
-    -V, --version    Prints version information
+        --force_srgb_off    Forces SRGB to be off (replicates shadertoy.com color blending)
+    -h, --help              Prints help information
+    -V, --version           Prints version information
 
 OPTIONS:
     -e, --example <example>      Run example shader from examples/ directory

src/argvalues.rs

@@ -43,6 +43,9 @@ pub struct ArgValues {
 
     // True if also running downloaded shader.
     pub andrun: bool,
+
+    // True if we should force disable srgb
+    pub force_srgb_off: bool,
 }
 
 impl ArgValues {
@@ -118,6 +121,8 @@ impl ArgValues {
             (None, false)
         };
 
+        let force_srgb_off = matches.is_present("force_srgb_off");
+
         Ok(ArgValues {
             width,
             height,
@@ -139,6 +144,7 @@ impl ArgValues {
             getid,
             andrun,
             title,
+            force_srgb_off,
         })
     }
 }

src/cli.yml

@@ -118,3 +118,8 @@ args:
         short: t
         takes_value: true
         help: Sets the window title
+    - force_srgb_off:
+          long: force_srgb_off
+          takes_value: false
+          required: false
+          help: Forces SRGB to be off (replicates shadertoy.com color blending)

src/runner.rs

@@ -133,6 +133,14 @@ pub fn run(av: ArgValues) -> error::Result<()> {
             .unwrap()
             .init_gfx::<ColorFormat, DepthFormat>();
 
+    if av.force_srgb_off {
+        unsafe {
+            device.with_gl(|gl| {
+                gl.Disable(gfx_gl::FRAMEBUFFER_SRGB);
+            })
+        }
+    }
+
     let mut encoder = gfx::Encoder::from(factory.create_command_buffer());
 
     let mut pso = factory