AuroraMiddleware/SPIRV-Cross
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some bad assumptions about emulating subgroupBarrier

Browse Source
This commit is contained in:
devsh 2020-10-31 21:46:59 +01:00
parent 401af49326
commit 6c5f394b09
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spirv_glsl.cpp
View File

@ -3705,8 +3705,12 @@ void CompilerGLSL::emit_extension_workarounds(spv::ExecutionModel model)
{ {
// Extensions we're using in place of GL_KHR_shader_subgroup_basic state // Extensions we're using in place of GL_KHR_shader_subgroup_basic state
// that subgroup execute in lockstep so this barrier is implicit. // that subgroup execute in lockstep so this barrier is implicit.
// However the GL 4.6 spec also states that `barrier` implies a shared memory barrier,
// and a specific test of optimizing scans by leveraging lock-step invocation execution,
// has shown that a `memoryBarrierShared` is needed in place of a `subgroupBarrier`.
// https://github.com/buildaworldnet/IrrlichtBAW/commit/d8536857991b89a30a6b65d29441e51b64c2c7ad#diff-9f898d27be1ea6fc79b03d9b361e299334c1a347b6e4dc344ee66110c6aa596aR19
statement("#ifndef GL_KHR_shader_subgroup_basic"); statement("#ifndef GL_KHR_shader_subgroup_basic");
statement("void subgroupBarrier() { /*NOOP*/ }"); statement("void subgroupBarrier() { memoryBarrierShared(); }");
statement("#endif"); statement("#endif");
statement(""); statement("");
} }
@ -3718,7 +3722,7 @@ void CompilerGLSL::emit_extension_workarounds(spv::ExecutionModel model)
statement("#ifndef GL_KHR_shader_subgroup_basic"); statement("#ifndef GL_KHR_shader_subgroup_basic");
statement("void subgroupMemoryBarrier() { groupMemoryBarrier(); }"); statement("void subgroupMemoryBarrier() { groupMemoryBarrier(); }");
statement("void subgroupMemoryBarrierBuffer() { groupMemoryBarrier(); }"); statement("void subgroupMemoryBarrierBuffer() { groupMemoryBarrier(); }");
statement("void subgroupMemoryBarrierShared() { groupMemoryBarrier(); }"); statement("void subgroupMemoryBarrierShared() { memoryBarrierShared(); }");
statement("void subgroupMemoryBarrierImage() { groupMemoryBarrier(); }"); statement("void subgroupMemoryBarrierImage() { groupMemoryBarrier(); }");
statement("#endif"); statement("#endif");
} }