diff options
| author | Simon Kallweit <64953474+skallweitNV@users.noreply.github.com> | 2024-08-30 18:50:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-30 09:50:19 -0700 |
| commit | f428a058ea48535a323c32d206ebc7e551c3c3e9 (patch) | |
| tree | 2b004d07b630196f902b88679b4a08d8faaa97bc /tools/render-test/shader-input-layout.cpp | |
| parent | 12137e9b00436eee3bf27f7a2fc5106513af8981 (diff) | |
Draft: integrate slang-rhi (#4970)
* add slang-rhi submodule
* refactor render-test to use slang-rhi and remove OpenGL support
* remove -vk -glsl tests
* remove gl test
* disable failing test
* allow recursive submodules in github actions
* update slang-rhi
* update slang-rhi
---------
Co-authored-by: Yong He <yonghe@outlook.com>
Diffstat (limited to 'tools/render-test/shader-input-layout.cpp')
| -rw-r--r-- | tools/render-test/shader-input-layout.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/tools/render-test/shader-input-layout.cpp b/tools/render-test/shader-input-layout.cpp index ac99d5cd8..97b82e1e9 100644 --- a/tools/render-test/shader-input-layout.cpp +++ b/tools/render-test/shader-input-layout.cpp @@ -5,7 +5,7 @@ #include "core/slang-token-reader.h" #include "core/slang-type-text-util.h" -#include "slang-gfx.h" +#include <slang-rhi.h> namespace renderer_test { @@ -21,7 +21,7 @@ namespace renderer_test { #define SLANG_FORMAT_CASE(name, blockSizeInBytes, pixelsPerBlock) if (slice == #name) return Format::name; else - GFX_FORMAT(SLANG_FORMAT_CASE) + SLANG_RHI_FORMAT(SLANG_FORMAT_CASE) return Format::Unknown; } @@ -1155,7 +1155,7 @@ namespace renderer_test // T for type to return, F for function pointer to operate on uint8->T template<typename T, typename F> - void generateTextureDataWithTargetTStorage(TextureData& output, const InputTextureDesc& desc, gfx::FormatInfo& formatInfo, F loadUint8ToT) + void generateTextureDataWithTargetTStorage(TextureData& output, const InputTextureDesc& desc, rhi::FormatInfo& formatInfo, F loadUint8ToT) { // the following function assumes input of 0 or 1 since our testing framework only tests with 0 or 1 TextureData work; @@ -1229,8 +1229,8 @@ namespace renderer_test } void generateTextureData(TextureData& output, const InputTextureDesc& desc) { - gfx::FormatInfo formatInfo; - gfxGetFormatInfo(desc.format, &formatInfo); + rhi::FormatInfo formatInfo; + rhiGetFormatInfo(desc.format, &formatInfo); switch (desc.format) { @@ -1348,8 +1348,8 @@ namespace renderer_test kFloat, }; SimpleScalarType type; - gfx::FormatInfo formatInfo; - gfxGetFormatInfo(inputDesc.format, &formatInfo); + rhi::FormatInfo formatInfo; + rhiGetFormatInfo(inputDesc.format, &formatInfo); switch (formatInfo.channelType) { case SLANG_SCALAR_TYPE_UINT64: |