summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorlucy96chen <47800040+lucy96chen@users.noreply.github.com>2021-10-26 16:30:59 -0700
committerGitHub <noreply@github.com>2021-10-26 16:30:59 -0700
commitdcc2b854a64b3e4e890215ff21cf4b219724f524 (patch)
treefe958a184f46f4a1bbf10f6c7174d31283df76dc /examples
parentfe6d5f1cf8865567e08cf210a2639ffde2886fc3 (diff)
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
Diffstat (limited to 'examples')
-rw-r--r--examples/example-base/example-base.cpp8
-rw-r--r--examples/model-viewer/main.cpp8
-rw-r--r--examples/ray-tracing-pipeline/main.cpp8
-rw-r--r--examples/ray-tracing/main.cpp8
-rw-r--r--examples/shader-toy/main.cpp2
-rw-r--r--examples/triangle/main.cpp4
6 files changed, 19 insertions, 19 deletions
diff --git a/examples/example-base/example-base.cpp b/examples/example-base/example-base.cpp
index c45e3cc27..a7a8e7673 100644
--- a/examples/example-base/example-base.cpp
+++ b/examples/example-base/example-base.cpp
@@ -50,7 +50,7 @@ Slang::Result WindowedAppBase::initializeBase(
// Create swapchain and framebuffers.
gfx::ISwapchain::Desc swapchainDesc = {};
- swapchainDesc.format = gfx::Format::RGBA_Unorm_UInt8;
+ swapchainDesc.format = gfx::Format::R8G8B8A8_UNORM;
swapchainDesc.width = width;
swapchainDesc.height = height;
swapchainDesc.imageCount = kSwapchainImageCount;
@@ -59,7 +59,7 @@ Slang::Result WindowedAppBase::initializeBase(
gSwapchain = gDevice->createSwapchain(swapchainDesc, windowHandle);
IFramebufferLayout::AttachmentLayout renderTargetLayout = {gSwapchain->getDesc().format, 1};
- IFramebufferLayout::AttachmentLayout depthLayout = {gfx::Format::D_Float32, 1};
+ IFramebufferLayout::AttachmentLayout depthLayout = {gfx::Format::D32_FLOAT, 1};
IFramebufferLayout::Desc framebufferLayoutDesc;
framebufferLayoutDesc.renderTargetCount = 1;
framebufferLayoutDesc.renderTargets = &renderTargetLayout;
@@ -117,7 +117,7 @@ void WindowedAppBase::createSwapchainFramebuffers()
depthBufferDesc.size.width = gSwapchain->getDesc().width;
depthBufferDesc.size.height = gSwapchain->getDesc().height;
depthBufferDesc.size.depth = 1;
- depthBufferDesc.format = gfx::Format::D_Float32;
+ depthBufferDesc.format = gfx::Format::D32_FLOAT;
depthBufferDesc.defaultState = ResourceState::DepthWrite;
depthBufferDesc.allowedStates = ResourceStateSet(ResourceState::DepthWrite);
@@ -136,7 +136,7 @@ void WindowedAppBase::createSwapchainFramebuffers()
gfx::IResourceView::Desc depthBufferViewDesc;
memset(&depthBufferViewDesc, 0, sizeof(depthBufferViewDesc));
- depthBufferViewDesc.format = gfx::Format::D_Float32;
+ depthBufferViewDesc.format = gfx::Format::D32_FLOAT;
depthBufferViewDesc.renderTarget.shape = gfx::IResource::Type::Texture2D;
depthBufferViewDesc.type = gfx::IResourceView::Type::DepthStencil;
ComPtr<gfx::IResourceView> dsv =
diff --git a/examples/model-viewer/main.cpp b/examples/model-viewer/main.cpp
index 6e21f9050..76b8fca05 100644
--- a/examples/model-viewer/main.cpp
+++ b/examples/model-viewer/main.cpp
@@ -744,9 +744,9 @@ Result initialize()
SLANG_RETURN_ON_FAIL(context.init(gDevice));
InputElementDesc inputElements[] = {
- {"POSITION", 0, Format::RGB_Float32, offsetof(Model::Vertex, position) },
- {"NORMAL", 0, Format::RGB_Float32, offsetof(Model::Vertex, normal) },
- {"UV", 0, Format::RG_Float32, offsetof(Model::Vertex, uv) },
+ {"POSITION", 0, Format::R32G32B32_FLOAT, offsetof(Model::Vertex, position) },
+ {"NORMAL", 0, Format::R32G32B32_FLOAT, offsetof(Model::Vertex, normal) },
+ {"UV", 0, Format::R32G32_FLOAT, offsetof(Model::Vertex, uv) },
};
auto inputLayout = gDevice->createInputLayout(
&inputElements[0],
@@ -870,7 +870,7 @@ void renderFrame(int frameIndex) override
for(auto& model : gModels)
{
drawCommandEncoder->setVertexBuffer(0, model->vertexBuffer, sizeof(Model::Vertex));
- drawCommandEncoder->setIndexBuffer(model->indexBuffer, Format::R_UInt32);
+ drawCommandEncoder->setIndexBuffer(model->indexBuffer, Format::R32_UINT);
// For each model we provide a parameter
// block that holds the per-model transformation
// parameters, corresponding to the `PerModel` type
diff --git a/examples/ray-tracing-pipeline/main.cpp b/examples/ray-tracing-pipeline/main.cpp
index 3c83447b4..a1539f6a7 100644
--- a/examples/ray-tracing-pipeline/main.cpp
+++ b/examples/ray-tracing-pipeline/main.cpp
@@ -352,10 +352,10 @@ Slang::Result initialize()
geomDesc.type = IAccelerationStructure::GeometryType::Triangles;
geomDesc.content.triangles.indexCount = kIndexCount;
geomDesc.content.triangles.indexData = gIndexBuffer->getDeviceAddress();
- geomDesc.content.triangles.indexFormat = Format::R_UInt32;
+ geomDesc.content.triangles.indexFormat = Format::R32_UINT;
geomDesc.content.triangles.vertexCount = kVertexCount;
geomDesc.content.triangles.vertexData = gVertexBuffer->getDeviceAddress();
- geomDesc.content.triangles.vertexFormat = Format::RGB_Float32;
+ geomDesc.content.triangles.vertexFormat = Format::R32G32B32_FLOAT;
geomDesc.content.triangles.vertexStride = sizeof(Vertex);
geomDesc.content.triangles.transform3x4 = gTransformBuffer->getDeviceAddress();
accelerationStructureBuildInputs.geometryDescs = &geomDesc;
@@ -505,7 +505,7 @@ Slang::Result initialize()
return SLANG_FAIL;
InputElementDesc inputElements[] = {
- {"POSITION", 0, Format::RG_Float32, offsetof(FullScreenTriangle::Vertex, position)},
+ {"POSITION", 0, Format::R32G32_FLOAT, offsetof(FullScreenTriangle::Vertex, position)},
};
auto inputLayout = gDevice->createInputLayout(&inputElements[0], SLANG_COUNT_OF(inputElements));
if (!inputLayout)
@@ -554,7 +554,7 @@ void createResultTexture()
resultTextureDesc.size.height = windowHeight;
resultTextureDesc.size.depth = 1;
resultTextureDesc.defaultState = ResourceState::UnorderedAccess;
- resultTextureDesc.format = Format::RGBA_Float16;
+ resultTextureDesc.format = Format::R16G16B16A16_FLOAT;
gResultTexture = gDevice->createTextureResource(resultTextureDesc);
IResourceView::Desc resultUAVDesc = {};
resultUAVDesc.format = resultTextureDesc.format;
diff --git a/examples/ray-tracing/main.cpp b/examples/ray-tracing/main.cpp
index bb02e157a..e51a601a2 100644
--- a/examples/ray-tracing/main.cpp
+++ b/examples/ray-tracing/main.cpp
@@ -344,10 +344,10 @@ Slang::Result initialize()
geomDesc.type = IAccelerationStructure::GeometryType::Triangles;
geomDesc.content.triangles.indexCount = kIndexCount;
geomDesc.content.triangles.indexData = gIndexBuffer->getDeviceAddress();
- geomDesc.content.triangles.indexFormat = Format::R_UInt32;
+ geomDesc.content.triangles.indexFormat = Format::R32_UINT;
geomDesc.content.triangles.vertexCount = kVertexCount;
geomDesc.content.triangles.vertexData = gVertexBuffer->getDeviceAddress();
- geomDesc.content.triangles.vertexFormat = Format::RGB_Float32;
+ geomDesc.content.triangles.vertexFormat = Format::R32G32B32_FLOAT;
geomDesc.content.triangles.vertexStride = sizeof(Vertex);
geomDesc.content.triangles.transform3x4 = gTransformBuffer->getDeviceAddress();
accelerationStructureBuildInputs.geometryDescs = &geomDesc;
@@ -497,7 +497,7 @@ Slang::Result initialize()
return SLANG_FAIL;
InputElementDesc inputElements[] = {
- {"POSITION", 0, Format::RG_Float32, offsetof(FullScreenTriangle::Vertex, position)},
+ {"POSITION", 0, Format::R32G32_FLOAT, offsetof(FullScreenTriangle::Vertex, position)},
};
auto inputLayout = gDevice->createInputLayout(&inputElements[0], SLANG_COUNT_OF(inputElements));
if (!inputLayout)
@@ -535,7 +535,7 @@ void createResultTexture()
resultTextureDesc.size.height = windowHeight;
resultTextureDesc.size.depth = 1;
resultTextureDesc.defaultState = ResourceState::UnorderedAccess;
- resultTextureDesc.format = Format::RGBA_Float16;
+ resultTextureDesc.format = Format::R16G16B16A16_FLOAT;
gResultTexture = gDevice->createTextureResource(resultTextureDesc);
IResourceView::Desc resultUAVDesc = {};
resultUAVDesc.format = resultTextureDesc.format;
diff --git a/examples/shader-toy/main.cpp b/examples/shader-toy/main.cpp
index c41bd71ca..e4e2cafcc 100644
--- a/examples/shader-toy/main.cpp
+++ b/examples/shader-toy/main.cpp
@@ -282,7 +282,7 @@ Result initialize()
gWindow->events.mouseDown = [this](const platform::MouseEventArgs& e) { handleEvent(e); };
InputElementDesc inputElements[] = {
- { "POSITION", 0, Format::RG_Float32, offsetof(FullScreenTriangle::Vertex, position) },
+ { "POSITION", 0, Format::R32G32_FLOAT, offsetof(FullScreenTriangle::Vertex, position) },
};
auto inputLayout = gDevice->createInputLayout(
&inputElements[0],
diff --git a/examples/triangle/main.cpp b/examples/triangle/main.cpp
index 0f6c31809..f182e0a0a 100644
--- a/examples/triangle/main.cpp
+++ b/examples/triangle/main.cpp
@@ -224,8 +224,8 @@ Slang::Result initialize()
// First, we create an input layout:
//
InputElementDesc inputElements[] = {
- { "POSITION", 0, Format::RGB_Float32, offsetof(Vertex, position) },
- { "COLOR", 0, Format::RGB_Float32, offsetof(Vertex, color) },
+ { "POSITION", 0, Format::R32G32B32_FLOAT, offsetof(Vertex, position) },
+ { "COLOR", 0, Format::R32G32B32_FLOAT, offsetof(Vertex, color) },
};
auto inputLayout = gDevice->createInputLayout(
&inputElements[0],