Skip to content

Commit bea4940

Browse files
beaufortfrancoisbeaufortfrancois
authored
[webgpu] Remove pipeline statistics query feature (#20499)
1 parent b9f003d commit bea4940

File tree

8 files changed

+21
-140
lines changed

8 files changed

+21
-140
lines changed

‎src/generated_struct_info32.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1051,12 +1051,10 @@
10511051
"nextInChain": 0
10521052
},
10531053
"WGPUQuerySetDescriptor": {
1054-
"__size__": 24,
1054+
"__size__": 16,
10551055
"count": 12,
10561056
"label": 4,
10571057
"nextInChain": 0,
1058-
"pipelineStatistics": 16,
1059-
"pipelineStatisticsCount": 20,
10601058
"type": 8
10611059
},
10621060
"WGPUQueueDescriptor": {

‎src/generated_struct_info64.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1051,12 +1051,10 @@
10511051
"nextInChain": 0
10521052
},
10531053
"WGPUQuerySetDescriptor": {
1054-
"__size__": 40,
1054+
"__size__": 24,
10551055
"count": 20,
10561056
"label": 8,
10571057
"nextInChain": 0,
1058-
"pipelineStatistics": 24,
1059-
"pipelineStatisticsCount": 32,
10601058
"type": 16
10611059
},
10621060
"WGPUQueueDescriptor": {

‎src/library_sigs.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1591,11 +1591,9 @@ sigs = {
15911591
wgpuCommandEncoderResolveQuerySet__sig: 'vppiipj',
15921592
wgpuCommandEncoderSetLabel__sig: 'vpp',
15931593
wgpuCommandEncoderWriteTimestamp__sig: 'vppi',
1594-
wgpuComputePassEncoderBeginPipelineStatisticsQuery__sig: 'vppi',
15951594
wgpuComputePassEncoderDispatchWorkgroups__sig: 'vpiii',
15961595
wgpuComputePassEncoderDispatchWorkgroupsIndirect__sig: 'vppj',
15971596
wgpuComputePassEncoderEnd__sig: 'vp',
1598-
wgpuComputePassEncoderEndPipelineStatisticsQuery__sig: 'vp',
15991597
wgpuComputePassEncoderInsertDebugMarker__sig: 'vpp',
16001598
wgpuComputePassEncoderPopDebugGroup__sig: 'vp',
16011599
wgpuComputePassEncoderPushDebugGroup__sig: 'vpp',
@@ -1677,14 +1675,12 @@ sigs = {
16771675
wgpuRenderBundleRelease__sig: 'vp',
16781676
wgpuRenderBundleSetLabel__sig: 'vpp',
16791677
wgpuRenderPassEncoderBeginOcclusionQuery__sig: 'vpi',
1680-
wgpuRenderPassEncoderBeginPipelineStatisticsQuery__sig: 'vppi',
16811678
wgpuRenderPassEncoderDraw__sig: 'vpiiii',
16821679
wgpuRenderPassEncoderDrawIndexed__sig: 'vpiiiii',
16831680
wgpuRenderPassEncoderDrawIndexedIndirect__sig: 'vppj',
16841681
wgpuRenderPassEncoderDrawIndirect__sig: 'vppj',
16851682
wgpuRenderPassEncoderEnd__sig: 'vp',
16861683
wgpuRenderPassEncoderEndOcclusionQuery__sig: 'vp',
1687-
wgpuRenderPassEncoderEndPipelineStatisticsQuery__sig: 'vp',
16881684
wgpuRenderPassEncoderExecuteBundles__sig: 'vppp',
16891685
wgpuRenderPassEncoderInsertDebugMarker__sig: 'vpp',
16901686
wgpuRenderPassEncoderPopDebugGroup__sig: 'vp',

‎src/library_webgpu.js

Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,6 @@ var LibraryWebGPU = {
400400
'depth-clip-control',
401401
'depth32float-stencil8',
402402
'timestamp-query',
403-
'pipeline-statistics-query',
404403
'texture-compression-bc',
405404
'texture-compression-etc2',
406405
'texture-compression-astc',
@@ -432,13 +431,6 @@ var LibraryWebGPU = {
432431
'nearest',
433432
'linear',
434433
],
435-
PipelineStatisticName: [
436-
'vertex-shader-invocations',
437-
'clipper-invocations',
438-
'clipper-primitives-out',
439-
'fragment-shader-invocations',
440-
'compute-shader-invocations',
441-
],
442434
PowerPreference: [
443435
undefined,
444436
'low-power',
@@ -453,7 +445,6 @@ var LibraryWebGPU = {
453445
],
454446
QueryType: [
455447
'occlusion',
456-
'pipeline-statistics',
457448
'timestamp',
458449
],
459450
SamplerBindingType: [
@@ -1120,24 +1111,10 @@ var LibraryWebGPU = {
11201111
wgpuDeviceCreateQuerySet: (deviceId, descriptor) => {
11211112
{{{ gpu.makeCheckDescriptor('descriptor') }}}
11221113

1123-
var pipelineStatistics;
1124-
var pipelineStatisticsCount =
1125-
{{{ gpu.makeGetU32('descriptor', C_STRUCTS.WGPUQuerySetDescriptor.pipelineStatisticsCount) }}};
1126-
if (pipelineStatisticsCount) {
1127-
var pipelineStatisticsPtr =
1128-
{{{ makeGetValue('descriptor', C_STRUCTS.WGPUQuerySetDescriptor.pipelineStatistics, '*') }}};
1129-
pipelineStatistics = [];
1130-
for (var i = 0; i < pipelineStatisticsCount; ++i) {
1131-
pipelineStatistics.push(WebGPU.PipelineStatisticName[
1132-
{{{ gpu.makeGetU32('pipelineStatisticsPtr', '4 * i') }}}]);
1133-
}
1134-
}
1135-
11361114
var desc = {
11371115
"type": WebGPU.QueryType[
11381116
{{{ gpu.makeGetU32('descriptor', C_STRUCTS.WGPUQuerySetDescriptor.type) }}}],
11391117
"count": {{{ gpu.makeGetU32('descriptor', C_STRUCTS.WGPUQuerySetDescriptor.count) }}},
1140-
"pipelineStatistics": pipelineStatistics,
11411118
};
11421119

11431120
var device = WebGPU.mgrDevice.get(deviceId);
@@ -2053,16 +2030,6 @@ var LibraryWebGPU = {
20532030
pass["dispatchWorkgroupsIndirect"](indirectBuffer, indirectOffset);
20542031
},
20552032

2056-
wgpuComputePassEncoderBeginPipelineStatisticsQuery: (passId, querySetId, queryIndex) => {
2057-
var pass = WebGPU.mgrComputePassEncoder.get(passId);
2058-
var querySet = WebGPU.mgrQuerySet.get(querySetId);
2059-
pass["beginPipelineStatisticsQuery"](querySet, queryIndex);
2060-
},
2061-
wgpuComputePassEncoderEndPipelineStatisticsQuery: (passId) => {
2062-
var pass = WebGPU.mgrComputePassEncoder.get(passId);
2063-
pass["endPipelineStatisticsQuery"]();
2064-
},
2065-
20662033
wgpuComputePassEncoderWriteTimestamp: (encoderId, querySetId, queryIndex) => {
20672034
var pass = WebGPU.mgrComputePassEncoder.get(encoderId);
20682035
var querySet = WebGPU.mgrQuerySet.get(querySetId);
@@ -2182,16 +2149,6 @@ var LibraryWebGPU = {
21822149
pass["endOcclusionQuery"]();
21832150
},
21842151

2185-
wgpuRenderPassEncoderBeginPipelineStatisticsQuery: (passId, querySetId, queryIndex) => {
2186-
var pass = WebGPU.mgrRenderPassEncoder.get(passId);
2187-
var querySet = WebGPU.mgrQuerySet.get(querySetId);
2188-
pass["beginPipelineStatisticsQuery"](querySet, queryIndex);
2189-
},
2190-
wgpuRenderPassEncoderEndPipelineStatisticsQuery: (passId) => {
2191-
var pass = WebGPU.mgrRenderPassEncoder.get(passId);
2192-
pass["endPipelineStatisticsQuery"]();
2193-
},
2194-
21952152
wgpuRenderPassEncoderWriteTimestamp: (encoderId, querySetId, queryIndex) => {
21962153
var pass = WebGPU.mgrRenderPassEncoder.get(encoderId);
21972154
var querySet = WebGPU.mgrQuerySet.get(querySetId);

‎src/struct_info.json

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1337,9 +1337,7 @@
13371337
"nextInChain",
13381338
"label",
13391339
"type",
1340-
"count",
1341-
"pipelineStatistics",
1342-
"pipelineStatisticsCount"
1340+
"count"
13431341
],
13441342
"WGPUQueueDescriptor": [
13451343
"nextInChain",

‎system/include/webgpu/webgpu.h

Lines changed: 9 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -323,15 +323,14 @@ typedef enum WGPUFeatureName {
323323
WGPUFeatureName_DepthClipControl = 0x00000001,
324324
WGPUFeatureName_Depth32FloatStencil8 = 0x00000002,
325325
WGPUFeatureName_TimestampQuery = 0x00000003,
326-
WGPUFeatureName_PipelineStatisticsQuery = 0x00000004,
327-
WGPUFeatureName_TextureCompressionBC = 0x00000005,
328-
WGPUFeatureName_TextureCompressionETC2 = 0x00000006,
329-
WGPUFeatureName_TextureCompressionASTC = 0x00000007,
330-
WGPUFeatureName_IndirectFirstInstance = 0x00000008,
331-
WGPUFeatureName_ShaderF16 = 0x00000009,
332-
WGPUFeatureName_RG11B10UfloatRenderable = 0x0000000A,
333-
WGPUFeatureName_BGRA8UnormStorage = 0x0000000B,
334-
WGPUFeatureName_Float32Filterable = 0x0000000C,
326+
WGPUFeatureName_TextureCompressionBC = 0x00000004,
327+
WGPUFeatureName_TextureCompressionETC2 = 0x00000005,
328+
WGPUFeatureName_TextureCompressionASTC = 0x00000006,
329+
WGPUFeatureName_IndirectFirstInstance = 0x00000007,
330+
WGPUFeatureName_ShaderF16 = 0x00000008,
331+
WGPUFeatureName_RG11B10UfloatRenderable = 0x00000009,
332+
WGPUFeatureName_BGRA8UnormStorage = 0x0000000A,
333+
WGPUFeatureName_Float32Filterable = 0x0000000B,
335334
WGPUFeatureName_Force32 = 0x7FFFFFFF
336335
} WGPUFeatureName WGPU_ENUM_ATTRIBUTE;
337336

@@ -367,15 +366,6 @@ typedef enum WGPUMipmapFilterMode {
367366
WGPUMipmapFilterMode_Force32 = 0x7FFFFFFF
368367
} WGPUMipmapFilterMode WGPU_ENUM_ATTRIBUTE;
369368

370-
typedef enum WGPUPipelineStatisticName {
371-
WGPUPipelineStatisticName_VertexShaderInvocations = 0x00000000,
372-
WGPUPipelineStatisticName_ClipperInvocations = 0x00000001,
373-
WGPUPipelineStatisticName_ClipperPrimitivesOut = 0x00000002,
374-
WGPUPipelineStatisticName_FragmentShaderInvocations = 0x00000003,
375-
WGPUPipelineStatisticName_ComputeShaderInvocations = 0x00000004,
376-
WGPUPipelineStatisticName_Force32 = 0x7FFFFFFF
377-
} WGPUPipelineStatisticName WGPU_ENUM_ATTRIBUTE;
378-
379369
typedef enum WGPUPowerPreference {
380370
WGPUPowerPreference_Undefined = 0x00000000,
381371
WGPUPowerPreference_LowPower = 0x00000001,
@@ -401,8 +391,7 @@ typedef enum WGPUPrimitiveTopology {
401391

402392
typedef enum WGPUQueryType {
403393
WGPUQueryType_Occlusion = 0x00000000,
404-
WGPUQueryType_PipelineStatistics = 0x00000001,
405-
WGPUQueryType_Timestamp = 0x00000002,
394+
WGPUQueryType_Timestamp = 0x00000001,
406395
WGPUQueryType_Force32 = 0x7FFFFFFF
407396
} WGPUQueryType WGPU_ENUM_ATTRIBUTE;
408397

@@ -894,8 +883,6 @@ typedef struct WGPUQuerySetDescriptor {
894883
WGPU_NULLABLE char const * label;
895884
WGPUQueryType type;
896885
uint32_t count;
897-
WGPUPipelineStatisticName const * pipelineStatistics;
898-
size_t pipelineStatisticsCount;
899886
} WGPUQuerySetDescriptor WGPU_STRUCTURE_ATTRIBUTE;
900887

901888
typedef struct WGPUQueueDescriptor {
@@ -1305,11 +1292,9 @@ typedef void (*WGPUProcCommandEncoderReference)(WGPUCommandEncoder commandEncode
13051292
typedef void (*WGPUProcCommandEncoderRelease)(WGPUCommandEncoder commandEncoder) WGPU_FUNCTION_ATTRIBUTE;
13061293

13071294
// Procs of ComputePassEncoder
1308-
typedef void (*WGPUProcComputePassEncoderBeginPipelineStatisticsQuery)(WGPUComputePassEncoder computePassEncoder, WGPUQuerySet querySet, uint32_t queryIndex) WGPU_FUNCTION_ATTRIBUTE;
13091295
typedef void (*WGPUProcComputePassEncoderDispatchWorkgroups)(WGPUComputePassEncoder computePassEncoder, uint32_t workgroupCountX, uint32_t workgroupCountY, uint32_t workgroupCountZ) WGPU_FUNCTION_ATTRIBUTE;
13101296
typedef void (*WGPUProcComputePassEncoderDispatchWorkgroupsIndirect)(WGPUComputePassEncoder computePassEncoder, WGPUBuffer indirectBuffer, uint64_t indirectOffset) WGPU_FUNCTION_ATTRIBUTE;
13111297
typedef void (*WGPUProcComputePassEncoderEnd)(WGPUComputePassEncoder computePassEncoder) WGPU_FUNCTION_ATTRIBUTE;
1312-
typedef void (*WGPUProcComputePassEncoderEndPipelineStatisticsQuery)(WGPUComputePassEncoder computePassEncoder) WGPU_FUNCTION_ATTRIBUTE;
13131298
typedef void (*WGPUProcComputePassEncoderInsertDebugMarker)(WGPUComputePassEncoder computePassEncoder, char const * markerLabel) WGPU_FUNCTION_ATTRIBUTE;
13141299
typedef void (*WGPUProcComputePassEncoderPopDebugGroup)(WGPUComputePassEncoder computePassEncoder) WGPU_FUNCTION_ATTRIBUTE;
13151300
typedef void (*WGPUProcComputePassEncoderPushDebugGroup)(WGPUComputePassEncoder computePassEncoder, char const * groupLabel) WGPU_FUNCTION_ATTRIBUTE;
@@ -1407,14 +1392,12 @@ typedef void (*WGPUProcRenderBundleEncoderRelease)(WGPURenderBundleEncoder rende
14071392

14081393
// Procs of RenderPassEncoder
14091394
typedef void (*WGPUProcRenderPassEncoderBeginOcclusionQuery)(WGPURenderPassEncoder renderPassEncoder, uint32_t queryIndex) WGPU_FUNCTION_ATTRIBUTE;
1410-
typedef void (*WGPUProcRenderPassEncoderBeginPipelineStatisticsQuery)(WGPURenderPassEncoder renderPassEncoder, WGPUQuerySet querySet, uint32_t queryIndex) WGPU_FUNCTION_ATTRIBUTE;
14111395
typedef void (*WGPUProcRenderPassEncoderDraw)(WGPURenderPassEncoder renderPassEncoder, uint32_t vertexCount, uint32_t instanceCount, uint32_t firstVertex, uint32_t firstInstance) WGPU_FUNCTION_ATTRIBUTE;
14121396
typedef void (*WGPUProcRenderPassEncoderDrawIndexed)(WGPURenderPassEncoder renderPassEncoder, uint32_t indexCount, uint32_t instanceCount, uint32_t firstIndex, int32_t baseVertex, uint32_t firstInstance) WGPU_FUNCTION_ATTRIBUTE;
14131397
typedef void (*WGPUProcRenderPassEncoderDrawIndexedIndirect)(WGPURenderPassEncoder renderPassEncoder, WGPUBuffer indirectBuffer, uint64_t indirectOffset) WGPU_FUNCTION_ATTRIBUTE;
14141398
typedef void (*WGPUProcRenderPassEncoderDrawIndirect)(WGPURenderPassEncoder renderPassEncoder, WGPUBuffer indirectBuffer, uint64_t indirectOffset) WGPU_FUNCTION_ATTRIBUTE;
14151399
typedef void (*WGPUProcRenderPassEncoderEnd)(WGPURenderPassEncoder renderPassEncoder) WGPU_FUNCTION_ATTRIBUTE;
14161400
typedef void (*WGPUProcRenderPassEncoderEndOcclusionQuery)(WGPURenderPassEncoder renderPassEncoder) WGPU_FUNCTION_ATTRIBUTE;
1417-
typedef void (*WGPUProcRenderPassEncoderEndPipelineStatisticsQuery)(WGPURenderPassEncoder renderPassEncoder) WGPU_FUNCTION_ATTRIBUTE;
14181401
typedef void (*WGPUProcRenderPassEncoderExecuteBundles)(WGPURenderPassEncoder renderPassEncoder, size_t bundleCount, WGPURenderBundle const * bundles) WGPU_FUNCTION_ATTRIBUTE;
14191402
typedef void (*WGPUProcRenderPassEncoderInsertDebugMarker)(WGPURenderPassEncoder renderPassEncoder, char const * markerLabel) WGPU_FUNCTION_ATTRIBUTE;
14201403
typedef void (*WGPUProcRenderPassEncoderPopDebugGroup)(WGPURenderPassEncoder renderPassEncoder) WGPU_FUNCTION_ATTRIBUTE;
@@ -1543,11 +1526,9 @@ WGPU_EXPORT void wgpuCommandEncoderReference(WGPUCommandEncoder commandEncoder)
15431526
WGPU_EXPORT void wgpuCommandEncoderRelease(WGPUCommandEncoder commandEncoder) WGPU_FUNCTION_ATTRIBUTE;
15441527

15451528
// Methods of ComputePassEncoder
1546-
WGPU_EXPORT void wgpuComputePassEncoderBeginPipelineStatisticsQuery(WGPUComputePassEncoder computePassEncoder, WGPUQuerySet querySet, uint32_t queryIndex) WGPU_FUNCTION_ATTRIBUTE;
15471529
WGPU_EXPORT void wgpuComputePassEncoderDispatchWorkgroups(WGPUComputePassEncoder computePassEncoder, uint32_t workgroupCountX, uint32_t workgroupCountY, uint32_t workgroupCountZ) WGPU_FUNCTION_ATTRIBUTE;
15481530
WGPU_EXPORT void wgpuComputePassEncoderDispatchWorkgroupsIndirect(WGPUComputePassEncoder computePassEncoder, WGPUBuffer indirectBuffer, uint64_t indirectOffset) WGPU_FUNCTION_ATTRIBUTE;
15491531
WGPU_EXPORT void wgpuComputePassEncoderEnd(WGPUComputePassEncoder computePassEncoder) WGPU_FUNCTION_ATTRIBUTE;
1550-
WGPU_EXPORT void wgpuComputePassEncoderEndPipelineStatisticsQuery(WGPUComputePassEncoder computePassEncoder) WGPU_FUNCTION_ATTRIBUTE;
15511532
WGPU_EXPORT void wgpuComputePassEncoderInsertDebugMarker(WGPUComputePassEncoder computePassEncoder, char const * markerLabel) WGPU_FUNCTION_ATTRIBUTE;
15521533
WGPU_EXPORT void wgpuComputePassEncoderPopDebugGroup(WGPUComputePassEncoder computePassEncoder) WGPU_FUNCTION_ATTRIBUTE;
15531534
WGPU_EXPORT void wgpuComputePassEncoderPushDebugGroup(WGPUComputePassEncoder computePassEncoder, char const * groupLabel) WGPU_FUNCTION_ATTRIBUTE;
@@ -1645,14 +1626,12 @@ WGPU_EXPORT void wgpuRenderBundleEncoderRelease(WGPURenderBundleEncoder renderBu
16451626

16461627
// Methods of RenderPassEncoder
16471628
WGPU_EXPORT void wgpuRenderPassEncoderBeginOcclusionQuery(WGPURenderPassEncoder renderPassEncoder, uint32_t queryIndex) WGPU_FUNCTION_ATTRIBUTE;
1648-
WGPU_EXPORT void wgpuRenderPassEncoderBeginPipelineStatisticsQuery(WGPURenderPassEncoder renderPassEncoder, WGPUQuerySet querySet, uint32_t queryIndex) WGPU_FUNCTION_ATTRIBUTE;
16491629
WGPU_EXPORT void wgpuRenderPassEncoderDraw(WGPURenderPassEncoder renderPassEncoder, uint32_t vertexCount, uint32_t instanceCount, uint32_t firstVertex, uint32_t firstInstance) WGPU_FUNCTION_ATTRIBUTE;
16501630
WGPU_EXPORT void wgpuRenderPassEncoderDrawIndexed(WGPURenderPassEncoder renderPassEncoder, uint32_t indexCount, uint32_t instanceCount, uint32_t firstIndex, int32_t baseVertex, uint32_t firstInstance) WGPU_FUNCTION_ATTRIBUTE;
16511631
WGPU_EXPORT void wgpuRenderPassEncoderDrawIndexedIndirect(WGPURenderPassEncoder renderPassEncoder, WGPUBuffer indirectBuffer, uint64_t indirectOffset) WGPU_FUNCTION_ATTRIBUTE;
16521632
WGPU_EXPORT void wgpuRenderPassEncoderDrawIndirect(WGPURenderPassEncoder renderPassEncoder, WGPUBuffer indirectBuffer, uint64_t indirectOffset) WGPU_FUNCTION_ATTRIBUTE;
16531633
WGPU_EXPORT void wgpuRenderPassEncoderEnd(WGPURenderPassEncoder renderPassEncoder) WGPU_FUNCTION_ATTRIBUTE;
16541634
WGPU_EXPORT void wgpuRenderPassEncoderEndOcclusionQuery(WGPURenderPassEncoder renderPassEncoder) WGPU_FUNCTION_ATTRIBUTE;
1655-
WGPU_EXPORT void wgpuRenderPassEncoderEndPipelineStatisticsQuery(WGPURenderPassEncoder renderPassEncoder) WGPU_FUNCTION_ATTRIBUTE;
16561635
WGPU_EXPORT void wgpuRenderPassEncoderExecuteBundles(WGPURenderPassEncoder renderPassEncoder, size_t bundleCount, WGPURenderBundle const * bundles) WGPU_FUNCTION_ATTRIBUTE;
16571636
WGPU_EXPORT void wgpuRenderPassEncoderInsertDebugMarker(WGPURenderPassEncoder renderPassEncoder, char const * markerLabel) WGPU_FUNCTION_ATTRIBUTE;
16581637
WGPU_EXPORT void wgpuRenderPassEncoderPopDebugGroup(WGPURenderPassEncoder renderPassEncoder) WGPU_FUNCTION_ATTRIBUTE;

‎system/include/webgpu/webgpu_cpp.h

Lines changed: 9 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -282,15 +282,14 @@ namespace wgpu {
282282
DepthClipControl = 0x00000001,
283283
Depth32FloatStencil8 = 0x00000002,
284284
TimestampQuery = 0x00000003,
285-
PipelineStatisticsQuery = 0x00000004,
286-
TextureCompressionBC = 0x00000005,
287-
TextureCompressionETC2 = 0x00000006,
288-
TextureCompressionASTC = 0x00000007,
289-
IndirectFirstInstance = 0x00000008,
290-
ShaderF16 = 0x00000009,
291-
RG11B10UfloatRenderable = 0x0000000A,
292-
BGRA8UnormStorage = 0x0000000B,
293-
Float32Filterable = 0x0000000C,
285+
TextureCompressionBC = 0x00000004,
286+
TextureCompressionETC2 = 0x00000005,
287+
TextureCompressionASTC = 0x00000006,
288+
IndirectFirstInstance = 0x00000007,
289+
ShaderF16 = 0x00000008,
290+
RG11B10UfloatRenderable = 0x00000009,
291+
BGRA8UnormStorage = 0x0000000A,
292+
Float32Filterable = 0x0000000B,
294293
};
295294

296295
enum class FilterMode : uint32_t {
@@ -320,14 +319,6 @@ namespace wgpu {
320319
Linear = 0x00000001,
321320
};
322321

323-
enum class PipelineStatisticName : uint32_t {
324-
VertexShaderInvocations = 0x00000000,
325-
ClipperInvocations = 0x00000001,
326-
ClipperPrimitivesOut = 0x00000002,
327-
FragmentShaderInvocations = 0x00000003,
328-
ComputeShaderInvocations = 0x00000004,
329-
};
330-
331322
enum class PowerPreference : uint32_t {
332323
Undefined = 0x00000000,
333324
LowPower = 0x00000001,
@@ -350,8 +341,7 @@ namespace wgpu {
350341

351342
enum class QueryType : uint32_t {
352343
Occlusion = 0x00000000,
353-
PipelineStatistics = 0x00000001,
354-
Timestamp = 0x00000002,
344+
Timestamp = 0x00000001,
355345
};
356346

357347
enum class QueueWorkDoneStatus : uint32_t {
@@ -918,11 +908,9 @@ namespace wgpu {
918908
using ObjectBase::ObjectBase;
919909
using ObjectBase::operator=;
920910

921-
void BeginPipelineStatisticsQuery(QuerySet const& querySet, uint32_t queryIndex) const;
922911
void DispatchWorkgroups(uint32_t workgroupCountX, uint32_t workgroupCountY = 1, uint32_t workgroupCountZ = 1) const;
923912
void DispatchWorkgroupsIndirect(Buffer const& indirectBuffer, uint64_t indirectOffset) const;
924913
void End() const;
925-
void EndPipelineStatisticsQuery() const;
926914
void InsertDebugMarker(char const * markerLabel) const;
927915
void PopDebugGroup() const;
928916
void PushDebugGroup(char const * groupLabel) const;
@@ -1092,14 +1080,12 @@ namespace wgpu {
10921080
using ObjectBase::operator=;
10931081

10941082
void BeginOcclusionQuery(uint32_t queryIndex) const;
1095-
void BeginPipelineStatisticsQuery(QuerySet const& querySet, uint32_t queryIndex) const;
10961083
void Draw(uint32_t vertexCount, uint32_t instanceCount = 1, uint32_t firstVertex = 0, uint32_t firstInstance = 0) const;
10971084
void DrawIndexed(uint32_t indexCount, uint32_t instanceCount = 1, uint32_t firstIndex = 0, int32_t baseVertex = 0, uint32_t firstInstance = 0) const;
10981085
void DrawIndexedIndirect(Buffer const& indirectBuffer, uint64_t indirectOffset) const;
10991086
void DrawIndirect(Buffer const& indirectBuffer, uint64_t indirectOffset) const;
11001087
void End() const;
11011088
void EndOcclusionQuery() const;
1102-
void EndPipelineStatisticsQuery() const;
11031089
void ExecuteBundles(size_t bundleCount, RenderBundle const * bundles) const;
11041090
void InsertDebugMarker(char const * markerLabel) const;
11051091
void PopDebugGroup() const;
@@ -1412,8 +1398,6 @@ namespace wgpu {
14121398
char const * label = nullptr;
14131399
QueryType type;
14141400
uint32_t count;
1415-
PipelineStatisticName const * pipelineStatistics;
1416-
size_t pipelineStatisticsCount = 0;
14171401
};
14181402

14191403
struct QueueDescriptor {

0 commit comments

Comments
 (0)