Version 1.2 (#125)

Update version to 1.2 and update the README file Also, make the dependency on FSharp.Core explicit, because it seems to be needed in Visual Studio.
laurentlb · Jan 13, 2022 · bde1e00 · bde1e00
1 parent 406d19e
commit bde1e00
Show file tree

Hide file tree

Showing 28 changed files with 38 additions and 29 deletions.
diff --git a/Checker/Checker.fsproj b/Checker/Checker.fsproj
@@ -85,4 +85,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/Checker/packages.config b/Checker/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="FSharp.Core" version="5.0.0" targetFramework="net48" />
+</packages>
diff --git a/README.md b/README.md
@@ -82,9 +82,10 @@ $ mono shader_minifier.exe  # Linux, Mac...
 ```
 
 ```
-USAGE: shader_minifier.exe [--help] [-o <string>] [-v] [--hlsl] [--format <text|c-variables|c-array|js|nasm>]
+USAGE: shader_minifier.exe [--help] [-o <string>] [-v] [--hlsl] [--format <text|indented|c-variables|c-array|js|nasm>]
                            [--field-names <rgba|xyzw|stpq>] [--preserve-externals] [--preserve-all-globals]
-                           [--no-renaming] [--no-renaming-list <string>] [--no-sequence] [--smoothstep] [<filename>...]
+                           [--no-inlining] [--no-renaming] [--no-renaming-list <string>] [--no-sequence] [--smoothstep]
+                           [<filename>...]
 
 FILENAMES:
 
@@ -95,7 +96,7 @@ OPTIONS:
     -o <string>           Set the output filename (default is shader_code.h)
     -v                    Verbose, display additional information
     --hlsl                Use HLSL (default is GLSL)
-    --format <text|c-variables|c-array|js|nasm>
+    --format <text|indented|c-variables|c-array|js|nasm>
                           Choose to format the output (use none if you want just the shader)
     --field-names <rgba|xyzw|stpq>
                           Choose the field names for vectors: 'rgba', 'xyzw', or 'stpq'
@@ -203,7 +204,7 @@ void GSScene( triangleadj GSSceneIn input[6], inout TriangleStream<PSSceneIn> Ou
 
 ### Automatic inlining
 
-Shader Minifier 1.7 and above will try to automatically inline some variables.
+Shader Minifier will try to automatically inline some variables.
 This happens when:
 - the variable is used only once in the current block,
 - and the variable is not used in a sub-block (e.g. inside a loop),

diff --git a/packages.config b/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="FSharp.Core" version="5.0.0" targetFramework="net48" />
+</packages>
diff --git a/src/options.fs b/src/options.fs
@@ -3,7 +3,7 @@
 open System.IO
 open Argu
 
-let version = "1.1.6" // Shader Minifier version
+let version = "1.2" // Shader Minifier version
 let debugMode = false
 
 type OutputFormat =

diff --git a/tests/real/chocolux.expected b/tests/real/chocolux.expected
@@ -1,4 +1,4 @@
-/* File generated with Shader Minifier 1.1.6
+/* File generated with Shader Minifier 1.2
  * http://www.ctrl-alt-test.fr
  */
 #ifndef CHOCOLUX_EXPECTED_

diff --git a/tests/real/disco.expected b/tests/real/disco.expected
@@ -1,4 +1,4 @@
-/* File generated with Shader Minifier 1.1.6
+/* File generated with Shader Minifier 1.2
  * http://www.ctrl-alt-test.fr
  */
 

diff --git a/tests/real/elevated.hlsl.expected b/tests/real/elevated.hlsl.expected
@@ -1,4 +1,4 @@
-/* File generated with Shader Minifier 1.1.6
+/* File generated with Shader Minifier 1.2
  * http://www.ctrl-alt-test.fr
  */
 #ifndef ELEVATED_HLSL_EXPECTED_

diff --git a/tests/real/kinder_painter.expected b/tests/real/kinder_painter.expected
@@ -1,4 +1,4 @@
-/* File generated with Shader Minifier 1.1.6
+/* File generated with Shader Minifier 1.2
  * http://www.ctrl-alt-test.fr
  */
 

diff --git a/tests/real/leizex.expected b/tests/real/leizex.expected
@@ -1,4 +1,4 @@
-; File generated with Shader Minifier 1.1.6
+; File generated with Shader Minifier 1.2
 ; http://www.ctrl-alt-test.fr
 
 _leizex_frag:

diff --git a/tests/real/lunaquatic.frag.expected b/tests/real/lunaquatic.frag.expected
@@ -1,4 +1,4 @@
-/* File generated with Shader Minifier 1.1.6
+/* File generated with Shader Minifier 1.2
  * http://www.ctrl-alt-test.fr
  */
 #ifndef LUNAQUATIC_FRAG_EXPECTED_

diff --git a/tests/real/mandelbulb.expected b/tests/real/mandelbulb.expected
@@ -1,4 +1,4 @@
-/* File generated with Shader Minifier 1.1.6
+/* File generated with Shader Minifier 1.2
  * http://www.ctrl-alt-test.fr
  */
 #ifndef MANDELBULB_EXPECTED_

diff --git a/tests/real/oscars_chair.frag.expected b/tests/real/oscars_chair.frag.expected
@@ -1,4 +1,4 @@
-/* File generated with Shader Minifier 1.1.6
+/* File generated with Shader Minifier 1.2
  * http://www.ctrl-alt-test.fr
  */
 #ifndef OSCARS_CHAIR_FRAG_EXPECTED_

diff --git a/tests/real/sult.expected b/tests/real/sult.expected
@@ -1,4 +1,4 @@
-/* File generated with Shader Minifier 1.1.6
+/* File generated with Shader Minifier 1.2
  * http://www.ctrl-alt-test.fr
  */
 #ifndef SULT_EXPECTED_

diff --git a/tests/real/the_real_party_is_in_your_pocket.frag.expected b/tests/real/the_real_party_is_in_your_pocket.frag.expected
@@ -1,4 +1,4 @@
-/* File generated with Shader Minifier 1.1.6
+/* File generated with Shader Minifier 1.2
  * http://www.ctrl-alt-test.fr
  */
 #ifndef THE_REAL_PARTY_IS_IN_YOUR_POCKET_FRAG_EXPECTED_

diff --git a/tests/real/to_the_road_of_ribbon.expected b/tests/real/to_the_road_of_ribbon.expected
@@ -1,4 +1,4 @@
-/* File generated with Shader Minifier 1.1.6
+/* File generated with Shader Minifier 1.2
  * http://www.ctrl-alt-test.fr
  */
 #ifndef TO_THE_ROAD_OF_RIBBON_EXPECTED_

diff --git a/tests/real/yx_long_way_from_home.frag.expected b/tests/real/yx_long_way_from_home.frag.expected
@@ -1,4 +1,4 @@
-/* File generated with Shader Minifier 1.1.6
+/* File generated with Shader Minifier 1.2
  * http://www.ctrl-alt-test.fr
  */
 #ifndef YX_LONG_WAY_FROM_HOME_FRAG_EXPECTED_

diff --git a/tests/unit/blocks.expected b/tests/unit/blocks.expected
@@ -1,4 +1,4 @@
-/* File generated with Shader Minifier 1.1.6
+/* File generated with Shader Minifier 1.2
  * http://www.ctrl-alt-test.fr
  */
 #ifndef BLOCKS_EXPECTED_

diff --git a/tests/unit/externals.expected b/tests/unit/externals.expected
@@ -1,4 +1,4 @@
-/* File generated with Shader Minifier 1.1.6
+/* File generated with Shader Minifier 1.2
  * http://www.ctrl-alt-test.fr
  */
 #ifndef EXTERNALS_EXPECTED_

diff --git a/tests/unit/externals.preserved.expected b/tests/unit/externals.preserved.expected
@@ -1,4 +1,4 @@
-/* File generated with Shader Minifier 1.1.6
+/* File generated with Shader Minifier 1.2
  * http://www.ctrl-alt-test.fr
  */
 #ifndef EXTERNALS_PRESERVED_EXPECTED_

diff --git a/tests/unit/float.frag.expected b/tests/unit/float.frag.expected
@@ -1,4 +1,4 @@
-/* File generated with Shader Minifier 1.1.6
+/* File generated with Shader Minifier 1.2
  * http://www.ctrl-alt-test.fr
  */
 

diff --git a/tests/unit/function_comma.expected b/tests/unit/function_comma.expected
@@ -1,4 +1,4 @@
-/* File generated with Shader Minifier 1.1.6
+/* File generated with Shader Minifier 1.2
  * http://www.ctrl-alt-test.fr
  */
 #ifndef FUNCTION_COMMA_EXPECTED_

diff --git a/tests/unit/function_overload.expected b/tests/unit/function_overload.expected
@@ -1,4 +1,4 @@
-/* File generated with Shader Minifier 1.1.6
+/* File generated with Shader Minifier 1.2
  * http://www.ctrl-alt-test.fr
  */
 #ifndef FUNCTION_OVERLOAD_EXPECTED_

diff --git a/tests/unit/geometry.hlsl.expected b/tests/unit/geometry.hlsl.expected
@@ -1,4 +1,4 @@
-/* File generated with Shader Minifier 1.1.6
+/* File generated with Shader Minifier 1.2
  * http://www.ctrl-alt-test.fr
  */
 #ifndef GEOMETRY_HLSL_EXPECTED_

diff --git a/tests/unit/macros.expected b/tests/unit/macros.expected
@@ -1,4 +1,4 @@
-/* File generated with Shader Minifier 1.1.6
+/* File generated with Shader Minifier 1.2
  * http://www.ctrl-alt-test.fr
  */
 #ifndef MACROS_EXPECTED_

diff --git a/tests/unit/many_variables.expected b/tests/unit/many_variables.expected
@@ -1,4 +1,4 @@
-/* File generated with Shader Minifier 1.1.6
+/* File generated with Shader Minifier 1.2
  * http://www.ctrl-alt-test.fr
  */
 

diff --git a/tests/unit/minus-zero.expected b/tests/unit/minus-zero.expected
@@ -1,4 +1,4 @@
-/* File generated with Shader Minifier 1.1.6
+/* File generated with Shader Minifier 1.2
  * http://www.ctrl-alt-test.fr
  */
 

diff --git a/tests/unit/operators.expected b/tests/unit/operators.expected
@@ -1,4 +1,4 @@
-/* File generated with Shader Minifier 1.1.6
+/* File generated with Shader Minifier 1.2
  * http://www.ctrl-alt-test.fr
  */