Skip to content

Commit 6457688

Browse files
A few minor updates to ETC format detection
1 parent d9b0335 commit 6457688

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

Graphics/GraphicsEngineD3DBase/include/EngineFactoryD3DBase.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,7 @@ class EngineFactoryD3DBase : public EngineFactoryBase<BaseInterface>
218218
Features.DualSourceBlend = DEVICE_FEATURE_STATE_ENABLED;
219219
Features.MultiViewport = DEVICE_FEATURE_STATE_ENABLED;
220220
Features.TextureCompressionBC = DEVICE_FEATURE_STATE_ENABLED;
221+
Features.TextureCompressionETC2 = DEVICE_FEATURE_STATE_DISABLED;
221222
Features.PixelUAVWritesAndAtomics = DEVICE_FEATURE_STATE_ENABLED;
222223
Features.TextureUAVExtendedFormats = DEVICE_FEATURE_STATE_ENABLED;
223224
Features.ShaderResourceStaticArrays = DEVICE_FEATURE_STATE_ENABLED;

Graphics/GraphicsEngineD3DBase/src/DXGITypeConversions.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2019-2022 Diligent Graphics LLC
2+
* Copyright 2019-2024 Diligent Graphics LLC
33
* Copyright 2015-2019 Egor Yusov
44
*
55
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -414,6 +414,7 @@ DXGI_FORMAT TexFormatToDXGI_Format(TEXTURE_FORMAT TexFormat, Uint32 BindFlags)
414414
if (TexFormat >= TEX_FORMAT_UNKNOWN && TexFormat < TEX_FORMAT_NUM_FORMATS)
415415
{
416416
auto DXGIFormat = FmtToDXGIFmtMap[TexFormat];
417+
VERIFY(TexFormat == TEX_FORMAT_UNKNOWN || TexFormat > TEX_FORMAT_BC7_UNORM_SRGB || DXGIFormat != DXGI_FORMAT_UNKNOWN, "Unsupported texture format");
417418
if (BindFlags != 0)
418419
DXGIFormat = CorrectDXGIFormat(DXGIFormat, BindFlags);
419420
return DXGIFormat;

Graphics/GraphicsEngineWebGPU/src/RenderDeviceWebGPUImpl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -428,9 +428,9 @@ void RenderDeviceWebGPUImpl::FindSupportedTextureFormats()
428428
const bool RG11B10UfloatRenderableSupported = wgpuDeviceHasFeature(m_wgpuDevice, WGPUFeatureName_RG11B10UfloatRenderable);
429429
const bool Depth32FloatStencil8Supported = wgpuDeviceHasFeature(m_wgpuDevice, WGPUFeatureName_Depth32FloatStencil8);
430430
const bool TextureCompressionBCSupported = wgpuDeviceHasFeature(m_wgpuDevice, WGPUFeatureName_TextureCompressionBC);
431+
const bool TextureCompressionETC2Supported = wgpuDeviceHasFeature(m_wgpuDevice, WGPUFeatureName_TextureCompressionETC2);
431432
const bool R16UnormSupported = wgpuDeviceHasFeature(m_wgpuDevice, WGPUFeatureName_Unorm16TextureFormats);
432433
const bool R16SnormSupported = wgpuDeviceHasFeature(m_wgpuDevice, WGPUFeatureName_Snorm16TextureFormats);
433-
const bool TextureCompressionETC2Supported = wgpuDeviceHasFeature(m_wgpuDevice, WGPUFeatureName_TextureCompressionETC2);
434434

435435
// https://www.w3.org/TR/webgpu/#texture-format-caps
436436

0 commit comments

Comments
 (0)