From dcc2b854a64b3e4e890215ff21cf4b219724f524 Mon Sep 17 00:00:00 2001
From: lucy96chen <47800040+lucy96chen@users.noreply.github.com>
Date: Tue, 26 Oct 2021 16:30:59 -0700
Subject: Expanded gfx::Format to include additional formats (#1982)

* Format list updated with additional formats supported by both D3D and Vulkan; D3DUtil::getMapFormat() and VkUtil::getVkFormat() updated to include additional formats; GFX_FORMAT() updated with all additional formats (BC compression unfinished)

* Finished updating GFX_FORMAT with newly added formats and sizes; Pixel size is now tracked using the FormatPixelSize struct containing the values for bytes per block and pixels per block to accomodate BC formats; Updated gfxGetFormatSize and associated sub-calls to return FormatPixelSize instead of uint8_t; Most calls to gfxGetFormatSize() updated to reflect changes, a couple calls still unupdated

* Changes to accommodate new formats finished, debugging slang-literal unit test

* First format unit test working

* One test added for BC1Unorm and RGBA8Unorm_SRGB, both passing

* Refactored format testing code to merge BC1Unorm and RGBA8Unorm SRGB into a single file

* All unit tests added for BC and Srgb formats

* Most tests added and working; Added five additional formats (still need tests) and made the appropriate changes to support these; createTextureView() modified for D3D11, D3D12, and Vulkan to take into account the format specified in the texture view desc when the texture's format is typeless

* Format enums renamed to more closely match their D3D counterparts; Added a universal float and uint buffer and buffer view for use across all Format tests

* Remaining tests added; D3D12 tests pass, but Vulkan crashes in BC1_UNORM and D3D11 spits out a bunch of D3D11 Errors (but supposedly passes)

* re-run premake

* Added Sint versions of test shaders; Vulkan and D3D11 tests also pass

* Size struct for format unit tests no longer use initializer lists

* Fixed a Size struct missed in the previous pass

* Fixed minor bugs causing tests to fail

* Added documentation detailing all currently unsupported formats

* Skip tests causing unsupported format warnings due to swiftshader

* updated several test using old Format enum names

* Revert change to compareComputeResult() that was added for debugging purposes

* DEBUGGING: Added prints to identify which formats are failing on CI

* Reverted attempted debugging changes; Fixed texture2d-gather.hlsl to use updated Format enums

* Fixed incorrect array sizes in d3d11 _initSrvDesc()

* Commented out further tests that produce unexpected results when tested for Vulkan with swiftshader

* Revert "Merge branch 'expanded-format-support' of https://github.com/lucy96chen/slang into expanded-format-support"

This reverts commit 20008f0d3ecc3b1405ecac8c138edaa3cd37ed6b, reversing
changes made to 6081e95827315fee50e18409394d5abd62fac787.

* Added a fuzzy comparison function for use with floats

* submodule update

* Revert messed up changes caused by previous revert after automatically merging on github
---
 tools/platform/gui.cpp   | 10 +++++-----
 tools/platform/model.cpp |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'tools/platform')

diff --git a/tools/platform/gui.cpp b/tools/platform/gui.cpp
index e4f269b95..1573a848b 100644
--- a/tools/platform/gui.cpp
+++ b/tools/platform/gui.cpp
@@ -102,9 +102,9 @@ GUI::GUI(
     program = device->createProgram(programDesc);
 #endif
     InputElementDesc inputElements[] = {
-        {"U", 0, Format::RG_Float32,        offsetof(ImDrawVert, pos) },
-        {"U", 1, Format::RG_Float32,        offsetof(ImDrawVert, uv) },
-        {"U", 2, Format::RGBA_Unorm_UInt8,  offsetof(ImDrawVert, col) },
+        {"U", 0, Format::R32G32_FLOAT,        offsetof(ImDrawVert, pos) },
+        {"U", 1, Format::R32G32_FLOAT,        offsetof(ImDrawVert, uv) },
+        {"U", 2, Format::R8G8B8A8_UNORM,  offsetof(ImDrawVert, col) },
     };
     auto inputLayout = device->createInputLayout(
         &inputElements[0],
@@ -141,7 +141,7 @@ GUI::GUI(
     {
         gfx::ITextureResource::Desc desc = {};
         desc.type = IResource::Type::Texture2D;
-        desc.format = Format::RGBA_Unorm_UInt8;
+        desc.format = Format::R8G8B8A8_UNORM;
         desc.arraySize = 0;
         desc.size.width = width;
         desc.size.height = height;
@@ -289,7 +289,7 @@ void GUI::endFrame(ITransientResourceHeap* transientHeap, IFramebuffer* framebuf
 
     renderEncoder->setVertexBuffer(0, vertexBuffer, sizeof(ImDrawVert));
     renderEncoder->setIndexBuffer(
-        indexBuffer, sizeof(ImDrawIdx) == 2 ? Format::R_UInt16 : Format::R_UInt32);
+        indexBuffer, sizeof(ImDrawIdx) == 2 ? Format::R16_UINT : Format::R32_UINT);
     renderEncoder->setPrimitiveTopology(PrimitiveTopology::TriangleList);
 
     UInt vertexOffset = 0;
diff --git a/tools/platform/model.cpp b/tools/platform/model.cpp
index 57acf9ecd..a48d499b9 100644
--- a/tools/platform/model.cpp
+++ b/tools/platform/model.cpp
@@ -125,7 +125,7 @@ ComPtr<ITextureResource> loadTextureImage(
     default:
         return nullptr;
 
-    case 4: format = Format::RGBA_Unorm_UInt8;
+    case 4: format = Format::R8G8B8A8_UNORM;
 
     // TODO: handle other cases here if/when we stop forcing 4-component
     // results when loading the image with stb_image.
-- 
cgit v1.2.3