summaryrefslogtreecommitdiffstats
path: root/src/shader_recompiler/backend/spirv (follow)
Commit message (Expand)AuthorAgeFilesLines
* emit_spirv: fix incorrect use of descriptor index in image atomicsLiam2023-09-222-13/+9
* shader_recompiler: skip sampler for buffer textures (#11435)liamwhite2023-09-143-6/+2
* shader_recompiler: always declare image format for image buffersLiam2023-09-021-1/+6
* shader_recompiler: fix emulation of 3D textureGradLiam2023-09-021-2/+33
* Remove memory allocations in some hot pathsKelebek12023-06-222-2/+2
* video_core: Enable support_descriptor_aliasing on Turnip, disable storage atomic otherwise.bunnei2023-06-031-0/+10
* Avoid using VectorExtractDynamic for subgroup mask on Adreno GPUsBilly Laws2023-06-031-1/+16
* Implement scaled vertex buffer format emulationBilly Laws2023-06-033-49/+72
* Fix Tears of the Kingdom flickering clouds and depths.Kelebek12023-05-111-6/+2
* Define SampleMask as an arrayKelebek12023-04-302-2/+4
* shader_recompiler: Use vector arithmetic rather than component-wise in ImageGatherSubpixelOffsetWollnashorn2023-04-081-18/+9
* shader_recompiler: Add subpixel offset for correct rounding at `ImageGather`Wollnashorn2023-04-081-0/+39
* spirv: Fix TXQ with MSAA texturesameerj2023-01-293-8/+19
* Merge pull request #9694 from ameerj/txq-mipsliamwhite2023-01-292-3/+6
|\
| * shader_recompiler: TXQ: Skip QueryLevels when possibleameerj2023-01-282-3/+6
* | Merge pull request #9682 from ameerj/shader-s32bunnei2023-01-282-5/+0
|\ \ | |/ |/|
| * shader_recompiler: Remove S32 IR typeameerj2023-01-262-5/+0
* | spirv: fix multisampled image fetchLiam2023-01-232-2/+7
|/
* Run clang-formatBilly Laws2023-01-052-7/+9
* shader_recompiler: Fix shuffle partitioning for >64 invoc-per-subgroup GPUsBilly Laws2023-01-051-30/+28
* shader_recompiler: SPIRV: Only enable int64 feature when supportedBilly Laws2023-01-051-1/+1
* Vulkan: Add a workaround for input_position on Adreno driversBilly Laws2023-01-053-11/+39
* Video_core: Address feedbackFernando Sahmkow2023-01-043-0/+8
* MacroHLE: Add HLE replacement for base vertex and base instance.Fernando Sahmkow2023-01-012-0/+18
* Merge pull request #7450 from FernandoS27/ndc-vulkanliamwhite2022-12-172-3/+4
|\
| * Vulkan: Add support for VK_EXT_depth_clip_control.FernandoS272022-12-142-3/+4
* | spirv_emit_context: declare GroupNonUniform capability for SubgroupLocalInvocationIdLiam2022-12-141-0/+2
|/
* Vulkan: update initializationLiam2022-11-273-19/+31
* spirv_emit_context: add missing flat decorationLiam2022-11-191-0/+1
* Merge pull request #9253 from vonchenplus/attr_layerliamwhite2022-11-192-0/+6
|\
| * shader: Implement miss attribute layerFengChen2022-11-172-0/+6
* | video_core: Fix few issues in Tess stageFengChen2022-11-074-0/+18
|/
* video_core: Fix SNORM texture buffer emulating error (#9001)Feng Chen2022-11-042-1/+6
* video_core: Generate mipmap texture by drawingFengChen2022-09-205-1/+51
* video_code: support rectangle textureFengChen2022-08-252-0/+2
* Add missed shader defines. Fixes Xenoblade Chronicles 3 booting with Vulkan.Kelebek12022-07-291-2/+3
* general: Convert source file copyright comments over to SPDXMorph2022-04-2323-69/+46
* shader_recompiler: support const buffer indirect addressing on OpenGL SPIR-VLiam2022-04-011-10/+11
* Include <bit> header when std::count{r,l}_zero is usedBilly Laws2022-03-223-0/+4
* shader_recompiler: Reduce unused includesameerj2022-03-2016-18/+0
* Address review commentsLiam2022-03-172-19/+7
* shader_recompiler: Use functions for indirect const buffer accessesLiam2022-03-173-39/+91
* Address review commentsLiam2022-03-171-16/+15
* shader: add support for const buffer indirect addressingLiam2022-03-151-10/+41
* emit_spirv, vk_compute_pass: Resolve VS2022 compiler errorsameerj2022-03-121-1/+1
* shaders: Add U64->U32x2 Atomic fallback functionsameerj2022-01-302-1/+148
* spirv_atomic: Define U32x2 storage buffers for 64-bit storage atomicsameerj2022-01-291-2/+2
* emit_spirv: Add Xfb execution mode when transform feedback is usedameerj2022-01-281-3/+9
* shader_recompiler: fix potential OOB accessv19932022-01-171-3/+4
* Merge pull request #7629 from ameerj/nv-driver-fixesFernando S2022-01-032-0/+26
|\
| * shader: Add integer attribute get optimization passameerj2021-12-302-0/+26
* | Empty spacesMatías Locatti2021-12-281-1/+1
* | Changes to avoid warnings in SSE4.2 optimized SPIR-VMatías Locatti2021-12-281-0/+9
|/
* Remove spirv handle legacy related codevonchenplus2021-12-183-189/+0
* emit_spirv: Reduce emit_spirv.h include overheadameerj2021-12-0620-3/+20
* shader_recompiler: Adjust emit_context includesameerj2021-12-062-2/+2
* shader_recompiler: Rename backend emit_context filesameerj2021-12-052-0/+0
* vulkan: Fix rescaling push constant usageameerj2021-11-164-34/+36
* shader, video_core: Fix GCC build errorsameerj2021-11-161-4/+0
* emit_spirv: Fix RescalingLayout alignmentameerj2021-11-161-0/+1
* emit_spirv: Fix RescalingLayout alignmentameerj2021-11-161-2/+2
* shader: Properly scale image reads and add GL SPIR-V supportReinUsesLisp2021-11-166-44/+136
* spirv: Implement rescaling patchingReinUsesLisp2021-11-165-5/+72
* shader: Add IsTextureScaled opcodeReinUsesLisp2021-11-162-0/+5
* shader: Add integer division opcodesReinUsesLisp2021-11-162-0/+10
* shader: Add resolution down factor opcodeReinUsesLisp2021-11-162-0/+6
* Merge pull request #7260 from vonchenplus/spirv_support_legacy_attribute_v2bunnei2021-11-143-71/+153
|\
| * Simply legacy attribute implementFeng Chen2021-11-043-152/+125
| * Support gl_FogFragCoord attributevonchenplus2021-10-313-48/+58
| * Support gl_BackSecondaryColor attributevonchenplus2021-10-263-0/+33
| * Support gl_FrontSecondaryColor attributevonchenplus2021-10-263-0/+33
| * Support gl_BackColor attributevonchenplus2021-10-263-0/+33
* | emit_spirv_image: Fix depth image implicit lod sample in computeameerj2021-10-171-5/+16
|/
* Spir-V: Rescale the frag depth to 0,1 mode when -1,1 mode is used in Vulkan.Fernando Sahmkow2021-09-151-1/+7
* Merge pull request #6948 from ameerj/amd-warp-fixMorph2021-09-121-6/+35
|\
| * emit_spirv_warp: Fix shuffle ops for 64-thread warp sizesameerj2021-08-311-1/+29
| * emit_spirv_warp: Fix ballot related ops for 64-thread warp sizesameerj2021-08-311-10/+11
* | Merge pull request #6962 from vonchenplus/spirv_support_legacy_attributebunnei2021-09-083-0/+107
|\ \ | |/ |/|
| * Detail adjustmentFeng Chen2021-09-081-13/+14
| * Detail adjustmentFeng Chen2021-09-082-28/+35
| * Re-implement get unused locationFeng Chen2021-09-071-30/+30
| * Move attribute related definitions to spirv anonymous namespaceFeng Chen2021-09-072-5/+26
| * Dynamic get unused locationFeng Chen2021-09-061-27/+49
| * Implement intput and output fixed fnc texturesFeng Chen2021-09-063-19/+23
| * Rename parametersFeng Chen2021-09-033-9/+9
| * Fix create GraphicsPipelines crashFeng Chen2021-09-031-5/+5
| * Add input/output locationFeng Chen2021-09-021-5/+13
| * Add colorfront and txtcoord supportFeng Chen2021-08-313-0/+44
* | emit_spirv_context_get_set: Fix Get FrontFace return valueameerj2021-08-271-2/+3
|/
* SPIR-V: Merge two ifs in EmitGetAttributeValeri2021-08-191-6/+2
* emit_spirv_instructions: Add missing header guardLioncash2021-07-261-0/+2
* shader: Fix disabled attribute default valuesameerj2021-07-231-1/+1
* shader_recompiler, video_core: Resolve clang errorslat9nq2021-07-231-5/+10
* shader: Ignore global memory ops on devices lacking int64 supportameerj2021-07-232-7/+31
* emit_spirv: Workaround VK_KHR_shader_float_controls on fp16 NvidiaReinUsesLisp2021-07-231-5/+8
* shader: GCC fmt 8.0.0 fixeslat9nq2021-07-231-2/+3
* shader: Fix disabled and unwritten attributes and varyingsReinUsesLisp2021-07-231-1/+5
* spirv: Fix code emission when descriptor aliasing is unsupportedReinUsesLisp2021-07-231-1/+2
* shader: Rework varyings and implement passthrough geometry shadersReinUsesLisp2021-07-234-50/+70
* shader: Remove IAbs64ReinUsesLisp2021-07-232-5/+0
* shader: Move loop safety tests to code emissionReinUsesLisp2021-07-233-11/+18
* spirv: Properly handle devices without int8 and int16ReinUsesLisp2021-07-232-39/+67
* spirv: Handle small storage buffer loads on devices with no supportReinUsesLisp2021-07-232-6/+6
* shader: Properly manage attributes not written from previous stagesReinUsesLisp2021-07-232-1/+4
* shader: Split profile and runtime info headersReinUsesLisp2021-07-231-0/+1
* spirv: Reduce log severity of mismatching denorm rulesReinUsesLisp2021-07-231-2/+2
* shader: Add loggingReinUsesLisp2021-07-234-11/+11
* shader: Add shader loop safety check settingslat9nq2021-07-232-8/+18
* spirv/convert: Catch more signed operations oversightsameerj2021-07-231-5/+5
* spirv/convert: Catch more broken signed operations on Nvidia OpenGLReinUsesLisp2021-07-231-0/+6
* shader: Add support for "negative" and unaligned offsetsReinUsesLisp2021-07-231-6/+3
* spirv: Fix output generics with componentsReinUsesLisp2021-07-231-1/+1
* opengl: Declare fragment outputs even if they are not usedReinUsesLisp2021-07-231-1/+1
* spirv: Fix image and image buffer descriptor index usageReinUsesLisp2021-07-231-5/+7
* shader: Split profile and runtime information in separate structsReinUsesLisp2021-07-236-33/+42
* shader: Read branch conditions from an instructionReinUsesLisp2021-07-232-2/+11
* glasm: Implement TEX and TEXS instructionsReinUsesLisp2021-07-232-6/+6
* shader_recompiler: GCC fixeslat9nq2021-07-231-16/+16
* emit_spirv: Jump to loop body with local variableReinUsesLisp2021-07-231-1/+1
* emit_spirv: Add missing block in caseReinUsesLisp2021-07-231-1/+2
* glasm: Initial implementation of phi nodes on GLASMReinUsesLisp2021-07-232-2/+7
* glasm: Rework control flow introducing a syntax listReinUsesLisp2021-07-235-49/+74
* glasm: Implement shuffle and vote instructions on GLASMReinUsesLisp2021-07-232-2/+4
* shader: Fixup SPIR-V emit header namespacesReinUsesLisp2021-07-231-2/+2
* Move SPIR-V emission functions to their own headerReinUsesLisp2021-07-2322-572/+610
* shader: Optimize NVN FallthroughFernandoS272021-07-231-0/+3
* shader: Implement Int32 SUATOM/SUREDameerj2021-07-235-0/+233
* spirv: Be aware of NAN unaware driversReinUsesLisp2021-07-231-18/+40
* spirv: Add SSBO read fallbacks when no aliasing is availableReinUsesLisp2021-07-231-37/+99
* spirv: Add OpKill fallback to demoteReinUsesLisp2021-07-231-2/+6
* spirv: Do not enable ShaderLayerReinUsesLisp2021-07-231-3/+0
* spirv: Enable DemoteToHelperInvocationEXT only when supportedReinUsesLisp2021-07-231-1/+1
* spirv: Use OriginLowerLeft when requestedReinUsesLisp2021-07-231-1/+5
* spirv: Only add image operands mask when neededReinUsesLisp2021-07-231-5/+9
* spirv: Workaround image unsigned offset bugReinUsesLisp2021-07-232-9/+26
* spirv: Add int8 and int16 capabilities only when supportedReinUsesLisp2021-07-231-2/+2
* spirv: Add integer clamping workaroundsReinUsesLisp2021-07-231-4/+34
* spirv: Implement int8 and int16 conversion fallbacksReinUsesLisp2021-07-231-19/+80
* spirv: Support OpenGL uniform buffers and change bindingsReinUsesLisp2021-07-235-56/+163
* spirv: Desambiguate descriptor namesReinUsesLisp2021-07-231-9/+37
* shader: Implement VertexA stageFernandoS272021-07-232-0/+5
* shader: Fix storage type when reading patches on tess controlReinUsesLisp2021-07-231-1/+2
* shader: Implement indexed texturesReinUsesLisp2021-07-233-56/+92
* shader: Move microinstruction header to the value headerReinUsesLisp2021-07-232-2/+0
* shader: Add NVN storage buffer fallbacksReinUsesLisp2021-07-235-24/+109
* spirv: Fix ViewportMaskReinUsesLisp2021-07-231-1/+2
* spirv: Replace Constant/ConstantComposite with Const helperameerj2021-07-2312-112/+101
* shader: Address feedbackFernandoS272021-07-232-5/+2
* shader: Add coarse derivativesFernandoS272021-07-232-0/+12
* shader: Implement fine derivates constant propagationFernandoS272021-07-233-0/+15
* shader: Implement SR_Y_DIRECTIONFernandoS272021-07-232-0/+8
* shader: Fix memory barriersReinUsesLisp2021-07-232-12/+7
* spirv: Fix implicit lod typeReinUsesLisp2021-07-232-1/+5
* spirv: Use explicit lods outside of fragment shadersReinUsesLisp2021-07-231-5/+16
* spirv: Use ConstOffset instead of Offset when possibleReinUsesLisp2021-07-233-21/+67
* shader: Implement BFE and BFI CCameerj2021-07-231-2/+1
* shader: Implement SampleMaskReinUsesLisp2021-07-234-1/+10
* shader: Implement PIXLD.MY_INDEXReinUsesLisp2021-07-235-0/+12
* spirv: Bitcast non-F32 output attributes to their type before storeReinUsesLisp2021-07-231-13/+28
* spirv: Implement ViewportMask with NV_viewport_array2ReinUsesLisp2021-07-234-0/+15
* spirv: Bitcast non-F32 attributes to F32ReinUsesLisp2021-07-231-7/+9
* shader: Implement PrimitiveIdReinUsesLisp2021-07-233-0/+6
* shader: Implement tessellation shaders, polygon mode and invocation idReinUsesLisp2021-07-235-55/+232
* spirv: Implement image buffersReinUsesLisp2021-07-233-22/+58
* spirv: Implement Layer storesReinUsesLisp2021-07-234-9/+26
* spirv: Fix alpha testFernandoS272021-07-231-0/+5
* spirv: Fix non-atomic 64-bit storeameerj2021-07-231-1/+1
* spirv: Implement alpha testameerj2021-07-231-0/+45
* shader: Implement transform feedbacks and define file formatReinUsesLisp2021-07-235-16/+97
* shader: Implement early Z testsReinUsesLisp2021-07-231-0/+3
* spirv: Rework storage buffers and shader memoryReinUsesLisp2021-07-236-492/+487
* shader: Fix fixed pipeline point size on geometry shadersReinUsesLisp2021-07-231-10/+18
* shader: Implement geometry shadersReinUsesLisp2021-07-235-65/+163
* shader: Implement OUTReinUsesLisp2021-07-232-0/+10
* spirv: Define StorageImageWriteWithoutFormat capability when usedReinUsesLisp2021-07-231-0/+3
* shader: Implement LOP CCReinUsesLisp2021-07-232-9/+18
* shader: Implement SR_THREAD_KILLReinUsesLisp2021-07-234-0/+9
* shader: Implement ATOM/S and REDameerj2021-07-235-4/+800
* spirv: Move phi node patching to a separate functionReinUsesLisp2021-07-231-13/+16
* spirv: Guard against typeless image reads on unsupported devicesReinUsesLisp2021-07-232-1/+7
* shader: Move LaneId to the warp emission file and fix AMDReinUsesLisp2021-07-233-5/+9
* spirv: Fix forward declarations on phi nodesReinUsesLisp2021-07-231-47/+25
* shader: Implement SULD and SUSTReinUsesLisp2021-07-235-29/+130
* shader: Address feedback + clang formatlat9nq2021-07-232-5/+0
* shader_recompiler,video_core: Cleanup some GCC and Clang errorslat9nq2021-07-234-14/+22
* shader: Interact texture buffers with buffer cacheReinUsesLisp2021-07-232-28/+28
* shader: Fix TextureGradReinUsesLisp2021-07-231-1/+1
* shader: Implement texture buffersReinUsesLisp2021-07-234-5/+54
* shader: Address feedbackFernandoS272021-07-231-20/+20
* shader: Implement indexed Position and ClipDistancesFernandoS272021-07-231-0/+40
* shader: Implement indexed attributesFernandoS272021-07-234-6/+134
* shader: Fix ShadowCube declaration type, set number of pipeline threads based on hardwareFernandoS272021-07-231-1/+1
* shader: Add subgroup masksReinUsesLisp2021-07-234-10/+56
* shader: Implement BAR and fix memory barriersReinUsesLisp2021-07-232-3/+13
* shader: Reimplement GetCbufU64 as GetCbufU32x2ReinUsesLisp2021-07-234-6/+6
* shader: Address FeedbackFernandoS272021-07-236-71/+26
* shader: Implement SR_LaneIdFernandoS272021-07-232-0/+5
* shader: Fix shared memory on cool driversFernandoS272021-07-231-0/+1
* shader: Implement MEMBARFernandoS272021-07-232-0/+41
* shader: Improve VOTE.VTG stubFernandoS272021-07-232-0/+40
* shader: Implement ViewportIndexFernandoS272021-07-234-2/+27
* shader: Stub TLD4's PTP when it isn't constantFernandoS272021-07-231-1/+2
* shader: Fix branches to visited virtual blocksReinUsesLisp2021-07-231-0/+2
* shader: Fix dependency on identity removal passReinUsesLisp2021-07-232-3/+8
* spirv: Remove unnecesary variable for clip distancesReinUsesLisp2021-07-232-6/+2
* shader: Implement ClipDistanceFernandoS272021-07-233-0/+25
* shader: Fix TXDFernandoS272021-07-231-1/+1
* shader: Address feedbackFernandoS272021-07-231-15/+15
* shader: Implement ImageGradientFernandoS272021-07-232-1/+54
* shader: Implement TMML partiallyFernandoS272021-07-231-2/+2
* shader,spirv: Implement ImageQueryLod.FernandoS272021-07-234-0/+20
* shader: Implement TLDFernandoS272021-07-231-1/+1
* spirv: Add fixed pipeline point sizeReinUsesLisp2021-07-232-1/+5
* shader: Add PointCoord attributeFernandoS272021-07-233-0/+11
* shader: Add PointSize attributeameerj2021-07-233-0/+9
* shader: Store type of phi nodes in flagsReinUsesLisp2021-07-231-1/+2
* spirv: Fix default output attribute initializationReinUsesLisp2021-07-231-3/+3
* shader: Implement FSWZADDameerj2021-07-234-0/+27
* shader: Implement BRXFernandoS272021-07-233-2/+15
* shader: Implement I2I CCameerj2021-07-232-21/+41
* shader: Implement I2I SATameerj2021-07-232-0/+10
* shader: Implement LDS, STS, LDL, and STS and use SPIR-V 1.4 when availableReinUsesLisp2021-07-235-1/+334
* shader: Better interpolation and disabled attributes supportReinUsesLisp2021-07-232-12/+46
* spirv: Remove dependencies on Environment when generating SPIR-VReinUsesLisp2021-07-232-9/+7
* shader: Implement front faceReinUsesLisp2021-07-233-0/+8
* shader: Implement TXQ and fix FragDepthReinUsesLisp2021-07-235-8/+64
* shader: Refactor PTP and other minor changesReinUsesLisp2021-07-235-56/+46
* shader: Add IR opcode for ImageFetchFernandoS272021-07-233-3/+35
* shader: Implement TLD4.PTPFernandoS272021-07-235-9/+40
* shader: Implement FragDepthFernandoS272021-07-231-0/+6
* shader: Implement TLD4 and TLD4_BFernandoS272021-07-232-0/+48
* shader: Implement SHFLameerj2021-07-235-60/+151
* shader: Fix F2IFernandoS272021-07-232-4/+19
* shader: Implement NDC [-1, 1], attribute types and default varying initializationReinUsesLisp2021-07-235-39/+112
* shader: Implement VOTEameerj2021-07-235-1/+77
* shader: Implement DMNMX, DSET, DSETPameerj2021-07-233-18/+26
* shader: Add support for fp16 comparisons and misc fixesReinUsesLisp2021-07-232-0/+10
* spirv: Implement VertexId and InstanceId, refactor codeReinUsesLisp2021-07-236-144/+234
* shader: Implement I2FReinUsesLisp2021-07-234-0/+67
* shader: Add partial rasterizer integrationReinUsesLisp2021-07-236-50/+172
* shader: Implement DADDameerj2021-07-231-0/+2
* shader: Implement FSET and FSETPameerj2021-07-231-2/+4
* shader: Implement TEXSReinUsesLisp2021-07-231-1/+10
* shader: Implement CAL inlining function callsReinUsesLisp2021-07-232-15/+8
* spirv: Add SignedZeroInfNanPreserve logicameerj2021-07-231-0/+6
* shader: Implement FMNMXameerj2021-07-232-12/+12
* shader: Implement FCMPameerj2021-07-232-0/+5
* shader: Partial implementation of LDCReinUsesLisp2021-07-234-25/+124
* shader: Initial support for textures and TEXReinUsesLisp2021-07-237-5/+327
* shader: Implement R2Pameerj2021-07-233-3/+13
* shader: Implement SHFameerj2021-07-232-9/+19
* shader: Implement LEAameerj2021-07-233-3/+13
* shader: Implement HADD2ReinUsesLisp2021-07-233-18/+98
* shader: Implement FLOameerj2021-07-232-3/+13
* shader: Implement IMNMXameerj2021-07-232-0/+20
* shader: Implement POPCameerj2021-07-232-0/+10
* shader: Implement SHRameerj2021-07-232-6/+11
* spirv: Move phi arguments emit to a separate functionReinUsesLisp2021-07-231-27/+27
* spirv: Add support for self-referencing phi nodesReinUsesLisp2021-07-231-3/+10
* shader: Implement more of XMAD and FFMA32I and fix XMAD.CBCCReinUsesLisp2021-07-232-6/+6
* shader: FMUL, select, RRO, and MUFU fixesReinUsesLisp2021-07-233-52/+228
* shader: Fix MOV(reg), add SHL variants and emit neg and abs instructionsReinUsesLisp2021-07-232-6/+6
* spirv: Fixes and Intel specific workaroundsReinUsesLisp2021-07-236-20/+31
* shader: Rename, implement FADD.SAT and P2R (imm)ReinUsesLisp2021-07-234-79/+98
* shader: Add denorm flush supportReinUsesLisp2021-07-233-9/+64
* spirv: Add lower fp16 to fp32 passReinUsesLisp2021-07-2312-210/+255
* shader: Primitive Vulkan integrationReinUsesLisp2021-07-2313-467/+461
* spirv: Implement EmitIdentityReinUsesLisp2021-07-232-3/+3
* spirv: Initial bindings supportReinUsesLisp2021-07-2312-218/+408
* shader: Add support for forward declarationsReinUsesLisp2021-07-232-52/+49
* shader: Support SSA loops on IRReinUsesLisp2021-07-233-15/+15
* shader: Misc fixesReinUsesLisp2021-07-232-0/+11
* shader: Initial implementation of an ASTReinUsesLisp2021-07-235-41/+67
* spirv: Initial SPIR-V supportReinUsesLisp2021-07-2312-3/+1359
* shader: Add pools and rename filesReinUsesLisp2021-07-231-0/+21