Implemented Format Support Table (#13)

* Updated D3d12info submodule * Working format table * Replaced emoji with icons in format table * Updated required icon * Changed color in required.svg * Changed icon colors for light mode, some small code cleanup * Updated D3d12info submodule
Devaniti · Dec 30, 2024 · ee9bbae · ee9bbae
1 parent d942e89
commit ee9bbae
Show file tree

Hide file tree

Showing 36 changed files with 15,377 additions and 1,396 deletions.
diff --git a/source/GUI/html/default.js b/source/GUI/html/default.js
diff --git a/source/GUI/html/error.svg b/source/GUI/html/error.svg
diff --git a/source/GUI/html/index.html b/source/GUI/html/index.html
@@ -1 +1 @@
-<!doctype html><html><head><title>D3d12infoGUI Report</title><meta charset="UTF-8"><script src="reports.json"></script><script defer="defer" src="default.js"></script></head><body><noscript>This app requires javascript to run</noscript><main><div class="ReportTable"><div id="ListContainer"></div><div id="SearchBarPropertiesContainer"></div><div id="HeaderContainer"></div><div id="ReportContainer"></div></div></main></body></html>
+<!doctype html><html><head><title>D3d12infoGUI Report</title><meta charset="UTF-8"><script src="reports.js"></script><script defer="defer" src="default.js"></script></head><body><noscript>This app requires javascript to run</noscript><main><div class="ReportTable"><div id="ListContainer"></div><div id="SearchBarPropertiesContainer"></div><div id="HeaderContainer"></div><div id="ReportContainer"></div></div></main></body></html>
diff --git a/source/GUI/html/required.svg b/source/GUI/html/required.svg
diff --git a/source/GUI/html/supported.svg b/source/GUI/html/supported.svg
diff --git a/source/GUI/html/unsupported.svg b/source/GUI/html/unsupported.svg
diff --git a/source/GUI/private/main.cpp b/source/GUI/private/main.cpp
@@ -34,7 +34,7 @@ int RunGUI(HINSTANCE hInstance) {
   std::vector<std::vector<char>> validReports;
 
   const Subprocess::ProcessOutput report = Subprocess::GetCommandOutput(
-      d3d12infoPath.string() + " -j --AllAdapters --EnableExperimental=OFF");
+      d3d12infoPath.string() + " --AllAdapters --JSON --Formats --EnableExperimental=OFF");
   if (report.first == 0) {
     validReports.push_back(report.second);
   }
@@ -44,7 +44,7 @@ int RunGUI(HINSTANCE hInstance) {
 
   const Subprocess::ProcessOutput previewReport =
       Subprocess::GetCommandOutput(d3d12infoPreviewPath.string() +
-                                   " -j --AllAdapters --EnableExperimental=ON");
+                                   " --AllAdapters --JSON --Formats --EnableExperimental=ON");
   if (previewReport.first == 0) {
     validReports.push_back(previewReport.second);
   }

diff --git a/source/GUI/private/report_generator.cpp b/source/GUI/private/report_generator.cpp
@@ -13,7 +13,7 @@ void ReportGenerator::GenerateHTML(
     }
   }
 
-  std::filesystem::path jsFilePath = rootPath / L"Reports.json";
+  std::filesystem::path jsFilePath = rootPath / L"reports.js";
   std::ofstream jsonFile;
   jsonFile.open(jsFilePath, std::ios_base::out | std::ios_base::binary);
   if (jsonFile.fail()) {

diff --git a/source/external/D3d12info b/source/external/D3d12info
diff --git a/source/frontend/assets/css/main.css b/source/frontend/assets/css/main.css
@@ -68,6 +68,13 @@ a:hover {
     margin-left: auto;
 }
 
+.cell-icon {
+    width: 1.45em;
+    height: 1.45em;
+    margin-left: auto;
+    margin-right: auto;
+}
+
 @media (prefers-color-scheme: dark) {
     body {
         color: #e1e1e1;

diff --git a/source/frontend/assets/css/report_table.css b/source/frontend/assets/css/report_table.css
@@ -1,6 +1,5 @@
 main {
     width: 100%;
-    overflow-x: scroll;
 }
 
 .ReportTable {
@@ -64,11 +63,6 @@ td {
 
 td:nth-of-type(even) {
     background-color: #00000010;
-    width: 10%;
-}
-
-td:nth-of-type(odd) {
-    width: 60%;
 }
 
 button {
@@ -154,6 +148,21 @@ button:disabled {
     vertical-align: sub;
 }
 
+.FormatTable {
+    width: auto;
+    top: 0;
+}
+
+.FormatTable tr:nth-of-type(1) {
+    writing-mode: vertical-rl;
+    position: sticky;
+    top: 0;
+}
+
+.FormatTable tr:nth-of-type(1) td:nth-of-type(1) {
+    writing-mode: horizontal-tb;
+}
+
 @media (prefers-color-scheme: dark) {
 
     table,

diff --git a/source/frontend/assets/html_gui/index.html b/source/frontend/assets/html_gui/index.html
@@ -4,7 +4,7 @@
 <head>
     <title>D3d12infoGUI Report</title>
     <meta charset="UTF-8">
-    <script type="text/javascript" src="reports.json"></script>
+    <script type="text/javascript" src="reports.js"></script>
 </head>
 
 <body>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		<!doctype html><html><head><title>D3d12infoGUI Report</title><meta charset="UTF-8"><script src="reports.json"></script><script defer="defer" src="default.js"></script></head><body><noscript>This app requires javascript to run</noscript><main><div class="ReportTable"><div id="ListContainer"></div><div id="SearchBarPropertiesContainer"></div><div id="HeaderContainer"></div><div id="ReportContainer"></div></div></main></body></html>
		<!doctype html><html><head><title>D3d12infoGUI Report</title><meta charset="UTF-8"><script src="reports.js"></script><script defer="defer" src="default.js"></script></head><body><noscript>This app requires javascript to run</noscript><main><div class="ReportTable"><div id="ListContainer"></div><div id="SearchBarPropertiesContainer"></div><div id="HeaderContainer"></div><div id="ReportContainer"></div></div></main></body></html>
+40 −0		.github/workflows/CI.yml
+76 −0		.github/workflows/Package.yml
+1 −0		.gitignore
+3 −0		.gitmodules
+16 −0		CHANGELOG.md
+9 −11		CMakeLists.txt
+2 −2		README.md
+7 −6		Src/Main.cpp
+1 −0		Src/ThirdParty/Vulkan-Headers
+2 −2		Src/Utils.cpp