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

Rename SamplerDescriptor::compareFunction to compare.

Browse Source 
This is to match the WebGPU IDL.

BUG=dawn:22

Change-Id: I63e32fe980c1727562055221ea2769a670461e93
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/8625
Reviewed-by: Yunchao He <yunchao.he@intel.com>
Reviewed-by: Austin Eng <enga@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
This commit is contained in:
Corentin Wallez
2019-07-08 08:29:57 +00:00
committed by Commit Bot service account
parent 35716c204d
commit e409acf561
12 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/dawn_native/Sampler.cpp
View File

@@ -46,7 +46,7 @@ namespace dawn_native {
DAWN_TRY(ValidateAddressMode(descriptor->addressModeU));
DAWN_TRY(ValidateAddressMode(descriptor->addressModeV));
DAWN_TRY(ValidateAddressMode(descriptor->addressModeW));
DAWN_TRY(ValidateCompareFunction(descriptor->compareFunction));
DAWN_TRY(ValidateCompareFunction(descriptor->compare));
return {};
}
@@ -64,7 +64,7 @@ namespace dawn_native {
mMipmapFilter(descriptor->mipmapFilter),
mLodMinClamp(descriptor->lodMinClamp),
mLodMaxClamp(descriptor->lodMaxClamp),
mCompareFunction(descriptor->compareFunction),
mCompareFunction(descriptor->compare),
mIsBlueprint(blueprint) {
}

2
src/dawn_native/d3d12/SamplerD3D12.cpp
View File

@@ -83,7 +83,7 @@ namespace dawn_native { namespace d3d12 {
mSamplerDesc.AddressW = AddressMode(descriptor->addressModeW);
mSamplerDesc.MipLODBias = 0.f;
mSamplerDesc.MaxAnisotropy = 1;
mSamplerDesc.ComparisonFunc = ToD3D12ComparisonFunc(descriptor->compareFunction);
mSamplerDesc.ComparisonFunc = ToD3D12ComparisonFunc(descriptor->compare);
mSamplerDesc.MinLOD = descriptor->lodMinClamp;
mSamplerDesc.MaxLOD = descriptor->lodMaxClamp;
}

2
src/dawn_native/metal/SamplerMTL.mm
View File

@@ -64,7 +64,7 @@ namespace dawn_native { namespace metal {
mtlDesc.lodMinClamp = descriptor->lodMinClamp;
mtlDesc.lodMaxClamp = descriptor->lodMaxClamp;
mtlDesc.compareFunction = ToMetalCompareFunction(descriptor->compareFunction);
mtlDesc.compareFunction = ToMetalCompareFunction(descriptor->compare);
mMtlSamplerState = [device->GetMTLDevice() newSamplerStateWithDescriptor:mtlDesc];

4
src/dawn_native/opengl/SamplerGL.cpp
View File

@@ -87,10 +87,10 @@ namespace dawn_native { namespace opengl {
gl.SamplerParameterf(mHandle, GL_TEXTURE_MIN_LOD, descriptor->lodMinClamp);
gl.SamplerParameterf(mHandle, GL_TEXTURE_MAX_LOD, descriptor->lodMaxClamp);
if (ToOpenGLCompareFunction(descriptor->compareFunction) != GL_NEVER) {
if (ToOpenGLCompareFunction(descriptor->compare) != GL_NEVER) {
gl.SamplerParameteri(mHandle, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_REF_TO_TEXTURE);
gl.SamplerParameteri(mHandle, GL_TEXTURE_COMPARE_FUNC,
ToOpenGLCompareFunction(descriptor->compareFunction));
ToOpenGLCompareFunction(descriptor->compare));
}
}

2
src/dawn_native/vulkan/SamplerVk.cpp
View File

@@ -72,7 +72,7 @@ namespace dawn_native { namespace vulkan {
createInfo.mipLodBias = 0.0f;
createInfo.anisotropyEnable = VK_FALSE;
createInfo.maxAnisotropy = 1.0f;
createInfo.compareOp = ToVulkanCompareOp(descriptor->compareFunction);
createInfo.compareOp = ToVulkanCompareOp(descriptor->compare);
createInfo.compareEnable = createInfo.compareOp == VK_COMPARE_OP_NEVER ? VK_FALSE : VK_TRUE;
createInfo.minLod = descriptor->lodMinClamp;
createInfo.maxLod = descriptor->lodMaxClamp;