Browse Source

versionsupgrade

Kolja Strohm 5 years ago
parent
commit
dc4c4e23fa
5 changed files with 74 additions and 74 deletions
  1. 15 15
      DX12PixelShader.h
  2. 21 21
      DX12VertexShader.h
  3. 3 3
      Framework.vcxproj
  4. 16 16
      UIPixelShader.h
  5. 19 19
      UIVertexShader.h

+ 15 - 15
DX12PixelShader.h

@@ -92,10 +92,10 @@ ret
 
 const BYTE DX12PixelShaderBytes[] =
 {
-     68,  88,  66,  67, 179, 146, 
-    190, 248, 156,  97, 187, 118, 
-    161,  62,  99, 153,  99,   6, 
-     32, 180,   1,   0,   0,   0, 
+     68,  88,  66,  67,  78, 170, 
+    199, 168,  70, 191,  49,   7, 
+     86, 108,  44,  90, 166,   7, 
+    127, 246,   1,   0,   0,   0, 
     184,  91,   0,   0,   6,   0, 
       0,   0,  56,   0,   0,   0, 
      36,   2,   0,   0, 188,   2, 
@@ -763,11 +763,11 @@ const BYTE DX12PixelShaderBytes[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0, 148,  46, 
-     49,   1, 203, 248, 160,  92, 
-      1,   0,   0,   0, 208,   4, 
-     70,  79,   5,  68, 204,  69, 
-    178,  39, 145, 192, 108,  98, 
-     99, 128,   0,   0,   0,   0, 
+     49,   1,  48,   7, 165,  92, 
+      1,   0,   0,   0, 167,  49, 
+    253, 225, 226, 201,  56,  74, 
+    190, 202,  81,  83,  84, 173, 
+    174,  39,   0,   0,   0,   0, 
       0,   0,   0,   0,   1,   0, 
       0,   0,   1,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -1788,7 +1788,7 @@ const BYTE DX12PixelShaderBytes[] =
      32,  32,  32,  32,  32,  32, 
      32,  32,  32,  32,  27, 226, 
      48,   1, 128,   0,   0,   0, 
-     94, 248,  14,  48, 231, 231, 
+     85, 163, 243,  30,  82, 234, 
     212,   1,   1,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -3427,7 +3427,7 @@ const BYTE DX12PixelShaderBytes[] =
       2,   0,   9,   0, 220,   4, 
       0,   0,   0,   0,   0,   0, 
     156,   1,   0,   0,   1,   0, 
-      0,   0, 216, 122, 178,   3, 
+      0,   0, 208, 126, 218,   3, 
       0,   0,   0,   0,   0,   0, 
       0,   0, 109,  97, 105, 110, 
       0, 110, 111, 110, 101,   0, 
@@ -3494,10 +3494,10 @@ const BYTE DX12PixelShaderBytes[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0, 148,  46,  49,   1, 
-    203, 248, 160,  92,   1,   0, 
-      0,   0, 208,   4,  70,  79, 
-      5,  68, 204,  69, 178,  39, 
-    145, 192, 108,  98,  99, 128, 
+     48,   7, 165,  92,   1,   0, 
+      0,   0, 167,  49, 253, 225, 
+    226, 201,  56,  74, 190, 202, 
+     81,  83,  84, 173, 174,  39, 
     137,   0,   0,   0,  47,  76, 
     105, 110, 107,  73, 110, 102, 
     111,   0,  47, 110,  97, 109, 

+ 21 - 21
DX12VertexShader.h

@@ -129,10 +129,10 @@ ret
 
 const BYTE DX12VertexShaderBytes[] =
 {
-     68,  88,  66,  67, 232,   7, 
-     22, 202, 117, 183,  24, 184, 
-     68, 161, 218,  22, 239,  28, 
-     15, 131,   1,   0,   0,   0, 
+     68,  88,  66,  67, 124, 127, 
+    213, 125, 139, 163, 118, 207, 
+     96, 172, 242, 124, 218, 210, 
+    141,  29,   1,   0,   0,   0, 
     108,  78,   0,   0,   6,   0, 
       0,   0,  56,   0,   0,   0, 
     124,   2,   0,   0,  16,   3, 
@@ -915,11 +915,11 @@ const BYTE DX12VertexShaderBytes[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-    148,  46,  49,   1, 203, 248, 
-    160,  92,   1,   0,   0,   0, 
-     70,  58, 218, 230,   8, 138, 
-    103,  72, 191, 139,  97, 212, 
-    149, 175, 165, 161,   0,   0, 
+    148,  46,  49,   1,  49,   7, 
+    165,  92,   1,   0,   0,   0, 
+     70, 228,  48, 242,  10,  43, 
+     75,  74, 177, 110,  89, 225, 
+    245,  16,   3, 178,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       1,   0,   0,   0,   1,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -1095,7 +1095,7 @@ const BYTE DX12VertexShaderBytes[] =
       0,   0, 103, 159,   1,   0, 
     179, 120,   1,   0, 238,  97, 
       2,   0,  90,  28,   0,   0, 
-    149,  49,   3,   0,  53, 174, 
+     30,  39,   1,   0,  53, 174, 
       3,   0, 206,  21,   0,   0, 
     193, 205,   3,   0, 207, 193, 
       1,   0,  62,   3,   3,   0, 
@@ -1684,8 +1684,8 @@ const BYTE DX12VertexShaderBytes[] =
     111, 110,  59,  13,  10, 125, 
      59,  13,  10,  13,  10,  47, 
      27, 226,  48,   1, 128,   0, 
-      0,   0,  42, 244,  73,  48, 
-    231, 231, 212,   1,   1,   0, 
+      0,   0, 192, 157,  45,  31, 
+     82, 234, 212,   1,   1,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -2200,7 +2200,7 @@ const BYTE DX12VertexShaderBytes[] =
      12,  16,   0,   0,   1,   0, 
       1,   0,  14,   0,  23,  21, 
      13,  16,   0,   0,  36,   2, 
-    176, 121,   0,   0, 242, 241, 
+    192, 121,   0,   0, 242, 241, 
      10,   0,  24,  21,  14,  16, 
       0,   0,   1,   0,   0,   2, 
      18,   0,  22,  21,  10,  16, 
@@ -3148,19 +3148,19 @@ const BYTE DX12VertexShaderBytes[] =
       1,   0,   0,   0,   0,   0, 
       0,   0,  24,   4,   0,   0, 
      32,   0,   0,  96,   0,   0, 
-    165, 161,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   2,   0, 
       9,   0, 132,   5,   0,   0, 
       0,   0,   0,   0, 236,   2, 
       0,   0,   1,   0,   0,   0, 
-    136, 121,   4,   3,   0,   0, 
+    224, 125, 154,   2,   0,   0, 
       0,   0,   0,   0,   0,   0, 
     109,  97, 105, 110,   0, 110, 
     111, 110, 101,   0,   0,   0, 
      45, 186,  46, 241,   1,   0, 
       0,   0,   0,   0,   0,   0, 
      24,   4,   0,   0,  32,   0, 
-      0,  96,   0,   0, 165, 161, 
+      0,  96,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   2,   0,   2,   0, 
       7,   0,   0,   0,   0,   0, 
@@ -3219,11 +3219,11 @@ const BYTE DX12VertexShaderBytes[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-    148,  46,  49,   1, 203, 248, 
-    160,  92,   1,   0,   0,   0, 
-     70,  58, 218, 230,   8, 138, 
-    103,  72, 191, 139,  97, 212, 
-    149, 175, 165, 161, 138,   0, 
+    148,  46,  49,   1,  49,   7, 
+    165,  92,   1,   0,   0,   0, 
+     70, 228,  48, 242,  10,  43, 
+     75,  74, 177, 110,  89, 225, 
+    245,  16,   3, 178, 138,   0, 
       0,   0,  47,  76, 105, 110, 
     107,  73, 110, 102, 111,   0, 
      47, 110,  97, 109, 101, 115, 

+ 3 - 3
Framework.vcxproj

@@ -35,21 +35,21 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">

+ 16 - 16
UIPixelShader.h

@@ -262,10 +262,10 @@ ret
 
 const BYTE UIPixelShader[] =
 {
-     68,  88,  66,  67, 169,  77, 
-    215, 185, 182, 146,  39, 175, 
-    241,  51, 201, 132, 251, 218, 
-    254, 176,   1,   0,   0,   0, 
+     68,  88,  66,  67, 143, 254, 
+    207, 133,  35, 124, 180, 144, 
+     52, 142, 151, 128, 135,  97, 
+    184,  51,   1,   0,   0,   0, 
     136, 104,   0,   0,   6,   0, 
       0,   0,  56,   0,   0,   0, 
     124,   5,   0,   0,  12,   6, 
@@ -1480,10 +1480,10 @@ const BYTE UIPixelShader[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0, 148,  46,  49,   1, 
-    203, 248, 160,  92,   1,   0, 
-      0,   0, 152, 102,  58,  80, 
-    169, 211,  72,  78, 132,  81, 
-     98, 217,  57, 172,  19, 197, 
+     49,   7, 165,  92,   1,   0, 
+      0,   0,  11,  32,  13, 151, 
+      6, 230,  77,  75, 130, 152, 
+     42, 155, 134, 178, 233,  92, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   1,   0,   0,   0, 
       1,   0,   0,   0,   0,   0, 
@@ -2419,8 +2419,8 @@ const BYTE UIPixelShader[] =
      32,  32,  32,  32,  32,  32, 
      32,  32,  32,  32,  32,  32, 
      27, 226,  48,   1, 128,   0, 
-      0,   0, 166,  99, 114,  48, 
-    231, 231, 212,   1,   1,   0, 
+      0,   0, 117,   5,  81,  31, 
+     82, 234, 212,   1,   1,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -4400,7 +4400,7 @@ const BYTE UIPixelShader[] =
       9,   0, 160,   7,   0,   0, 
       0,   0,   0,   0, 244,   9, 
       0,   0,   1,   0,   0,   0, 
-    168, 123,  90,   3,   0,   0, 
+    176, 125,  73,   3,   0,   0, 
       0,   0,   0,   0,   0,   0, 
      84, 101, 120, 116, 117, 114, 
     101,  80, 105, 120, 101, 108, 
@@ -4466,11 +4466,11 @@ const BYTE UIPixelShader[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
-    148,  46,  49,   1, 203, 248, 
-    160,  92,   1,   0,   0,   0, 
-    152, 102,  58,  80, 169, 211, 
-     72,  78, 132,  81,  98, 217, 
-     57, 172,  19, 197, 137,   0, 
+    148,  46,  49,   1,  49,   7, 
+    165,  92,   1,   0,   0,   0, 
+     11,  32,  13, 151,   6, 230, 
+     77,  75, 130, 152,  42, 155, 
+    134, 178, 233,  92, 137,   0, 
       0,   0,  47,  76, 105, 110, 
     107,  73, 110, 102, 111,   0, 
      47, 110,  97, 109, 101, 115, 

+ 19 - 19
UIVertexShader.h

@@ -119,10 +119,10 @@ ret
 
 const BYTE UIVertexShader[] =
 {
-     68,  88,  66,  67, 116, 180, 
-     11,  28, 141, 108,  19,  78, 
-    254, 182, 186,  81,  78, 139, 
-    207, 114,   1,   0,   0,   0, 
+     68,  88,  66,  67, 110, 167, 
+    175,  79, 169, 188, 115,  57, 
+    107,  14,  99, 182, 255, 219, 
+     42,  92,   1,   0,   0,   0, 
     168,  77,   0,   0,   6,   0, 
       0,   0,  56,   0,   0,   0, 
      20,   2,   0,   0, 168,   2, 
@@ -873,10 +873,10 @@ const BYTE UIVertexShader[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0, 148,  46,  49,   1, 
-    204, 248, 160,  92,   1,   0, 
-      0,   0, 164,  69,  80, 113, 
-    246,  63,  16,  74, 189,   0, 
-     98, 119,  47, 235, 107,   8, 
+     49,   7, 165,  92,   1,   0, 
+      0,   0,  88, 187, 154, 163, 
+    149, 145, 120,  70, 158,  47, 
+    101,  83, 148,  87,  17,  50, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   1,   0,   0,   0, 
       1,   0,   0,   0,   0,   0, 
@@ -1556,8 +1556,8 @@ const BYTE UIVertexShader[] =
      32,  32,  32,  32,  32,  32, 
      32,  32,  32,  32,  32,  32, 
      27, 226,  48,   1, 128,   0, 
-      0,   0, 135, 159, 171,  48, 
-    231, 231, 212,   1,   1,   0, 
+      0,   0, 115, 252, 149,  31, 
+     82, 234, 212,   1,   1,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
@@ -2934,13 +2934,13 @@ const BYTE UIVertexShader[] =
       0,   0,   0,   0,   1,   0, 
       0,   0,   0,   0,   0,   0, 
     196,   3,   0,   0,  32,   0, 
-      0,  96,   0,   0, 107,   8, 
+      0,  96,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   2,   0,   9,   0, 
      80,   5,   0,   0,   0,   0, 
       0,   0, 236,   2,   0,   0, 
-      1,   0,   0,   0,  88, 122, 
-     63,   3,   0,   0,   0,   0, 
+      1,   0,   0,   0, 224, 126, 
+      5,   3,   0,   0,   0,   0, 
       0,   0,   0,   0,  84, 101, 
     120, 116, 117, 114, 101,  86, 
     101, 114, 116, 101, 120,  83, 
@@ -2950,7 +2950,7 @@ const BYTE UIVertexShader[] =
       1,   0,   0,   0,   0,   0, 
       0,   0, 196,   3,   0,   0, 
      32,   0,   0,  96,   0,   0, 
-    107,   8,   0,   0,   0,   0, 
+      0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   2,   0, 
       2,   0,   7,   0,   0,   0, 
       0,   0,   1,   0, 255, 255, 
@@ -3006,11 +3006,11 @@ const BYTE UIVertexShader[] =
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0,   0,   0, 
       0,   0,   0,   0, 148,  46, 
-     49,   1, 204, 248, 160,  92, 
-      1,   0,   0,   0, 164,  69, 
-     80, 113, 246,  63,  16,  74, 
-    189,   0,  98, 119,  47, 235, 
-    107,   8, 138,   0,   0,   0, 
+     49,   1,  49,   7, 165,  92, 
+      1,   0,   0,   0,  88, 187, 
+    154, 163, 149, 145, 120,  70, 
+    158,  47, 101,  83, 148,  87, 
+     17,  50, 138,   0,   0,   0, 
      47,  76, 105, 110, 107,  73, 
     110, 102, 111,   0,  47, 110, 
      97, 109, 101, 115,   0,  47,