diff options
Diffstat (limited to 'tools/render-test/shader-input-layout.cpp')
| -rw-r--r-- | tools/render-test/shader-input-layout.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/tools/render-test/shader-input-layout.cpp b/tools/render-test/shader-input-layout.cpp index 7e6d290c8..7aef0025f 100644 --- a/tools/render-test/shader-input-layout.cpp +++ b/tools/render-test/shader-input-layout.cpp @@ -19,7 +19,7 @@ namespace renderer_test Format _getFormatFromName(const UnownedStringSlice& slice) { -#define SLANG_FORMAT_CASE(name, size) if (slice == #name) return Format::name; else +#define SLANG_FORMAT_CASE(name, blockSizeInBytes, pixelsPerBlock) if (slice == #name) return Format::name; else GFX_FORMAT(SLANG_FORMAT_CASE) return Format::Unknown; @@ -1091,19 +1091,19 @@ namespace renderer_test void generateTextureData(TextureData& output, const InputTextureDesc& desc) { - const gfx::FormatInfo formatInfo = gfxGetFormatInfo(desc.format); - + gfx::FormatInfo formatInfo; + gfxGetFormatInfo(desc.format, &formatInfo); switch (desc.format) { - case Format::RGBA_Unorm_UInt8: + case Format::R8G8B8A8_UNORM: { generateTextureDataRGB8(output, desc); break; } - case Format::R_Float16: - case Format::RG_Float16: - case Format::RGBA_Float16: + case Format::R16_FLOAT: + case Format::R16G16_FLOAT: + case Format::R16G16B16A16_FLOAT: { TextureData work; generateTextureDataRGB8(work, desc); @@ -1176,11 +1176,11 @@ namespace renderer_test } break; } - case Format::R_Float32: - case Format::RG_Float32: - case Format::RGB_Float32: - case Format::RGBA_Float32: - case Format::D_Float32: + case Format::R32_FLOAT: + case Format::R32G32_FLOAT: + case Format::R32G32B32_FLOAT: + case Format::R32G32B32A32_FLOAT: + case Format::D32_FLOAT: { TextureData work; generateTextureDataRGB8(work, desc); @@ -1285,7 +1285,7 @@ namespace renderer_test if (arrLen == 0) arrLen = 1; - output.init(Format::RGBA_Unorm_UInt8); + output.init(Format::R8G8B8A8_UNORM); //List<List<unsigned int>>& dataBuffer = output.dataBuffer; int arraySize = arrLen; |