Kolja Strohm 5 жил өмнө
parent
commit
6ccc1eedc0

+ 15 - 15
DX12PixelShader.h

@@ -92,10 +92,10 @@ ret
 
 const BYTE DX12PixelShaderBytes[] =
 {
-     68,  88,  66,  67, 255, 182, 
-     42,  75,   2,  26, 189,  63, 
-    119,  89,  98, 255,  97,  98, 
-     27, 159,   1,   0,   0,   0, 
+     68,  88,  66,  67, 114, 243, 
+    145,  51, 101,  13, 165,  48, 
+     54, 140,  98,   4,  16, 147, 
+    147, 146,   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,   5, 106, 112,  92, 
-      1,   0,   0,   0,  51,  78, 
-      2,  68, 165, 161, 239,  67, 
-    157, 247, 233, 155, 212, 209, 
-    201, 243,   0,   0,   0,   0, 
+     49,   1, 124, 114, 112,  92, 
+      1,   0,   0,   0,  66, 186, 
+     98, 221, 223, 239, 127,  69, 
+    130, 219, 172, 205,  82, 188, 
+    242, 129,   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, 
-    144,  32, 171, 222, 245, 202, 
+     37,  42, 101, 234, 250, 202, 
     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, 152, 121, 109,   3, 
+      0,   0,   8, 124,  85,   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, 
-      5, 106, 112,  92,   1,   0, 
-      0,   0,  51,  78,   2,  68, 
-    165, 161, 239,  67, 157, 247, 
-    233, 155, 212, 209, 201, 243, 
+    124, 114, 112,  92,   1,   0, 
+      0,   0,  66, 186,  98, 221, 
+    223, 239, 127,  69, 130, 219, 
+    172, 205,  82, 188, 242, 129, 
     137,   0,   0,   0,  47,  76, 
     105, 110, 107,  73, 110, 102, 
     111,   0,  47, 110,  97, 109, 

+ 19 - 19
DX12VertexShader.h

@@ -129,10 +129,10 @@ ret
 
 const BYTE DX12VertexShaderBytes[] =
 {
-     68,  88,  66,  67,  49, 137, 
-    135, 212, 248, 191, 134, 200, 
-    205,  24, 152,  70,  58,  98, 
-      1,  99,   1,   0,   0,   0, 
+     68,  88,  66,  67, 254, 185, 
+    146,   8, 224, 111, 124,  60, 
+    131,  22, 229, 113, 218, 219, 
+     74,  64,   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,   5, 106, 
+    148,  46,  49,   1, 124, 114, 
     112,  92,   1,   0,   0,   0, 
-     59, 178, 228,  41, 136, 123, 
-    167,  76, 184, 122,  93, 145, 
-    227,  23,  22, 220,   0,   0, 
+    136, 242,  51, 195, 122,  16, 
+    134,  64, 147,  62, 213, 187, 
+    169,  30, 224, 105,   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, 
-    165,  88,   3,   0,  53, 174, 
+     84, 216,   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, 214,  32, 233, 222, 
-    245, 202, 212,   1,   1,   0, 
+      0,   0,  47,  53, 155, 234, 
+    250, 202, 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, 123,   0,   0, 242, 241, 
+     64, 107,   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, 
-     22, 220,   0,   0,   0,   0, 
+    224, 105,   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, 
-    248, 123,  23,   3,   0,   0, 
+    200, 124, 203,   3,   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,  22, 220, 
+      0,  96,   0,   0, 224, 105, 
       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,   5, 106, 
+    148,  46,  49,   1, 124, 114, 
     112,  92,   1,   0,   0,   0, 
-     59, 178, 228,  41, 136, 123, 
-    167,  76, 184, 122,  93, 145, 
-    227,  23,  22, 220, 138,   0, 
+    136, 242,  51, 195, 122,  16, 
+    134,  64, 147,  62, 213, 187, 
+    169,  30, 224, 105, 138,   0, 
       0,   0,  47,  76, 105, 110, 
     107,  73, 110, 102, 111,   0, 
      47, 110,  97, 109, 101, 115, 

+ 2 - 2
Framework Linux.vcxproj

@@ -89,8 +89,8 @@
     <TargetExt>.so</TargetExt>
     <RemoteProjectDir>$(RemoteRootDir)/Framework/release</RemoteProjectDir>
     <TargetName>libFramework</TargetName>
-    <OutDir>$(RemoteRootDir)/Framework/release</OutDir>
-    <IntDir>$(RemoteRootDir)/Framework/release</IntDir>
+    <OutDir>$(RemoteRootDir)/Framework/release/</OutDir>
+    <IntDir>$(RemoteRootDir)/Framework/release/</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
     <TargetExt>.so</TargetExt>

+ 15 - 15
UIPixelShader.h

@@ -262,10 +262,10 @@ ret
 
 const BYTE UIPixelShader[] =
 {
-     68,  88,  66,  67, 106,  41, 
-    221,  45,  13, 150, 146, 167, 
-    215, 104,  52,  17, 139, 191, 
-     79,  78,   1,   0,   0,   0, 
+     68,  88,  66,  67, 156,  39, 
+    179,  28, 243,  60, 165, 197, 
+      9, 185, 122,  87, 132, 231, 
+    210,  22,   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, 
-      5, 106, 112,  92,   1,   0, 
-      0,   0, 220,   7,  76, 190, 
-     20, 180,  42,  73, 129, 107, 
-     46,  22, 124, 167,  44, 110, 
+    124, 114, 112,  92,   1,   0, 
+      0,   0, 196, 224,  21,  32, 
+    204, 222, 135,  75, 151, 218, 
+    220, 142, 185, 188,  15, 165, 
       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,  38, 103,  15, 223, 
-    245, 202, 212,   1,   1,   0, 
+      0,   0, 142, 143, 188, 234, 
+    250, 202, 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,  98,   3,   0,   0, 
+    248, 123,  35,   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,   5, 106, 
+    148,  46,  49,   1, 124, 114, 
     112,  92,   1,   0,   0,   0, 
-    220,   7,  76, 190,  20, 180, 
-     42,  73, 129, 107,  46,  22, 
-    124, 167,  44, 110, 137,   0, 
+    196, 224,  21,  32, 204, 222, 
+    135,  75, 151, 218, 220, 142, 
+    185, 188,  15, 165, 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, 208, 191, 
-    120,  43,  56,  60, 118, 191, 
-    203,  35,  22,   3,  49, 252, 
-     94, 120,   1,   0,   0,   0, 
+     68,  88,  66,  67,  97, 172, 
+     48, 170, 129, 125, 196,  44, 
+      1,  53, 186,  90, 232, 205, 
+    223, 180,   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, 
-      6, 106, 112,  92,   1,   0, 
-      0,   0, 171,  88, 222, 240, 
-    194,   3, 216,  76, 162,  18, 
-    188, 184, 156, 253, 183, 211, 
+    125, 114, 112,  92,   1,   0, 
+      0,   0,  11,  94, 179, 138, 
+     82,   0, 171,  70, 149,  69, 
+    168,   6,  95, 181, 184,  75, 
       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,  90, 220,  80, 223, 
-    245, 202, 212,   1,   1,   0, 
+      0,   0,  18,  41, 248, 234, 
+    250, 202, 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, 183, 211, 
+      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,  40, 122, 
-      5,   3,   0,   0,   0,   0, 
+      1,   0,   0,   0,   8, 125, 
+    168,   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, 
-    183, 211,   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,   6, 106, 112,  92, 
-      1,   0,   0,   0, 171,  88, 
-    222, 240, 194,   3, 216,  76, 
-    162,  18, 188, 184, 156, 253, 
-    183, 211, 138,   0,   0,   0, 
+     49,   1, 125, 114, 112,  92, 
+      1,   0,   0,   0,  11,  94, 
+    179, 138,  82,   0, 171,  70, 
+    149,  69, 168,   6,  95, 181, 
+    184,  75, 138,   0,   0,   0, 
      47,  76, 105, 110, 107,  73, 
     110, 102, 111,   0,  47, 110, 
      97, 109, 101, 115,   0,  47,