update shaders

petschau · Jan 1, 2018 · 271648e · 271648e
1 parent 075f083
commit 271648e
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 37 deletions.
diff --git a/README.md b/README.md
@@ -56,7 +56,7 @@ This directory contains a MS Visual Studio workspace for the entire Fellow sourc
 What you need to compile the sources
 ------------------------------------
 
-Microsoft Visual Studio 2013 Update 5 and the February 2010 DirectX SDK.
+Microsoft Visual Studio 2017 and the February 2010 DirectX SDK.
 The community edition of Visual Studio can be used to compile WinFellow.
 
 Other notes

diff --git a/fellow/SRC/WIN32/DXGI/PixelShader.h b/fellow/SRC/WIN32/DXGI/PixelShader.h
@@ -1,6 +1,10 @@
 #if 0
 //
-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
+// Generated by Microsoft (R) HLSL Shader Compiler 9.27.952.3022
+//
+//
+//   fxc /nologo /ETexturePixelShader /T ps_4_0_level_9_3 /Fh
+//    ..\DXGI\PixelShader.h /Vn pixel_shader ..\DXGI\PixelShader.hlsl
 //
 //
 // Resource Bindings:
@@ -14,17 +18,17 @@
 //
 // Input signature:
 //
-// Name                 Index   Mask Register SysValue  Format   Used
-// -------------------- ----- ------ -------- -------- ------- ------
-// SV_POSITION              0   xyzw        0      POS   float       
-// TEXCOORD                 0   xy          1     NONE   float   xy  
+// Name                 Index   Mask Register SysValue Format   Used
+// -------------------- ----- ------ -------- -------- ------ ------
+// SV_POSITION              0   xyzw        0      POS  float       
+// TEXCOORD                 0   xy          1     NONE  float   xy  
 //
 //
 // Output signature:
 //
-// Name                 Index   Mask Register SysValue  Format   Used
-// -------------------- ----- ------ -------- -------- ------- ------
-// SV_TARGET                0   xyzw        0   TARGET   float   xyzw
+// Name                 Index   Mask Register SysValue Format   Used
+// -------------------- ----- ------ -------- -------- ------ ------
+// SV_TARGET                0   xyzw        0   TARGET  float   xyzw
 //
 //
 // Sampler/Resource to DX9 shader sampler mappings:
@@ -36,7 +40,7 @@
 //
 // Level9 shader bytecode:
 //
-    ps_2_0
+    ps_2_x
     dcl t0.xy
     dcl_2d s0
     texld r0, t0, s0
@@ -55,10 +59,10 @@ ret
 
 const BYTE pixel_shader[] =
 {
-     68,  88,  66,  67,  30, 169, 
-    244, 152,  58, 158,  65, 244, 
-    141, 150,  56, 219, 222, 110, 
-    156,   9,   1,   0,   0,   0, 
+     68,  88,  66,  67,  75, 254, 
+     67,  80, 193, 160, 254,  36, 
+    172, 233, 192, 180, 222, 233, 
+     13,  39,   1,   0,   0,   0, 
     200,   2,   0,   0,   6,   0, 
       0,   0,  56,   0,   0,   0, 
     164,   0,   0,   0,  16,   1, 
@@ -72,7 +76,7 @@ const BYTE pixel_shader[] =
       0,   0,  40,   0,   0,   0, 
      40,   0,   1,   0,  36,   0, 
       0,   0,  40,   0,   0,   0, 
-      0,   0,   0,   2, 255, 255, 
+      0,   0,   1,   2, 255, 255, 
      31,   0,   0,   2,   0,   0, 
       0, 128,   0,   0,   3, 176, 
      31,   0,   0,   2,   0,   0, 
@@ -147,10 +151,10 @@ const BYTE pixel_shader[] =
      32,  72,  76,  83,  76,  32, 
      83, 104,  97, 100, 101, 114, 
      32,  67, 111, 109, 112, 105, 
-    108, 101, 114,  32,  54,  46, 
-     51,  46,  57,  54,  48,  48, 
-     46,  49,  54,  51,  56,  52, 
-      0, 171,  73,  83,  71,  78, 
+    108, 101, 114,  32,  57,  46, 
+     50,  55,  46,  57,  53,  50, 
+     46,  51,  48,  50,  50,   0, 
+    171, 171,  73,  83,  71,  78, 
      80,   0,   0,   0,   2,   0, 
       0,   0,   8,   0,   0,   0, 
      56,   0,   0,   0,   0,   0, 

diff --git a/fellow/SRC/WIN32/DXGI/VertexShader.h b/fellow/SRC/WIN32/DXGI/VertexShader.h
@@ -1,6 +1,10 @@
 #if 0
 //
-// Generated by Microsoft (R) HLSL Shader Compiler 6.3.9600.16384
+// Generated by Microsoft (R) HLSL Shader Compiler 9.27.952.3022
+//
+//
+//   fxc /nologo /ETextureVertexShader /T vs_4_0_level_9_3 /Fh
+//    ..\DXGI\VertexShader.h /Vn vertex_shader ..\DXGI\VertexShader.hlsl
 //
 //
 // Buffer Definitions: 
@@ -25,18 +29,18 @@
 //
 // Input signature:
 //
-// Name                 Index   Mask Register SysValue  Format   Used
-// -------------------- ----- ------ -------- -------- ------- ------
-// POSITION                 0   xyzw        0     NONE   float   xyz 
-// TEXCOORD                 0   xy          1     NONE   float   xy  
+// Name                 Index   Mask Register SysValue Format   Used
+// -------------------- ----- ------ -------- -------- ------ ------
+// POSITION                 0   xyzw        0     NONE  float   xyz 
+// TEXCOORD                 0   xy          1     NONE  float   xy  
 //
 //
 // Output signature:
 //
-// Name                 Index   Mask Register SysValue  Format   Used
-// -------------------- ----- ------ -------- -------- ------- ------
-// SV_POSITION              0   xyzw        0      POS   float   xyzw
-// TEXCOORD                 0   xy          1     NONE   float   xy  
+// Name                 Index   Mask Register SysValue Format   Used
+// -------------------- ----- ------ -------- -------- ------ ------
+// SV_POSITION              0   xyzw        0      POS  float   xyzw
+// TEXCOORD                 0   xy          1     NONE  float   xy  
 //
 //
 // Constant buffer to DX9 shader constant mappings:
@@ -56,7 +60,7 @@
 //
 // Level9 shader bytecode:
 //
-    vs_2_0
+    vs_2_x
     def c9, 1, 0, 0, 0
     dcl_texcoord v0
     dcl_texcoord1 v1
@@ -98,10 +102,10 @@ ret
 
 const BYTE vertex_shader[] =
 {
-     68,  88,  66,  67, 130, 125, 
-    227, 228,  87, 137, 190,  81, 
-    232,  34, 254, 234,  26,  84, 
-    231, 198,   1,   0,   0,   0, 
+     68,  88,  66,  67, 248,  69, 
+     68,   6, 144, 184, 236,  83, 
+      0, 140, 118, 138, 123,  36, 
+     77,  53,   1,   0,   0,   0, 
      92,   5,   0,   0,   6,   0, 
       0,   0,  56,   0,   0,   0, 
     120,   1,   0,   0,  20,   3, 
@@ -119,7 +123,7 @@ const BYTE vertex_shader[] =
       0,   0,   0,   0,   0,   0, 
       8,   0,   4,   0,   5,   0, 
       0,   0,   0,   0,   0,   0, 
-      0,   0,   0,   2, 254, 255, 
+      0,   0,   1,   2, 254, 255, 
      81,   0,   0,   5,   9,   0, 
      15, 160,   0,   0, 128,  63, 
       0,   0,   0,   0,   0,   0, 
@@ -295,9 +299,9 @@ const BYTE vertex_shader[] =
      83,  76,  32,  83, 104,  97, 
     100, 101, 114,  32,  67, 111, 
     109, 112, 105, 108, 101, 114, 
-     32,  54,  46,  51,  46,  57, 
-     54,  48,  48,  46,  49,  54, 
-     51,  56,  52,   0, 171, 171, 
+     32,  57,  46,  50,  55,  46, 
+     57,  53,  50,  46,  51,  48, 
+     50,  50,   0, 171, 171, 171, 
      73,  83,  71,  78,  76,   0, 
       0,   0,   2,   0,   0,   0, 
       8,   0,   0,   0,  56,   0,