encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-12-13 15:16:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Deprecates use of filter mode for mipmap filters.

Browse Source 
Change-Id: I77044ee7f0ce1b066dd8c8a1ee1b34e07f5e9766
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/128660
Commit-Queue: Loko Kung <lokokung@google.com>
Reviewed-by: Austin Eng <enga@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
This commit is contained in:
Loko Kung
2023-04-26 08:03:20 +00:00
committed by Dawn LUCI CQ
parent fd87e9d676
commit abfa45baa4
21 changed files with 49 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/dawn/native/Sampler.cpp
View File

@@ -40,7 +40,7 @@ MaybeError ValidateSamplerDescriptor(DeviceBase*, const SamplerDescriptor* descr
if (descriptor->maxAnisotropy > 1) {
DAWN_INVALID_IF(descriptor->minFilter != wgpu::FilterMode::Linear ||
descriptor->magFilter != wgpu::FilterMode::Linear ||
descriptor->mipmapFilter != wgpu::FilterMode::Linear,
descriptor->mipmapFilter != wgpu::MipmapFilterMode::Linear,
"One of minFilter (%s), magFilter (%s) or mipmapFilter (%s) is not %s "
"while using anisotropic filter (maxAnisotropy is %f)",
descriptor->magFilter, descriptor->minFilter, descriptor->mipmapFilter,
@@ -52,7 +52,7 @@ MaybeError ValidateSamplerDescriptor(DeviceBase*, const SamplerDescriptor* descr
DAWN_TRY(ValidateFilterMode(descriptor->minFilter));
DAWN_TRY(ValidateFilterMode(descriptor->magFilter));
DAWN_TRY(ValidateFilterMode(descriptor->mipmapFilter));
DAWN_TRY(ValidateMipmapFilterMode(descriptor->mipmapFilter));
DAWN_TRY(ValidateAddressMode(descriptor->addressModeU));
DAWN_TRY(ValidateAddressMode(descriptor->addressModeV));
DAWN_TRY(ValidateAddressMode(descriptor->addressModeW));
@@ -116,7 +116,7 @@ bool SamplerBase::IsComparison() const {
bool SamplerBase::IsFiltering() const {
return mMinFilter == wgpu::FilterMode::Linear || mMagFilter == wgpu::FilterMode::Linear ||
mMipmapFilter == wgpu::FilterMode::Linear;
mMipmapFilter == wgpu::MipmapFilterMode::Linear;
}
size_t SamplerBase::ComputeContentHash() {

2
src/dawn/native/Sampler.h
View File

@@ -64,7 +64,7 @@ class SamplerBase : public ApiObjectBase, public CachedObject {
wgpu::AddressMode mAddressModeW;
wgpu::FilterMode mMagFilter;
wgpu::FilterMode mMinFilter;
wgpu::FilterMode mMipmapFilter;
wgpu::MipmapFilterMode mMipmapFilter;
float mLodMinClamp;
float mLodMaxClamp;
wgpu::CompareFunction mCompareFunction;

11
src/dawn/native/d3d11/SamplerD3D11.cpp
View File

@@ -44,6 +44,15 @@ D3D11_FILTER_TYPE D3D11FilterType(wgpu::FilterMode mode) {
}
}
D3D11_FILTER_TYPE D3D11MipmapFilterType(wgpu::MipmapFilterMode mode) {
switch (mode) {
case wgpu::MipmapFilterMode::Nearest:
return D3D11_FILTER_TYPE_POINT;
case wgpu::MipmapFilterMode::Linear:
return D3D11_FILTER_TYPE_LINEAR;
}
}
} // namespace
// static
@@ -57,7 +66,7 @@ MaybeError Sampler::Initialize(const SamplerDescriptor* descriptor) {
D3D11_SAMPLER_DESC samplerDesc = {};
D3D11_FILTER_TYPE minFilter = D3D11FilterType(descriptor->minFilter);
D3D11_FILTER_TYPE magFilter = D3D11FilterType(descriptor->magFilter);
D3D11_FILTER_TYPE mipmapFilter = D3D11FilterType(descriptor->mipmapFilter);
D3D11_FILTER_TYPE mipmapFilter = D3D11MipmapFilterType(descriptor->mipmapFilter);
D3D11_FILTER_REDUCTION_TYPE reduction = descriptor->compare == wgpu::CompareFunction::Undefined
? D3D11_FILTER_REDUCTION_TYPE_STANDARD

4
src/dawn/native/d3d12/SamplerD3D12.cpp
View File

@@ -63,10 +63,10 @@ Sampler::Sampler(Device* device, const SamplerDescriptor* descriptor)
D3D12_FILTER_TYPE mipmapFilter;
switch (descriptor->mipmapFilter) {
case wgpu::FilterMode::Nearest:
case wgpu::MipmapFilterMode::Nearest:
mipmapFilter = D3D12_FILTER_TYPE_POINT;
break;
case wgpu::FilterMode::Linear:
case wgpu::MipmapFilterMode::Linear:
mipmapFilter = D3D12_FILTER_TYPE_LINEAR;
break;
}

6
src/dawn/native/metal/SamplerMTL.mm
View File

@@ -29,11 +29,11 @@ MTLSamplerMinMagFilter FilterModeToMinMagFilter(wgpu::FilterMode mode) {
}
}
MTLSamplerMipFilter FilterModeToMipFilter(wgpu::FilterMode mode) {
MTLSamplerMipFilter FilterModeToMipFilter(wgpu::MipmapFilterMode mode) {
switch (mode) {
case wgpu::FilterMode::Nearest:
case wgpu::MipmapFilterMode::Nearest:
return MTLSamplerMipFilterNearest;
case wgpu::FilterMode::Linear:
case wgpu::MipmapFilterMode::Linear:
return MTLSamplerMipFilterLinear;
}
}

2
src/dawn/native/opengl/PipelineGL.cpp
View File

@@ -65,7 +65,7 @@ MaybeError PipelineGL::InitializeBase(const OpenGLFunctions& gl,
SamplerDescriptor desc = {};
ASSERT(desc.minFilter == wgpu::FilterMode::Nearest);
ASSERT(desc.magFilter == wgpu::FilterMode::Nearest);
ASSERT(desc.mipmapFilter == wgpu::FilterMode::Nearest);
ASSERT(desc.mipmapFilter == wgpu::MipmapFilterMode::Nearest);
mPlaceholderSampler =
ToBackend(layout->GetDevice()->GetOrCreateSampler(&desc).AcquireSuccess());
}

10
src/dawn/native/opengl/SamplerGL.cpp
View File

@@ -31,20 +31,20 @@ GLenum MagFilterMode(wgpu::FilterMode filter) {
UNREACHABLE();
}
GLenum MinFilterMode(wgpu::FilterMode minFilter, wgpu::FilterMode mipMapFilter) {
GLenum MinFilterMode(wgpu::FilterMode minFilter, wgpu::MipmapFilterMode mipMapFilter) {
switch (minFilter) {
case wgpu::FilterMode::Nearest:
switch (mipMapFilter) {
case wgpu::FilterMode::Nearest:
case wgpu::MipmapFilterMode::Nearest:
return GL_NEAREST_MIPMAP_NEAREST;
case wgpu::FilterMode::Linear:
case wgpu::MipmapFilterMode::Linear:
return GL_NEAREST_MIPMAP_LINEAR;
}
case wgpu::FilterMode::Linear:
switch (mipMapFilter) {
case wgpu::FilterMode::Nearest:
case wgpu::MipmapFilterMode::Nearest:
return GL_LINEAR_MIPMAP_NEAREST;
case wgpu::FilterMode::Linear:
case wgpu::MipmapFilterMode::Linear:
return GL_LINEAR_MIPMAP_LINEAR;
}
}

6
src/dawn/native/vulkan/SamplerVk.cpp
View File

@@ -46,11 +46,11 @@ VkFilter VulkanSamplerFilter(wgpu::FilterMode filter) {
UNREACHABLE();
}
VkSamplerMipmapMode VulkanMipMapMode(wgpu::FilterMode filter) {
VkSamplerMipmapMode VulkanMipMapMode(wgpu::MipmapFilterMode filter) {
switch (filter) {
case wgpu::FilterMode::Linear:
case wgpu::MipmapFilterMode::Linear:
return VK_SAMPLER_MIPMAP_MODE_LINEAR;
case wgpu::FilterMode::Nearest:
case wgpu::MipmapFilterMode::Nearest:
return VK_SAMPLER_MIPMAP_MODE_NEAREST;
}
UNREACHABLE();

10
src/dawn/node/binding/Converter.cpp
View File

@@ -1770,17 +1770,17 @@ bool Converter::Convert(wgpu::FilterMode& out, const interop::GPUFilterMode& in)
return false;
}
bool Converter::Convert(wgpu::FilterMode& out, const interop::GPUMipmapFilterMode& in) {
out = wgpu::FilterMode::Nearest;
bool Converter::Convert(wgpu::MipmapFilterMode& out, const interop::GPUMipmapFilterMode& in) {
out = wgpu::MipmapFilterMode::Nearest;
switch (in) {
case interop::GPUMipmapFilterMode::kNearest:
out = wgpu::FilterMode::Nearest;
out = wgpu::MipmapFilterMode::Nearest;
return true;
case interop::GPUMipmapFilterMode::kLinear:
out = wgpu::FilterMode::Linear;
out = wgpu::MipmapFilterMode::Linear;
return true;
}
Napi::Error::New(env, "invalid value for GPUFilterMode").ThrowAsJavaScriptException();
Napi::Error::New(env, "invalid value for GPUMipmapFilterMode").ThrowAsJavaScriptException();
return false;
}

2
src/dawn/node/binding/Converter.h
View File

@@ -249,7 +249,7 @@ class Converter {
[[nodiscard]] bool Convert(wgpu::FilterMode& out, const interop::GPUFilterMode& in);
[[nodiscard]] bool Convert(wgpu::FilterMode& out, const interop::GPUMipmapFilterMode& in);
[[nodiscard]] bool Convert(wgpu::MipmapFilterMode& out, const interop::GPUMipmapFilterMode& in);
[[nodiscard]] bool Convert(wgpu::ComputePipelineDescriptor& out,
const interop::GPUComputePipelineDescriptor& in);

2
src/dawn/tests/end2end/BindGroupTests.cpp
View File

@@ -284,7 +284,7 @@ TEST_P(BindGroupTests, UBOSamplerAndTexture) {
wgpu::SamplerDescriptor samplerDescriptor = {};
samplerDescriptor.minFilter = wgpu::FilterMode::Nearest;
samplerDescriptor.magFilter = wgpu::FilterMode::Nearest;
samplerDescriptor.mipmapFilter = wgpu::FilterMode::Nearest;
samplerDescriptor.mipmapFilter = wgpu::MipmapFilterMode::Nearest;
samplerDescriptor.addressModeU = wgpu::AddressMode::ClampToEdge;
samplerDescriptor.addressModeV = wgpu::AddressMode::ClampToEdge;
samplerDescriptor.addressModeW = wgpu::AddressMode::ClampToEdge;

2
src/dawn/tests/end2end/ObjectCachingTests.cpp
View File

@@ -416,7 +416,7 @@ TEST_P(ObjectCachingTest, SamplerDeduplication) {
wgpu::Sampler otherSamplerMinFilter = device.CreateSampler(&otherSamplerDescMinFilter);
wgpu::SamplerDescriptor otherSamplerDescMipmapFilter;
otherSamplerDescMipmapFilter.mipmapFilter = wgpu::FilterMode::Linear;
otherSamplerDescMipmapFilter.mipmapFilter = wgpu::MipmapFilterMode::Linear;
wgpu::Sampler otherSamplerMipmapFilter = device.CreateSampler(&otherSamplerDescMipmapFilter);
wgpu::SamplerDescriptor otherSamplerDescLodMinClamp;

2
src/dawn/tests/end2end/SamplerFilterAnisotropicTests.cpp
View File

@@ -147,7 +147,7 @@ class SamplerFilterAnisotropicTest : public DawnTest {
wgpu::SamplerDescriptor descriptor = {};
descriptor.minFilter = wgpu::FilterMode::Linear;
descriptor.magFilter = wgpu::FilterMode::Linear;
descriptor.mipmapFilter = wgpu::FilterMode::Linear;
descriptor.mipmapFilter = wgpu::MipmapFilterMode::Linear;
descriptor.maxAnisotropy = maxAnisotropy;
sampler = device.CreateSampler(&descriptor);
}

2
src/dawn/tests/end2end/SamplerTests.cpp
View File

@@ -125,7 +125,7 @@ class SamplerTest : public DawnTest {
wgpu::SamplerDescriptor descriptor = {};
descriptor.minFilter = wgpu::FilterMode::Nearest;
descriptor.magFilter = wgpu::FilterMode::Nearest;
descriptor.mipmapFilter = wgpu::FilterMode::Nearest;
descriptor.mipmapFilter = wgpu::MipmapFilterMode::Nearest;
descriptor.addressModeU = u.mMode;
descriptor.addressModeV = v.mMode;
descriptor.addressModeW = w.mMode;

3
src/dawn/tests/end2end/TextureViewTests.cpp
View File

@@ -107,12 +107,13 @@ class TextureViewSamplingTest : public DawnTest {
mRenderPass = utils::CreateBasicRenderPass(device, kRTSize, kRTSize);
wgpu::FilterMode kFilterMode = wgpu::FilterMode::Nearest;
wgpu::MipmapFilterMode kMipmapFilterMode = wgpu::MipmapFilterMode::Nearest;
wgpu::AddressMode kAddressMode = wgpu::AddressMode::ClampToEdge;
wgpu::SamplerDescriptor samplerDescriptor = {};
samplerDescriptor.minFilter = kFilterMode;
samplerDescriptor.magFilter = kFilterMode;
samplerDescriptor.mipmapFilter = kFilterMode;
samplerDescriptor.mipmapFilter = kMipmapFilterMode;
samplerDescriptor.addressModeU = kAddressMode;
samplerDescriptor.addressModeV = kAddressMode;
samplerDescriptor.addressModeW = kAddressMode;

4
src/dawn/tests/unittests/validation/BindGroupValidationTests.cpp
View File

@@ -3033,7 +3033,7 @@ TEST_F(SamplerTypeBindingTest, SamplerAndBindGroupMatches) {
}
{
wgpu::SamplerDescriptor desc;
desc.mipmapFilter = wgpu::FilterMode::Linear;
desc.mipmapFilter = wgpu::MipmapFilterMode::Linear;
utils::MakeBindGroup(device, bindGroupLayout, {{0, device.CreateSampler(&desc)}});
}
@@ -3061,7 +3061,7 @@ TEST_F(SamplerTypeBindingTest, SamplerAndBindGroupMatches) {
}
{
wgpu::SamplerDescriptor desc;
desc.mipmapFilter = wgpu::FilterMode::Linear;
desc.mipmapFilter = wgpu::MipmapFilterMode::Linear;
ASSERT_DEVICE_ERROR(
utils::MakeBindGroup(device, bindGroupLayout, {{0, device.CreateSampler(&desc)}}));
}

8
src/dawn/tests/unittests/validation/SamplerValidationTests.cpp
View File

@@ -53,7 +53,7 @@ TEST_F(SamplerValidationTest, InvalidFilterAnisotropic) {
kValidAnisoSamplerDesc.maxAnisotropy = 2;
kValidAnisoSamplerDesc.minFilter = wgpu::FilterMode::Linear;
kValidAnisoSamplerDesc.magFilter = wgpu::FilterMode::Linear;
kValidAnisoSamplerDesc.mipmapFilter = wgpu::FilterMode::Linear;
kValidAnisoSamplerDesc.mipmapFilter = wgpu::MipmapFilterMode::Linear;
{
// when maxAnisotropy > 1, min, mag, mipmap filter should be linear
device.CreateSampler(&kValidAnisoSamplerDesc);
@@ -67,7 +67,7 @@ TEST_F(SamplerValidationTest, InvalidFilterAnisotropic) {
wgpu::SamplerDescriptor samplerDesc = kValidAnisoSamplerDesc;
samplerDesc.minFilter = wgpu::FilterMode::Nearest;
samplerDesc.magFilter = wgpu::FilterMode::Nearest;
samplerDesc.mipmapFilter = wgpu::FilterMode::Nearest;
samplerDesc.mipmapFilter = wgpu::MipmapFilterMode::Nearest;
ASSERT_DEVICE_ERROR(device.CreateSampler(&samplerDesc));
}
{
@@ -82,7 +82,7 @@ TEST_F(SamplerValidationTest, InvalidFilterAnisotropic) {
}
{
wgpu::SamplerDescriptor samplerDesc = kValidAnisoSamplerDesc;
samplerDesc.mipmapFilter = wgpu::FilterMode::Nearest;
samplerDesc.mipmapFilter = wgpu::MipmapFilterMode::Nearest;
ASSERT_DEVICE_ERROR(device.CreateSampler(&samplerDesc));
}
}
@@ -92,7 +92,7 @@ TEST_F(SamplerValidationTest, ValidFilterAnisotropic) {
kValidAnisoSamplerDesc.maxAnisotropy = 2;
kValidAnisoSamplerDesc.minFilter = wgpu::FilterMode::Linear;
kValidAnisoSamplerDesc.magFilter = wgpu::FilterMode::Linear;
kValidAnisoSamplerDesc.mipmapFilter = wgpu::FilterMode::Linear;
kValidAnisoSamplerDesc.mipmapFilter = wgpu::MipmapFilterMode::Linear;
{ device.CreateSampler(); }
{
wgpu::SamplerDescriptor samplerDesc = kValidAnisoSamplerDesc;

4
src/dawn/tests/unittests/wire/WireArgumentTests.cpp
View File

@@ -240,7 +240,7 @@ TEST_F(WireArgumentTests, StructureOfValuesArgument) {
WGPUSamplerDescriptor descriptor = {};
descriptor.magFilter = WGPUFilterMode_Linear;
descriptor.minFilter = WGPUFilterMode_Nearest;
descriptor.mipmapFilter = WGPUFilterMode_Linear;
descriptor.mipmapFilter = WGPUMipmapFilterMode_Linear;
descriptor.addressModeU = WGPUAddressMode_ClampToEdge;
descriptor.addressModeV = WGPUAddressMode_Repeat;
descriptor.addressModeW = WGPUAddressMode_MirrorRepeat;
@@ -256,7 +256,7 @@ TEST_F(WireArgumentTests, StructureOfValuesArgument) {
return desc->nextInChain == nullptr &&
desc->magFilter == WGPUFilterMode_Linear &&
desc->minFilter == WGPUFilterMode_Nearest &&
desc->mipmapFilter == WGPUFilterMode_Linear &&
desc->mipmapFilter == WGPUMipmapFilterMode_Linear &&
desc->addressModeU == WGPUAddressMode_ClampToEdge &&
desc->addressModeV == WGPUAddressMode_Repeat &&
desc->addressModeW == WGPUAddressMode_MirrorRepeat &&