encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-07-01 02:43:29 +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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dawn.json
View File

@ -901,7 +901,7 @@
{"name": "mipmap filter", "type": "filter mode"}, {"name": "mipmap filter", "type": "filter mode"},
{"name": "lod min clamp", "type": "float"}, {"name": "lod min clamp", "type": "float"},
{"name": "lod max clamp", "type": "float"}, {"name": "lod max clamp", "type": "float"},
{"name": "compare function", "type": "compare function"} {"name": "compare", "type": "compare function"}
] ]
}, },
"shader module": { "shader module": {

4
src/dawn_native/Sampler.cpp
View File

@ -46,7 +46,7 @@ namespace dawn_native {
DAWN_TRY(ValidateAddressMode(descriptor->addressModeU)); DAWN_TRY(ValidateAddressMode(descriptor->addressModeU));
DAWN_TRY(ValidateAddressMode(descriptor->addressModeV)); DAWN_TRY(ValidateAddressMode(descriptor->addressModeV));
DAWN_TRY(ValidateAddressMode(descriptor->addressModeW)); DAWN_TRY(ValidateAddressMode(descriptor->addressModeW));
DAWN_TRY(ValidateCompareFunction(descriptor->compareFunction)); DAWN_TRY(ValidateCompareFunction(descriptor->compare));
return {}; return {};
} }
@ -64,7 +64,7 @@ namespace dawn_native {
mMipmapFilter(descriptor->mipmapFilter), mMipmapFilter(descriptor->mipmapFilter),
mLodMinClamp(descriptor->lodMinClamp), mLodMinClamp(descriptor->lodMinClamp),
mLodMaxClamp(descriptor->lodMaxClamp), mLodMaxClamp(descriptor->lodMaxClamp),
mCompareFunction(descriptor->compareFunction), mCompareFunction(descriptor->compare),
mIsBlueprint(blueprint) { 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.AddressW = AddressMode(descriptor->addressModeW);
mSamplerDesc.MipLODBias = 0.f; mSamplerDesc.MipLODBias = 0.f;
mSamplerDesc.MaxAnisotropy = 1; mSamplerDesc.MaxAnisotropy = 1;
mSamplerDesc.ComparisonFunc = ToD3D12ComparisonFunc(descriptor->compareFunction); mSamplerDesc.ComparisonFunc = ToD3D12ComparisonFunc(descriptor->compare);
mSamplerDesc.MinLOD = descriptor->lodMinClamp; mSamplerDesc.MinLOD = descriptor->lodMinClamp;
mSamplerDesc.MaxLOD = descriptor->lodMaxClamp; 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.lodMinClamp = descriptor->lodMinClamp;
mtlDesc.lodMaxClamp = descriptor->lodMaxClamp; mtlDesc.lodMaxClamp = descriptor->lodMaxClamp;
mtlDesc.compareFunction = ToMetalCompareFunction(descriptor->compareFunction); mtlDesc.compareFunction = ToMetalCompareFunction(descriptor->compare);
mMtlSamplerState = [device->GetMTLDevice() newSamplerStateWithDescriptor:mtlDesc]; 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_MIN_LOD, descriptor->lodMinClamp);
gl.SamplerParameterf(mHandle, GL_TEXTURE_MAX_LOD, descriptor->lodMaxClamp); 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_MODE, GL_COMPARE_REF_TO_TEXTURE);
gl.SamplerParameteri(mHandle, GL_TEXTURE_COMPARE_FUNC, 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.mipLodBias = 0.0f;
createInfo.anisotropyEnable = VK_FALSE; createInfo.anisotropyEnable = VK_FALSE;
createInfo.maxAnisotropy = 1.0f; 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.compareEnable = createInfo.compareOp == VK_COMPARE_OP_NEVER ? VK_FALSE : VK_TRUE;
createInfo.minLod = descriptor->lodMinClamp; createInfo.minLod = descriptor->lodMinClamp;
createInfo.maxLod = descriptor->lodMaxClamp; createInfo.maxLod = descriptor->lodMaxClamp;

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

@ -236,7 +236,7 @@ TEST_P(BindGroupTests, UBOSamplerAndTexture) {
samplerDescriptor.addressModeW = dawn::AddressMode::ClampToEdge; samplerDescriptor.addressModeW = dawn::AddressMode::ClampToEdge;
samplerDescriptor.lodMinClamp = kLodMin; samplerDescriptor.lodMinClamp = kLodMin;
samplerDescriptor.lodMaxClamp = kLodMax; samplerDescriptor.lodMaxClamp = kLodMax;
samplerDescriptor.compareFunction = dawn::CompareFunction::Never; samplerDescriptor.compare = dawn::CompareFunction::Never;
dawn::Sampler sampler = device.CreateSampler(&samplerDescriptor); dawn::Sampler sampler = device.CreateSampler(&samplerDescriptor);

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

@ -327,7 +327,7 @@ TEST_P(ObjectCachingTest, SamplerDeduplication) {
dawn::Sampler otherSamplerLodMaxClamp = device.CreateSampler(&otherSamplerDescLodMaxClamp); dawn::Sampler otherSamplerLodMaxClamp = device.CreateSampler(&otherSamplerDescLodMaxClamp);
dawn::SamplerDescriptor otherSamplerDescCompareFunction = utils::GetDefaultSamplerDescriptor(); dawn::SamplerDescriptor otherSamplerDescCompareFunction = utils::GetDefaultSamplerDescriptor();
otherSamplerDescCompareFunction.compareFunction = dawn::CompareFunction::Always; otherSamplerDescCompareFunction.compare = dawn::CompareFunction::Always;
dawn::Sampler otherSamplerCompareFunction = dawn::Sampler otherSamplerCompareFunction =
device.CreateSampler(&otherSamplerDescCompareFunction); device.CreateSampler(&otherSamplerDescCompareFunction);

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

@ -128,7 +128,7 @@ protected:
descriptor.addressModeW = w.mMode; descriptor.addressModeW = w.mMode;
descriptor.lodMinClamp = kLodMin; descriptor.lodMinClamp = kLodMin;
descriptor.lodMaxClamp = kLodMax; descriptor.lodMaxClamp = kLodMax;
descriptor.compareFunction = dawn::CompareFunction::Never; descriptor.compare = dawn::CompareFunction::Never;
sampler = device.CreateSampler(&descriptor); sampler = device.CreateSampler(&descriptor);
} }

2
src/tests/end2end/TextureViewTests.cpp
View File

@ -101,7 +101,7 @@ protected:
samplerDescriptor.addressModeW = kAddressMode; samplerDescriptor.addressModeW = kAddressMode;
samplerDescriptor.lodMinClamp = kLodMin; samplerDescriptor.lodMinClamp = kLodMin;
samplerDescriptor.lodMaxClamp = kLodMax; samplerDescriptor.lodMaxClamp = kLodMax;
samplerDescriptor.compareFunction = dawn::CompareFunction::Never; samplerDescriptor.compare = dawn::CompareFunction::Never;
mSampler = device.CreateSampler(&samplerDescriptor); mSampler = device.CreateSampler(&samplerDescriptor);
mPipelineLayout = utils::MakeBasicPipelineLayout(device, &mBindGroupLayout); mPipelineLayout = utils::MakeBasicPipelineLayout(device, &mBindGroupLayout);

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

@ -273,7 +273,7 @@ TEST_F(WireArgumentTests, StructureOfValuesArgument) {
descriptor.addressModeW = DAWN_ADDRESS_MODE_MIRRORED_REPEAT; descriptor.addressModeW = DAWN_ADDRESS_MODE_MIRRORED_REPEAT;
descriptor.lodMinClamp = kLodMin; descriptor.lodMinClamp = kLodMin;
descriptor.lodMaxClamp = kLodMax; descriptor.lodMaxClamp = kLodMax;
descriptor.compareFunction = DAWN_COMPARE_FUNCTION_NEVER; descriptor.compare = DAWN_COMPARE_FUNCTION_NEVER;
dawnDeviceCreateSampler(device, &descriptor); dawnDeviceCreateSampler(device, &descriptor);
@ -287,7 +287,7 @@ TEST_F(WireArgumentTests, StructureOfValuesArgument) {
desc->addressModeU == DAWN_ADDRESS_MODE_CLAMP_TO_EDGE && desc->addressModeU == DAWN_ADDRESS_MODE_CLAMP_TO_EDGE &&
desc->addressModeV == DAWN_ADDRESS_MODE_REPEAT && desc->addressModeV == DAWN_ADDRESS_MODE_REPEAT &&
desc->addressModeW == DAWN_ADDRESS_MODE_MIRRORED_REPEAT && desc->addressModeW == DAWN_ADDRESS_MODE_MIRRORED_REPEAT &&
desc->compareFunction == DAWN_COMPARE_FUNCTION_NEVER && desc->compare == DAWN_COMPARE_FUNCTION_NEVER &&
desc->lodMinClamp == kLodMin && desc->lodMaxClamp == kLodMax; desc->lodMinClamp == kLodMin && desc->lodMaxClamp == kLodMax;
}))) })))
.WillOnce(Return(apiDummySampler)); .WillOnce(Return(apiDummySampler));

2
src/utils/DawnHelpers.cpp
View File

@ -268,7 +268,7 @@ namespace utils {
desc.addressModeW = dawn::AddressMode::Repeat; desc.addressModeW = dawn::AddressMode::Repeat;
desc.lodMinClamp = kLodMin; desc.lodMinClamp = kLodMin;
desc.lodMaxClamp = kLodMax; desc.lodMaxClamp = kLodMax;
desc.compareFunction = dawn::CompareFunction::Never; desc.compare = dawn::CompareFunction::Never;
return desc; return desc;
} }