Browse Source

Fehler auf Linux System behoben

Kolja Strohm 5 years ago
parent
commit
f907de9812
6 changed files with 77 additions and 76 deletions
  1. 7 1
      Bildschirm.h
  2. 15 15
      DX12PixelShader.h
  3. 19 19
      DX12VertexShader.h
  4. 2 7
      GraphicsApi.h
  5. 15 15
      UIPixelShader.h
  6. 19 19
      UIVertexShader.h

+ 7 - 1
Bildschirm.h

@@ -48,7 +48,13 @@ namespace Framework
     class TexturModel; // TexturModel.h
     class GraphicsApi; // GraphicsApi.h
     class DirectX9; // GraphicsApi.h
-    enum GraphicApiType;
+    enum GraphicApiType
+    {
+        NOT_SUPPORTED, // no graphic api supported
+        DIRECTX9, // only 2d
+        DIRECTX11, // 3d simple phong model without shadows
+        DIRECTX12 // 3d phong model with raytraycing
+    };
 
     // Eine Struktur, die Informationen über einen Monitor beinhaltet
     struct Monitor

+ 15 - 15
DX12PixelShader.h

@@ -92,10 +92,10 @@ ret
 
 const BYTE DX12PixelShaderBytes[] =
 {
-     68,  88,  66,  67, 178,  29, 
-      2,  31, 158,  42,  74,  30, 
-    155, 213, 236, 181, 141, 143, 
-    181, 187,   1,   0,   0,   0, 
+     68,  88,  66,  67, 190, 239, 
+    104, 179, 151, 186, 105, 193, 
+    169,  63,   7, 146,  55,   8, 
+    117, 153,   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, 145,  64, 137,  92, 
-      1,   0,   0,   0,  26,  63, 
-     90,  98, 124, 241,  37,  73, 
-    163,  64, 246,  84,  37, 126, 
-     97, 121,   0,   0,   0,   0, 
+     49,   1, 113, 152, 137,  92, 
+      1,   0,   0,   0, 124, 158, 
+    153, 251, 159,  66, 151,  68, 
+    147,  83, 122,  62, 212, 110, 
+     43, 112,   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, 
-    143, 164,  63, 220, 195, 217, 
+     83, 240, 158,  60, 248, 217, 
     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, 200, 122,  92,   3, 
+      0,   0, 104, 122, 140,   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, 
-    145,  64, 137,  92,   1,   0, 
-      0,   0,  26,  63,  90,  98, 
-    124, 241,  37,  73, 163,  64, 
-    246,  84,  37, 126,  97, 121, 
+    113, 152, 137,  92,   1,   0, 
+      0,   0, 124, 158, 153, 251, 
+    159,  66, 151,  68, 147,  83, 
+    122,  62, 212, 110,  43, 112, 
     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, 144,  29, 
-    174,  49, 109,  11,  56, 143, 
-     92,   8,  39, 233, 178,  52, 
-     52,  65,   1,   0,   0,   0, 
+     68,  88,  66,  67, 169, 254, 
+     17,  20,  42, 189, 210,  28, 
+    180, 148, 103, 154, 207,  29, 
+     88, 138,   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, 146,  64, 
+    148,  46,  49,   1, 113, 152, 
     137,  92,   1,   0,   0,   0, 
-    161, 246, 131,   5, 140,  87, 
-    214,  75, 167, 216, 255, 147, 
-     33,  68, 128,  81,   0,   0, 
+     35,  54, 114, 225,  15,  96, 
+     15,  70, 135,  29, 249, 225, 
+     68,  90, 178, 252,   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, 
-    140, 238,   0,   0,  53, 174, 
+    186, 102,   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,  85,  26, 141, 220, 
-    195, 217, 212,   1,   1,   0, 
+      0,   0, 201, 218, 215,  60, 
+    248, 217, 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, 
-    224,  85,   0,   0, 242, 241, 
+     64, 123,   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, 
-      0,   0,   0,   0,   0,   0, 
+    178, 252,   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, 
-    120, 123, 232,   2,   0,   0, 
+    216, 121,  51,   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,   0,   0, 
+      0,  96,   0,   0, 178, 252, 
       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, 146,  64, 
+    148,  46,  49,   1, 113, 152, 
     137,  92,   1,   0,   0,   0, 
-    161, 246, 131,   5, 140,  87, 
-    214,  75, 167, 216, 255, 147, 
-     33,  68, 128,  81, 138,   0, 
+     35,  54, 114, 225,  15,  96, 
+     15,  70, 135,  29, 249, 225, 
+     68,  90, 178, 252, 138,   0, 
       0,   0,  47,  76, 105, 110, 
     107,  73, 110, 102, 111,   0, 
      47, 110,  97, 109, 101, 115, 

+ 2 - 7
GraphicsApi.h

@@ -3,6 +3,7 @@
 #include "Vec2.h"
 #include "Mat4.h"
 #include "Ebene3D.h"
+#include "Bildschirm.h"
 
 // DirectX 12 Types
 
@@ -68,13 +69,7 @@ namespace Framework
     class DX12VertexBuffer;
     class DX12IndexBuffer;
 
-    enum GraphicApiType
-    {
-        NOT_SUPPORTED, // no graphic api supported
-        DIRECTX9, // only 2d
-        DIRECTX11, // 3d simple phong model without shadows
-        DIRECTX12 // 3d phong model with raytraycing
-    };
+    enum GraphicApiType;
 
     struct DiffuseLight
     {

+ 15 - 15
UIPixelShader.h

@@ -262,10 +262,10 @@ ret
 
 const BYTE UIPixelShader[] =
 {
-     68,  88,  66,  67, 250, 232, 
-    159,  49, 187, 217, 139, 216, 
-    209, 227,  43, 182, 211, 208, 
-    246,  64,   1,   0,   0,   0, 
+     68,  88,  66,  67, 243,  71, 
+     59,  75, 253,  41, 179, 219, 
+     32, 199, 108,  58,   5,  56, 
+    140,  79,   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, 
-    146,  64, 137,  92,   1,   0, 
-      0,   0, 247, 229, 230, 129, 
-     97, 219,   3,  68, 135, 152, 
-    182,  68, 145, 153,  44,  55, 
+    113, 152, 137,  92,   1,   0, 
+      0,   0,   4, 109, 104, 217, 
+    199, 161, 245,  74, 130, 233, 
+      2, 219, 172,  31, 120, 208, 
       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,  91, 149, 188, 220, 
-    195, 217, 212,   1,   1,   0, 
+      0,   0,  18,   3, 251,  60, 
+    248, 217, 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, 
-    216, 121,  65,   3,   0,   0, 
+    104, 123, 205,   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, 146,  64, 
+    148,  46,  49,   1, 113, 152, 
     137,  92,   1,   0,   0,   0, 
-    247, 229, 230, 129,  97, 219, 
-      3,  68, 135, 152, 182,  68, 
-    145, 153,  44,  55, 137,   0, 
+      4, 109, 104, 217, 199, 161, 
+    245,  74, 130, 233,   2, 219, 
+    172,  31, 120, 208, 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, 132,  57, 
-    115, 109,  77, 237,  97, 223, 
-    191, 232, 204, 193,  51, 150, 
-     54, 246,   1,   0,   0,   0, 
+     68,  88,  66,  67,  24,  30, 
+    181, 208,   6, 125,  64,  36, 
+    240, 115, 132, 173,  52, 149, 
+    229,  27,   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, 
-    147,  64, 137,  92,   1,   0, 
-      0,   0, 242, 143,   6,  35, 
-     77, 123,  59,  71, 187, 147, 
-    119,  48,  49,  26, 192, 229, 
+    114, 152, 137,  92,   1,   0, 
+      0,   0, 113, 209, 207, 189, 
+     12, 118,  64,  71, 138,  83, 
+    131, 160, 221,  69,  39, 235, 
       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, 104,  61,  20, 221, 
-    195, 217, 212,   1,   1,   0, 
+      0,   0, 194, 142,  63,  61, 
+    248, 217, 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, 192, 229, 
+      0,  96,   0,   0,  39, 235, 
       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, 200, 121, 
-    106,   3,   0,   0,   0,   0, 
+      1,   0,   0,   0, 248, 122, 
+    140,   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, 
-    192, 229,   0,   0,   0,   0, 
+     39, 235,   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, 147,  64, 137,  92, 
-      1,   0,   0,   0, 242, 143, 
-      6,  35,  77, 123,  59,  71, 
-    187, 147, 119,  48,  49,  26, 
-    192, 229, 138,   0,   0,   0, 
+     49,   1, 114, 152, 137,  92, 
+      1,   0,   0,   0, 113, 209, 
+    207, 189,  12, 118,  64,  71, 
+    138,  83, 131, 160, 221,  69, 
+     39, 235, 138,   0,   0,   0, 
      47,  76, 105, 110, 107,  73, 
     110, 102, 111,   0,  47, 110, 
      97, 109, 101, 115,   0,  47,