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

Rename DawnColorStateDescriptor.colorWriteMask to writeMask

Browse Source 
Bug: chromium:877147
Change-Id: I566cea409b89de8abd724f344f7ae83f80e56572
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/6600
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
Commit-Queue: Austin Eng <enga@chromium.org>
This commit is contained in:
Austin Eng
2019-04-15 20:43:35 +00:00
committed by Commit Bot service account
parent 2ec74dcc3f
commit 0c133bbe55
11 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/tests/end2end/ColorStateTests.cpp
View File

@@ -146,7 +146,7 @@ class ColorStateTest : public DawnTest {
dawn::ColorStateDescriptor descriptor;
descriptor.alphaBlend = blend;
descriptor.colorBlend = blend;
descriptor.colorWriteMask = dawn::ColorWriteMask::All;
descriptor.writeMask = dawn::ColorWriteMask::All;
SetupSingleSourcePipelines(descriptor);
@@ -176,7 +176,7 @@ class ColorStateTest : public DawnTest {
dawn::ColorStateDescriptor descriptor;
descriptor.colorBlend = colorBlend;
descriptor.alphaBlend = alphaBlend;
descriptor.colorWriteMask = dawn::ColorWriteMask::All;
descriptor.writeMask = dawn::ColorWriteMask::All;
SetupSingleSourcePipelines(descriptor);
@@ -298,7 +298,7 @@ TEST_P(ColorStateTest, Basic) {
dawn::ColorStateDescriptor descriptor;
descriptor.alphaBlend = blend;
descriptor.colorBlend = blend;
descriptor.colorWriteMask = dawn::ColorWriteMask::All;
descriptor.writeMask = dawn::ColorWriteMask::All;
SetupSingleSourcePipelines(descriptor);
@@ -680,7 +680,7 @@ TEST_P(ColorStateTest, ColorWriteMask) {
descriptor.alphaBlend = blend;
{
// Test single channel color write
descriptor.colorWriteMask = dawn::ColorWriteMask::Red;
descriptor.writeMask = dawn::ColorWriteMask::Red;
SetupSingleSourcePipelines(descriptor);
RGBA8 base(32, 64, 128, 192);
@@ -692,7 +692,7 @@ TEST_P(ColorStateTest, ColorWriteMask) {
{
// Test multi channel color write
descriptor.colorWriteMask = dawn::ColorWriteMask::Green | dawn::ColorWriteMask::Alpha;
descriptor.writeMask = dawn::ColorWriteMask::Green | dawn::ColorWriteMask::Alpha;
SetupSingleSourcePipelines(descriptor);
RGBA8 base(32, 64, 128, 192);
@@ -704,7 +704,7 @@ TEST_P(ColorStateTest, ColorWriteMask) {
{
// Test no channel color write
descriptor.colorWriteMask = dawn::ColorWriteMask::None;
descriptor.writeMask = dawn::ColorWriteMask::None;
SetupSingleSourcePipelines(descriptor);
RGBA8 base(32, 64, 128, 192);
@@ -725,7 +725,7 @@ TEST_P(ColorStateTest, ColorWriteMaskBlendingDisabled) {
descriptor.alphaBlend = blend;
descriptor.colorBlend = blend;
descriptor.colorWriteMask = dawn::ColorWriteMask::Red;
descriptor.writeMask = dawn::ColorWriteMask::Red;
SetupSingleSourcePipelines(descriptor);
RGBA8 base(32, 64, 128, 192);
@@ -1031,7 +1031,7 @@ TEST_P(ColorStateTest, ColorWriteMaskDoesNotAffectRenderPassLoadOpClear) {
testDescriptor.cVertexStage.module = vsModule;
testDescriptor.cFragmentStage.module = fsModule;
testDescriptor.cColorStates[0]->format = renderPass.colorFormat;
testDescriptor.cColorStates[0]->colorWriteMask = dawn::ColorWriteMask::Red;
testDescriptor.cColorStates[0]->writeMask = dawn::ColorWriteMask::Red;
testPipeline = device.CreateRenderPipeline(&testDescriptor);

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

@@ -94,7 +94,7 @@ TEST_F(WireArgumentTests, CStringArgument) {
colorStateDescriptor.format = DAWN_TEXTURE_FORMAT_R8_G8_B8_A8_UNORM;
colorStateDescriptor.alphaBlend = blendDescriptor;
colorStateDescriptor.colorBlend = blendDescriptor;
colorStateDescriptor.colorWriteMask = DAWN_COLOR_WRITE_MASK_ALL;
colorStateDescriptor.writeMask = DAWN_COLOR_WRITE_MASK_ALL;
// Create the input state
DawnInputStateDescriptor inputState;

2
src/tests/unittests/wire/WireOptionalTests.cpp
View File

@@ -84,7 +84,7 @@ TEST_F(WireOptionalTests, OptionalStructPointer) {
colorStateDescriptor.format = DAWN_TEXTURE_FORMAT_R8_G8_B8_A8_UNORM;
colorStateDescriptor.alphaBlend = blendDescriptor;
colorStateDescriptor.colorBlend = blendDescriptor;
colorStateDescriptor.colorWriteMask = DAWN_COLOR_WRITE_MASK_ALL;
colorStateDescriptor.writeMask = DAWN_COLOR_WRITE_MASK_ALL;
// Create the input state
DawnInputStateDescriptor inputState;