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

Remove indirection for colorStates

Browse Source 
This is to match the work in progress webgpu.h header.

BUG=dawn:22

Change-Id: Ia1077fef95e6bda541cddbd2f6ce40b79138e960
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/9383
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Reviewed-by: Austin Eng <enga@chromium.org>
Reviewed-by: Kai Ninomiya <kainino@chromium.org>
This commit is contained in:
Corentin Wallez
2019-09-20 23:22:27 +00:00
committed by Commit Bot service account
parent b8dbada76d
commit c81a717379
39 changed files with 81 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/tests/unittests/validation/RenderBundleValidationTests.cpp
View File

@@ -707,9 +707,9 @@ TEST_F(RenderBundleValidationTest, PipelineColorFormatMismatch) {
auto SetupRenderPipelineDescForTest = [this](utils::ComboRenderPipelineDescriptor* desc) {
InitializeRenderPipelineDescriptor(desc);
desc->colorStateCount = 3;
desc->cColorStates[0]->format = dawn::TextureFormat::RGBA8Unorm;
desc->cColorStates[1]->format = dawn::TextureFormat::RG16Float;
desc->cColorStates[2]->format = dawn::TextureFormat::R16Sint;
desc->cColorStates[0].format = dawn::TextureFormat::RGBA8Unorm;
desc->cColorStates[1].format = dawn::TextureFormat::RG16Float;
desc->cColorStates[2].format = dawn::TextureFormat::R16Sint;
};
// Test the success case.
@@ -728,7 +728,7 @@ TEST_F(RenderBundleValidationTest, PipelineColorFormatMismatch) {
{
utils::ComboRenderPipelineDescriptor desc(device);
SetupRenderPipelineDescForTest(&desc);
desc.cColorStates[1]->format = dawn::TextureFormat::RGBA8Unorm;
desc.cColorStates[1].format = dawn::TextureFormat::RGBA8Unorm;
dawn::RenderBundleEncoder renderBundleEncoder =
device.CreateRenderBundleEncoder(&renderBundleDesc);
@@ -761,7 +761,7 @@ TEST_F(RenderBundleValidationTest, PipelineDepthStencilFormatMismatch) {
auto SetupRenderPipelineDescForTest = [this](utils::ComboRenderPipelineDescriptor* desc) {
InitializeRenderPipelineDescriptor(desc);
desc->colorStateCount = 1;
desc->cColorStates[0]->format = dawn::TextureFormat::RGBA8Unorm;
desc->cColorStates[0].format = dawn::TextureFormat::RGBA8Unorm;
desc->depthStencilState = &desc->cDepthStencilState;
desc->cDepthStencilState.format = dawn::TextureFormat::Depth24PlusStencil8;
};
@@ -815,7 +815,7 @@ TEST_F(RenderBundleValidationTest, PipelineSampleCountMismatch) {
utils::ComboRenderPipelineDescriptor renderPipelineDesc(device);
InitializeRenderPipelineDescriptor(&renderPipelineDesc);
renderPipelineDesc.colorStateCount = 1;
renderPipelineDesc.cColorStates[0]->format = dawn::TextureFormat::RGBA8Unorm;
renderPipelineDesc.cColorStates[0].format = dawn::TextureFormat::RGBA8Unorm;
renderPipelineDesc.sampleCount = 4;
// Test the success case.

4
src/tests/unittests/validation/RenderPipelineValidationTests.cpp
View File

@@ -98,7 +98,7 @@ TEST_F(RenderPipelineValidationTest, NonRenderableFormat) {
utils::ComboRenderPipelineDescriptor descriptor(device);
descriptor.vertexStage.module = vsModule;
descriptor.cFragmentStage.module = fsModule;
descriptor.cColorStates[0]->format = dawn::TextureFormat::RGBA8Unorm;
descriptor.cColorStates[0].format = dawn::TextureFormat::RGBA8Unorm;
device.CreateRenderPipeline(&descriptor);
}
@@ -108,7 +108,7 @@ TEST_F(RenderPipelineValidationTest, NonRenderableFormat) {
utils::ComboRenderPipelineDescriptor descriptor(device);
descriptor.vertexStage.module = vsModule;
descriptor.cFragmentStage.module = fsModule;
descriptor.cColorStates[0]->format = dawn::TextureFormat::RG11B10Float;
descriptor.cColorStates[0].format = dawn::TextureFormat::RG11B10Float;
ASSERT_DEVICE_ERROR(device.CreateRenderPipeline(&descriptor));
}

2
src/tests/unittests/validation/VertexInputValidationTests.cpp
View File

@@ -37,7 +37,7 @@ class VertexInputTest : public ValidationTest {
descriptor.vertexStage.module = vsModule;
descriptor.cFragmentStage.module = fsModule;
descriptor.vertexInput = &state;
descriptor.cColorStates[0]->format = dawn::TextureFormat::RGBA8Unorm;
descriptor.cColorStates[0].format = dawn::TextureFormat::RGBA8Unorm;
if (!success) {
ASSERT_DEVICE_ERROR(device.CreateRenderPipeline(&descriptor));