encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PipelineStatisticsName -> PipelineStatisticName 

To match upstream WebGPU (and be grammatically more correct).

Upstream webgpu.h change:
https://github.com/webgpu-native/webgpu-headers/pull/60

Bug: dawn:22
Change-Id: Id665e883259b9297a90c13b43187461c64fdc3da
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/24702
Commit-Queue: Kai Ninomiya <kainino@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
This commit is contained in:
Kai Ninomiya 2020-07-13 18:21:03 +00:00 committed by Commit Bot service account
parent 3e6db22fa8
commit 261b05d3dd
4 changed files with 28 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dawn.json
View File

@ -891,7 +891,7 @@
{"name": "bind group layouts", "type": "bind group layout", "annotation": "const*", "length": "bind group layout count"} {"name": "bind group layouts", "type": "bind group layout", "annotation": "const*", "length": "bind group layout count"}
] ]
}, },
"pipeline statistics name": { "pipeline statistic name": {
"category": "enum", "category": "enum",
"values": [ "values": [
{"value": 0, "name": "vertex shader invocations"}, {"value": 0, "name": "vertex shader invocations"},
@ -942,7 +942,7 @@
{"name": "label", "type": "char", "annotation": "const*", "length": "strlen", "optional": true}, {"name": "label", "type": "char", "annotation": "const*", "length": "strlen", "optional": true},
{"name": "type", "type": "query type"}, {"name": "type", "type": "query type"},
{"name": "count", "type": "uint32_t"}, {"name": "count", "type": "uint32_t"},
{"name": "pipeline statistics", "type": "pipeline statistics name", "annotation": "const*", "length": "pipeline statistics count"}, {"name": "pipeline statistics", "type": "pipeline statistic name", "annotation": "const*", "length": "pipeline statistics count"},
{"name": "pipeline statistics count", "type": "uint32_t", "default": "0"} {"name": "pipeline statistics count", "type": "uint32_t", "default": "0"}
] ]
}, },

8
src/dawn_native/QuerySet.cpp
View File

@ -65,11 +65,11 @@ namespace dawn_native {
"PipelineStatistics"); "PipelineStatistics");
} }
std::set<wgpu::PipelineStatisticsName> pipelineStatisticsSet; std::set<wgpu::PipelineStatisticName> pipelineStatisticsSet;
for (uint32_t i = 0; i < descriptor->pipelineStatisticsCount; i++) { for (uint32_t i = 0; i < descriptor->pipelineStatisticsCount; i++) {
DAWN_TRY(ValidatePipelineStatisticsName(descriptor->pipelineStatistics[i])); DAWN_TRY(ValidatePipelineStatisticName(descriptor->pipelineStatistics[i]));
std::pair<std::set<wgpu::PipelineStatisticsName>::iterator, bool> res = std::pair<std::set<wgpu::PipelineStatisticName>::iterator, bool> res =
pipelineStatisticsSet.insert((descriptor->pipelineStatistics[i])); pipelineStatisticsSet.insert((descriptor->pipelineStatistics[i]));
if (!res.second) { if (!res.second) {
return DAWN_VALIDATION_ERROR("Duplicate pipeline statistics found"); return DAWN_VALIDATION_ERROR("Duplicate pipeline statistics found");
@ -127,7 +127,7 @@ namespace dawn_native {
return mQueryCount; return mQueryCount;
} }
const std::vector<wgpu::PipelineStatisticsName>& QuerySetBase::GetPipelineStatistics() const { const std::vector<wgpu::PipelineStatisticName>& QuerySetBase::GetPipelineStatistics() const {
return mPipelineStatistics; return mPipelineStatistics;
} }

4
src/dawn_native/QuerySet.h
View File

@ -33,7 +33,7 @@ namespace dawn_native {
wgpu::QueryType GetQueryType() const; wgpu::QueryType GetQueryType() const;
uint32_t GetQueryCount() const; uint32_t GetQueryCount() const;
const std::vector<wgpu::PipelineStatisticsName>& GetPipelineStatistics() const; const std::vector<wgpu::PipelineStatisticName>& GetPipelineStatistics() const;
MaybeError ValidateCanUseInSubmitNow() const; MaybeError ValidateCanUseInSubmitNow() const;
@ -52,7 +52,7 @@ namespace dawn_native {
wgpu::QueryType mQueryType; wgpu::QueryType mQueryType;
uint32_t mQueryCount; uint32_t mQueryCount;
std::vector<wgpu::PipelineStatisticsName> mPipelineStatistics; std::vector<wgpu::PipelineStatisticName> mPipelineStatistics;
enum class QuerySetState { Unavailable, Available, Destroyed }; enum class QuerySetState { Unavailable, Available, Destroyed };
QuerySetState mState = QuerySetState::Unavailable; QuerySetState mState = QuerySetState::Unavailable;

43
src/tests/unittests/validation/QuerySetValidationTests.cpp
View File

@ -31,7 +31,7 @@ class QuerySetValidationTest : public ValidationTest {
wgpu::Device cDevice, wgpu::Device cDevice,
wgpu::QueryType queryType, wgpu::QueryType queryType,
uint32_t queryCount, uint32_t queryCount,
std::vector<wgpu::PipelineStatisticsName> pipelineStatistics = {}) { std::vector<wgpu::PipelineStatisticName> pipelineStatistics = {}) {
wgpu::QuerySetDescriptor descriptor; wgpu::QuerySetDescriptor descriptor;
descriptor.type = queryType; descriptor.type = queryType;
descriptor.count = queryCount; descriptor.count = queryCount;
@ -64,13 +64,12 @@ TEST_F(QuerySetValidationTest, Creation) {
// Create query set for PipelineStatistics query // Create query set for PipelineStatistics query
{ {
// Fail on default device without any extension enabled // Fail on default device without any extension enabled
ASSERT_DEVICE_ERROR( ASSERT_DEVICE_ERROR(CreateQuerySet(device, wgpu::QueryType::PipelineStatistics, 1,
CreateQuerySet(device, wgpu::QueryType::PipelineStatistics, 1, {wgpu::PipelineStatisticName::VertexShaderInvocations}));
{wgpu::PipelineStatisticsName::VertexShaderInvocations}));
// Success on the device if the extension is enabled. // Success on the device if the extension is enabled.
CreateQuerySet(deviceWithPipelineStatistics, wgpu::QueryType::PipelineStatistics, 1, CreateQuerySet(deviceWithPipelineStatistics, wgpu::QueryType::PipelineStatistics, 1,
{wgpu::PipelineStatisticsName::VertexShaderInvocations}); {wgpu::PipelineStatisticName::VertexShaderInvocations});
} }
// Create query set for Timestamp query // Create query set for Timestamp query
@ -92,16 +91,14 @@ TEST_F(QuerySetValidationTest, InvalidQueryType) {
TEST_F(QuerySetValidationTest, UnnecessaryPipelineStatistics) { TEST_F(QuerySetValidationTest, UnnecessaryPipelineStatistics) {
// Fail to create with pipeline statistics for Occlusion query // Fail to create with pipeline statistics for Occlusion query
{ {
ASSERT_DEVICE_ERROR( ASSERT_DEVICE_ERROR(CreateQuerySet(device, wgpu::QueryType::Occlusion, 1,
CreateQuerySet(device, wgpu::QueryType::Occlusion, 1, {wgpu::PipelineStatisticName::VertexShaderInvocations}));
{wgpu::PipelineStatisticsName::VertexShaderInvocations}));
} }
// Fail to create with pipeline statistics for Timestamp query // Fail to create with pipeline statistics for Timestamp query
{ {
ASSERT_DEVICE_ERROR( ASSERT_DEVICE_ERROR(CreateQuerySet(deviceWithTimestamp, wgpu::QueryType::Timestamp, 1,
CreateQuerySet(deviceWithTimestamp, wgpu::QueryType::Timestamp, 1, {wgpu::PipelineStatisticName::VertexShaderInvocations}));
{wgpu::PipelineStatisticsName::VertexShaderInvocations}));
} }
} }
@ -111,11 +108,11 @@ TEST_F(QuerySetValidationTest, InvalidPipelineStatistics) {
// defined in webgpu header file // defined in webgpu header file
{ {
CreateQuerySet(deviceWithPipelineStatistics, wgpu::QueryType::PipelineStatistics, 1, CreateQuerySet(deviceWithPipelineStatistics, wgpu::QueryType::PipelineStatistics, 1,
{wgpu::PipelineStatisticsName::ClipperInvocations, {wgpu::PipelineStatisticName::ClipperInvocations,
wgpu::PipelineStatisticsName::ClipperPrimitivesOut, wgpu::PipelineStatisticName::ClipperPrimitivesOut,
wgpu::PipelineStatisticsName::ComputeShaderInvocations, wgpu::PipelineStatisticName::ComputeShaderInvocations,
wgpu::PipelineStatisticsName::FragmentShaderInvocations, wgpu::PipelineStatisticName::FragmentShaderInvocations,
wgpu::PipelineStatisticsName::VertexShaderInvocations}); wgpu::PipelineStatisticName::VertexShaderInvocations});
} }
// Fail to create with empty pipeline statistics // Fail to create with empty pipeline statistics
@ -126,17 +123,17 @@ TEST_F(QuerySetValidationTest, InvalidPipelineStatistics) {
// Fail to create with invalid pipeline statistics // Fail to create with invalid pipeline statistics
{ {
ASSERT_DEVICE_ERROR( ASSERT_DEVICE_ERROR(CreateQuerySet(deviceWithPipelineStatistics,
CreateQuerySet(deviceWithPipelineStatistics, wgpu::QueryType::PipelineStatistics, 1, wgpu::QueryType::PipelineStatistics, 1,
{static_cast<wgpu::PipelineStatisticsName>(0xFFFFFFFF)})); {static_cast<wgpu::PipelineStatisticName>(0xFFFFFFFF)}));
} }
// Fail to create with duplicate pipeline statistics // Fail to create with duplicate pipeline statistics
{ {
ASSERT_DEVICE_ERROR( ASSERT_DEVICE_ERROR(CreateQuerySet(deviceWithPipelineStatistics,
CreateQuerySet(deviceWithPipelineStatistics, wgpu::QueryType::PipelineStatistics, 1, wgpu::QueryType::PipelineStatistics, 1,
{wgpu::PipelineStatisticsName::VertexShaderInvocations, {wgpu::PipelineStatisticName::VertexShaderInvocations,
wgpu::PipelineStatisticsName::VertexShaderInvocations})); wgpu::PipelineStatisticName::VertexShaderInvocations}));
} }
} }