Skip to content

Commit c4c94ef

Browse files
DragonJokerDragonJoker
committed
CI: Improved coverage for AST tests.
1 parent e8dc773 commit c4c94ef

File tree

92 files changed

+33597
-22731
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+33597
-22731
lines changed

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<p align="center">
2+
<img alt="Vcpkg Version" src="https://img.shields.io/vcpkg/v/shaderwriter">
23
<a href="https://github.com/DragonJoker/ShaderWriter/actions?query=workflow%3ABuild"><img alt="Build status" src="https://github.com/DragonJoker/ShaderWriter/workflows/Build/badge.svg"></a>
34
<a href="https://codecov.io/gh/DragonJoker/ShaderWriter"><img src="https://codecov.io/gh/DragonJoker/ShaderWriter/graph/badge.svg?token=DG48IQUK64"/></a>
45
</p>

‎include/CompilerSpirV/compileSpirV.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,9 @@ namespace spirv
9898
// Enable this extension if you need any of the following intrinsic functions:
9999
// atomicAddF, atomicAdd2H, atomicAdd4H
100100
// atomicExchangeF, atomicExchange2H, atomicExchange4H
101-
// imageAtomicAdd1DF, imageAtomicAdd2DF, imageAtomicAdd3DF, imageAtomicAdd2DRectF, imageAtomicAddCubeF, imageAtomicAddBufferF, imageAtomicAdd2DMSF
101+
// imageAtomicAdd1DF, imageAtomicAdd2DF, imageAtomicAdd3DF, imageAtomicAddCubeF, imageAtomicAddBufferF, imageAtomicAdd2DMSF
102102
// imageAtomicAdd1DArrayF, imageAtomicAdd2DArrayF, imageAtomicAddCubeArrayF, imageAtomicAdd2DMSArrayF
103-
// imageAtomicExchange1DF, imageAtomicExchange2DF, imageAtomicExchange3DF, imageAtomicExchange2DRectF, imageAtomicExchangeCubeF, imageAtomicExchangeBufferF
103+
// imageAtomicExchange1DF, imageAtomicExchange2DF, imageAtomicExchange3DF, imageAtomicExchangeCubeF, imageAtomicExchangeBufferF
104104
// imageAtomicExchange1DArrayF, imageAtomicExchange2DArrayF, imageAtomicExchangeCubeArrayF, imageAtomicExchange2DMSF, imageAtomicExchange2DMSArrayF
105105
makeSpirVExtension( v1_0, v1_5, vUnk, EXT_shader_atomic_float_add );
106106
// Not used yet.

‎include/ShaderAST/Expr/CombinedImageAccess.enum

Lines changed: 0 additions & 66 deletions
Large diffs are not rendered by default.

‎include/ShaderAST/Expr/EnumCombinedImageAccess.hpp

Lines changed: 0 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ namespace ast::expr
2323
eTextureSizeCubeShadowF,
2424
eTextureSizeCubeArrayF,
2525
eTextureSizeCubeArrayShadowF,
26-
eTextureSize2DRectF,
27-
eTextureSize2DRectShadowF,
2826
eTextureSize1DArrayF,
2927
eTextureSize2DArrayF,
3028
eTextureSize1DArrayShadowF,
@@ -35,7 +33,6 @@ namespace ast::expr
3533
eTextureSize3DI,
3634
eTextureSizeCubeI,
3735
eTextureSizeCubeArrayI,
38-
eTextureSize2DRectI,
3936
eTextureSize1DArrayI,
4037
eTextureSize2DArrayI,
4138
eTextureSizeBufferI,
@@ -44,7 +41,6 @@ namespace ast::expr
4441
eTextureSize3DU,
4542
eTextureSizeCubeU,
4643
eTextureSizeCubeArrayU,
47-
eTextureSize2DRectU,
4844
eTextureSize1DArrayU,
4945
eTextureSize2DArrayU,
5046
eTextureSizeBufferU,
@@ -118,7 +114,6 @@ namespace ast::expr
118114
eTexture2DArrayFBias,
119115
eTextureCubeArrayF,
120116
eTextureCubeArrayFBias,
121-
eTexture2DRectF,
122117
eTexture1DI,
123118
eTexture1DIBias,
124119
eTexture2DI,
@@ -133,7 +128,6 @@ namespace ast::expr
133128
eTexture2DArrayIBias,
134129
eTextureCubeArrayI,
135130
eTextureCubeArrayIBias,
136-
eTexture2DRectI,
137131
eTexture1DU,
138132
eTexture1DUBias,
139133
eTexture2DU,
@@ -148,7 +142,6 @@ namespace ast::expr
148142
eTexture2DArrayUBias,
149143
eTextureCubeArrayU,
150144
eTextureCubeArrayUBias,
151-
eTexture2DRectU,
152145
eTextureProj1DF2,
153146
eTextureProj1DF2Bias,
154147
eTextureProj1DF4,
@@ -159,8 +152,6 @@ namespace ast::expr
159152
eTextureProj2DF4Bias,
160153
eTextureProj3DF,
161154
eTextureProj3DFBias,
162-
eTextureProj2DRectF3,
163-
eTextureProj2DRectF4,
164155
eTextureProj1DI2,
165156
eTextureProj1DI2Bias,
166157
eTextureProj1DI4,
@@ -171,8 +162,6 @@ namespace ast::expr
171162
eTextureProj2DI4Bias,
172163
eTextureProj3DI,
173164
eTextureProj3DIBias,
174-
eTextureProj2DRectI3,
175-
eTextureProj2DRectI4,
176165
eTextureProj1DU2,
177166
eTextureProj1DU2Bias,
178167
eTextureProj1DU4,
@@ -183,8 +172,6 @@ namespace ast::expr
183172
eTextureProj2DU4Bias,
184173
eTextureProj3DU,
185174
eTextureProj3DUBias,
186-
eTextureProj2DRectU3,
187-
eTextureProj2DRectU4,
188175
eTextureLod1DF,
189176
eTextureLod2DF,
190177
eTextureLod3DF,
@@ -212,7 +199,6 @@ namespace ast::expr
212199
eTextureOffset2DFBias,
213200
eTextureOffset3DF,
214201
eTextureOffset3DFBias,
215-
eTextureOffset2DRectF,
216202
eTextureOffset1DArrayF,
217203
eTextureOffset1DArrayFBias,
218204
eTextureOffset2DArrayF,
@@ -223,7 +209,6 @@ namespace ast::expr
223209
eTextureOffset2DIBias,
224210
eTextureOffset3DI,
225211
eTextureOffset3DIBias,
226-
eTextureOffset2DRectI,
227212
eTextureOffset1DArrayI,
228213
eTextureOffset1DArrayIBias,
229214
eTextureOffset2DArrayI,
@@ -234,48 +219,41 @@ namespace ast::expr
234219
eTextureOffset2DUBias,
235220
eTextureOffset3DU,
236221
eTextureOffset3DUBias,
237-
eTextureOffset2DRectU,
238222
eTextureOffset1DArrayU,
239223
eTextureOffset1DArrayUBias,
240224
eTextureOffset2DArrayU,
241225
eTextureOffset2DArrayUBias,
242226
eTexelFetch1DF,
243227
eTexelFetch2DF,
244228
eTexelFetch3DF,
245-
eTexelFetch2DRectF,
246229
eTexelFetch1DArrayF,
247230
eTexelFetch2DArrayF,
248231
eTexelFetchBufferF,
249232
eTexelFetch1DI,
250233
eTexelFetch2DI,
251234
eTexelFetch3DI,
252-
eTexelFetch2DRectI,
253235
eTexelFetch1DArrayI,
254236
eTexelFetch2DArrayI,
255237
eTexelFetchBufferI,
256238
eTexelFetch1DU,
257239
eTexelFetch2DU,
258240
eTexelFetch3DU,
259-
eTexelFetch2DRectU,
260241
eTexelFetch1DArrayU,
261242
eTexelFetch2DArrayU,
262243
eTexelFetchBufferU,
263244
eTexelFetchOffset1DF,
264245
eTexelFetchOffset2DF,
265246
eTexelFetchOffset3DF,
266-
eTexelFetchOffset2DRectF,
267247
eTexelFetchOffset1DArrayF,
268248
eTexelFetchOffset2DArrayF,
269249
eTexelFetchOffset1DI,
270250
eTexelFetchOffset2DI,
271251
eTexelFetchOffset3DI,
272-
eTexelFetchOffset2DRectI,
273252
eTexelFetchOffset1DArrayI,
274253
eTexelFetchOffset2DArrayI,
275254
eTexelFetchOffset1DU,
276255
eTexelFetchOffset2DU,
277256
eTexelFetchOffset3DU,
278-
eTexelFetchOffset2DRectU,
279257
eTexelFetchOffset1DArrayU,
280258
eTexelFetchOffset2DArrayU,
281259
eTextureProjOffset1DF2,
@@ -288,8 +266,6 @@ namespace ast::expr
288266
eTextureProjOffset2DF4Bias,
289267
eTextureProjOffset3DF,
290268
eTextureProjOffset3DFBias,
291-
eTextureProjOffset2DRectF3,
292-
eTextureProjOffset2DRectF4,
293269
eTextureProjOffset1DI2,
294270
eTextureProjOffset1DI2Bias,
295271
eTextureProjOffset1DI4,
@@ -300,8 +276,6 @@ namespace ast::expr
300276
eTextureProjOffset2DI4Bias,
301277
eTextureProjOffset3DI,
302278
eTextureProjOffset3DIBias,
303-
eTextureProjOffset2DRectI3,
304-
eTextureProjOffset2DRectI4,
305279
eTextureProjOffset1DU2,
306280
eTextureProjOffset1DU2Bias,
307281
eTextureProjOffset1DU4,
@@ -312,8 +286,6 @@ namespace ast::expr
312286
eTextureProjOffset2DU4Bias,
313287
eTextureProjOffset3DU,
314288
eTextureProjOffset3DUBias,
315-
eTextureProjOffset2DRectU3,
316-
eTextureProjOffset2DRectU4,
317289
eTextureLodOffset1DF,
318290
eTextureLodOffset2DF,
319291
eTextureLodOffset3DF,
@@ -363,86 +335,68 @@ namespace ast::expr
363335
eTextureGrad2DF,
364336
eTextureGrad3DF,
365337
eTextureGradCubeF,
366-
eTextureGrad2DRectF,
367338
eTextureGrad1DArrayF,
368339
eTextureGrad2DArrayF,
369340
eTextureGradCubeArrayF,
370341
eTextureGrad1DI,
371342
eTextureGrad2DI,
372343
eTextureGrad3DI,
373344
eTextureGradCubeI,
374-
eTextureGrad2DRectI,
375345
eTextureGrad1DArrayI,
376346
eTextureGrad2DArrayI,
377347
eTextureGradCubeArrayI,
378348
eTextureGrad1DU,
379349
eTextureGrad2DU,
380350
eTextureGrad3DU,
381351
eTextureGradCubeU,
382-
eTextureGrad2DRectU,
383352
eTextureGrad1DArrayU,
384353
eTextureGrad2DArrayU,
385354
eTextureGradCubeArrayU,
386355
eTextureGradOffset1DF,
387356
eTextureGradOffset2DF,
388357
eTextureGradOffset3DF,
389-
eTextureGradOffset2DRectF,
390358
eTextureGradOffset1DArrayF,
391359
eTextureGradOffset2DArrayF,
392360
eTextureGradOffset1DI,
393361
eTextureGradOffset2DI,
394362
eTextureGradOffset3DI,
395-
eTextureGradOffset2DRectI,
396363
eTextureGradOffset1DArrayI,
397364
eTextureGradOffset2DArrayI,
398365
eTextureGradOffset1DU,
399366
eTextureGradOffset2DU,
400367
eTextureGradOffset3DU,
401-
eTextureGradOffset2DRectU,
402368
eTextureGradOffset1DArrayU,
403369
eTextureGradOffset2DArrayU,
404370
eTextureProjGrad1DF2,
405371
eTextureProjGrad1DF4,
406372
eTextureProjGrad2DF3,
407373
eTextureProjGrad2DF4,
408374
eTextureProjGrad3DF,
409-
eTextureProjGrad2DRectF3,
410-
eTextureProjGrad2DRectF4,
411375
eTextureProjGrad1DI2,
412376
eTextureProjGrad1DI4,
413377
eTextureProjGrad2DI3,
414378
eTextureProjGrad2DI4,
415379
eTextureProjGrad3DI,
416-
eTextureProjGrad2DRectI3,
417-
eTextureProjGrad2DRectI4,
418380
eTextureProjGrad1DU2,
419381
eTextureProjGrad1DU4,
420382
eTextureProjGrad2DU3,
421383
eTextureProjGrad2DU4,
422384
eTextureProjGrad3DU,
423-
eTextureProjGrad2DRectU3,
424-
eTextureProjGrad2DRectU4,
425385
eTextureProjGradOffset1DF2,
426386
eTextureProjGradOffset1DF4,
427387
eTextureProjGradOffset2DF3,
428388
eTextureProjGradOffset2DF4,
429389
eTextureProjGradOffset3DF,
430-
eTextureProjGradOffset2DRectF3,
431-
eTextureProjGradOffset2DRectF4,
432390
eTextureProjGradOffset1DI2,
433391
eTextureProjGradOffset1DI4,
434392
eTextureProjGradOffset2DI3,
435393
eTextureProjGradOffset2DI4,
436394
eTextureProjGradOffset3DI,
437-
eTextureProjGradOffset2DRectI3,
438-
eTextureProjGradOffset2DRectI4,
439395
eTextureProjGradOffset1DU2,
440396
eTextureProjGradOffset1DU4,
441397
eTextureProjGradOffset2DU3,
442398
eTextureProjGradOffset2DU4,
443399
eTextureProjGradOffset3DU,
444-
eTextureProjGradOffset2DRectU3,
445-
eTextureProjGradOffset2DRectU4,
446400

447401
// Texel Compare Functions
448402
eTexture1DShadowF,
@@ -454,20 +408,17 @@ namespace ast::expr
454408
eTexture1DArrayShadowF,
455409
eTexture1DArrayShadowFBias,
456410
eTexture2DArrayShadowF,
457-
eTexture2DRectShadowF,
458411
eTextureCubeArrayShadowF,
459412
eTextureProj1DShadowF,
460413
eTextureProj1DShadowFBias,
461414
eTextureProj2DShadowF,
462415
eTextureProj2DShadowFBias,
463-
eTextureProj2DRectShadowF,
464416
eTextureLod1DShadowF,
465417
eTextureLod2DShadowF,
466418
eTextureLodCubeShadowF,
467419
eTextureLod1DArrayShadowF,
468420
eTextureLod2DArrayShadowF,
469421
eTextureLodCubeArrayShadowF,
470-
eTextureOffset2DRectShadowF,
471422
eTextureOffset1DShadowF,
472423
eTextureOffset1DShadowFBias,
473424
eTextureOffset2DShadowF,
@@ -478,77 +429,60 @@ namespace ast::expr
478429
eTextureProjOffset1DShadowFBias,
479430
eTextureProjOffset2DShadowF,
480431
eTextureProjOffset2DShadowFBias,
481-
eTextureProjOffset2DRectShadowF,
482432
eTextureLodOffset1DShadowF,
483433
eTextureLodOffset2DShadowF,
484434
eTextureLodOffset1DArrayShadowF,
485435
eTextureProjLod1DShadowF,
486436
eTextureProjLod2DShadowF,
487437
eTextureProjLodOffset1DShadowF,
488438
eTextureProjLodOffset2DShadowF,
489-
eTextureGrad2DRectShadowF,
490439
eTextureGrad1DShadowF,
491440
eTextureGrad2DShadowF,
492441
eTextureGrad1DArrayShadowF,
493-
eTextureGradOffset2DRectShadowF,
494442
eTextureGradOffset1DShadowF,
495443
eTextureGradOffset2DShadowF,
496444
eTextureGradOffset1DArrayShadowF,
497445
eTextureGradOffset2DArrayShadowF,
498446
eTextureProjGrad1DShadowF,
499447
eTextureProjGrad2DShadowF,
500-
eTextureProjGrad2DRectShadowF,
501448
eTextureProjGradOffset1DShadowF,
502449
eTextureProjGradOffset2DShadowF,
503-
eTextureProjGradOffset2DRectShadowF,
504450

505451
// Texture Gather Functions
506452
eTextureGather2DF,
507453
eTextureGather2DArrayF,
508454
eTextureGatherCubeF,
509455
eTextureGatherCubeArrayF,
510-
eTextureGather2DRectF,
511456
eTextureGather2DI,
512457
eTextureGather2DArrayI,
513458
eTextureGatherCubeI,
514459
eTextureGatherCubeArrayI,
515-
eTextureGather2DRectI,
516460
eTextureGather2DU,
517461
eTextureGather2DArrayU,
518462
eTextureGatherCubeU,
519463
eTextureGatherCubeArrayU,
520-
eTextureGather2DRectU,
521464
eTextureGatherOffset2DF,
522465
eTextureGatherOffset2DArrayF,
523-
eTextureGatherOffset2DRectF,
524466
eTextureGatherOffset2DI,
525467
eTextureGatherOffset2DArrayI,
526-
eTextureGatherOffset2DRectI,
527468
eTextureGatherOffset2DU,
528469
eTextureGatherOffset2DArrayU,
529-
eTextureGatherOffset2DRectU,
530470
eTextureGatherOffsets2DF,
531471
eTextureGatherOffsets2DArrayF,
532-
eTextureGatherOffsets2DRectF,
533472
eTextureGatherOffsets2DI,
534473
eTextureGatherOffsets2DArrayI,
535-
eTextureGatherOffsets2DRectI,
536474
eTextureGatherOffsets2DU,
537475
eTextureGatherOffsets2DArrayU,
538-
eTextureGatherOffsets2DRectU,
539476

540477
// Texture Gather Compare Functions
541478
eTextureGather2DShadowF,
542479
eTextureGather2DArrayShadowF,
543480
eTextureGatherCubeShadowF,
544481
eTextureGatherCubeArrayShadowF,
545-
eTextureGather2DRectShadowF,
546482
eTextureGatherOffset2DShadowF,
547483
eTextureGatherOffset2DArrayShadowF,
548-
eTextureGatherOffset2DRectShadowF,
549484
eTextureGatherOffsets2DShadowF,
550485
eTextureGatherOffsets2DArrayShadowF,
551-
eTextureGatherOffsets2DRectShadowF,
552486

553487
// Boundaries,
554488
eCount,

0 commit comments

Comments
 (0)