Rename SamplerDescriptor::compareFunction to compare.

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

View File

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

View File

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

View File

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

View File

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

View File

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