AuroraMiddleware/glslang
1
0
Fork 0
mirror of https://github.com/KhronosGroup/glslang synced 2024-09-19 12:19:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2688 from KhronosGroup/revert-2643-master

Browse Source 
Revert "Atomic memory function can only be used for shader storage block member or shared variable."
This commit is contained in:
Greg Fischer 2021-07-08 15:15:55 -06:00 committed by GitHub
commit 4b7b86d568
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 0 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Test/atomicAdd.comp
View File

@ -1,19 +0,0 @@
#version 320 es
layout(local_size_x = 1) in;
struct structType{
int y[3];
};
layout(std430) buffer t2 {
structType f;
} t;
buffer coherent Buffer { int x; };
int z;
void main() {
atomicAdd(x, 1);
atomicAdd(t.f.y[1], 1);
atomicAdd(z, 1);
}

87
Test/baseResults/atomicAdd.comp.out
View File

@ -1,87 +0,0 @@
atomicAdd.comp
ERROR: 0:18: 'atomicAdd' : Atomic memory function can only be used for shader storage block member or shared variable.
ERROR: 1 compilation errors. No code generated.
Shader version: 320
local_size = (1, 1, 1)
ERROR: node is still EOpNull!
0:15 Function Definition: main( ( global void)
0:15 Function Parameters:
0:16 Sequence
0:16 AtomicAdd ( global highp int)
0:16 x: direct index for structure (layout( column_major shared) coherent buffer highp int)
0:16 'anon@0' (layout( column_major shared) coherent buffer block{layout( column_major shared) coherent buffer highp int x})
0:16 Constant:
0:16 0 (const uint)
0:16 Constant:
0:16 1 (const int)
0:17 AtomicAdd ( global highp int)
0:17 direct index (layout( std430) temp highp int)
0:17 y: direct index for structure (layout( std430) global 3-element array of highp int)
0:17 f: direct index for structure (layout( column_major std430 offset=0) buffer structure{layout( std430) global 3-element array of highp int y})
0:17 't' (layout( column_major std430) buffer block{layout( column_major std430 offset=0) buffer structure{layout( std430) global 3-element array of highp int y} f})
0:17 Constant:
0:17 0 (const int)
0:17 Constant:
0:17 0 (const int)
0:17 Constant:
0:17 1 (const int)
0:17 Constant:
0:17 1 (const int)
0:18 AtomicAdd ( global highp int)
0:18 'z' ( global highp int)
0:18 Constant:
0:18 1 (const int)
0:? Linker Objects
0:? 'gl_WorkGroupSize' ( const highp 3-component vector of uint WorkGroupSize)
0:? 1 (const uint)
0:? 1 (const uint)
0:? 1 (const uint)
0:? 't' (layout( column_major std430) buffer block{layout( column_major std430 offset=0) buffer structure{layout( std430) global 3-element array of highp int y} f})
0:? 'anon@0' (layout( column_major shared) coherent buffer block{layout( column_major shared) coherent buffer highp int x})
0:? 'z' ( global highp int)
Linked compute stage:
Shader version: 320
local_size = (1, 1, 1)
ERROR: node is still EOpNull!
0:15 Function Definition: main( ( global void)
0:15 Function Parameters:
0:16 Sequence
0:16 AtomicAdd ( global highp int)
0:16 x: direct index for structure (layout( column_major shared) coherent buffer highp int)
0:16 'anon@0' (layout( column_major shared) coherent buffer block{layout( column_major shared) coherent buffer highp int x})
0:16 Constant:
0:16 0 (const uint)
0:16 Constant:
0:16 1 (const int)
0:17 AtomicAdd ( global highp int)
0:17 direct index (layout( std430) temp highp int)
0:17 y: direct index for structure (layout( std430) global 3-element array of highp int)
0:17 f: direct index for structure (layout( column_major std430 offset=0) buffer structure{layout( std430) global 3-element array of highp int y})
0:17 't' (layout( column_major std430) buffer block{layout( column_major std430 offset=0) buffer structure{layout( std430) global 3-element array of highp int y} f})
0:17 Constant:
0:17 0 (const int)
0:17 Constant:
0:17 0 (const int)
0:17 Constant:
0:17 1 (const int)
0:17 Constant:
0:17 1 (const int)
0:18 AtomicAdd ( global highp int)
0:18 'z' ( global highp int)
0:18 Constant:
0:18 1 (const int)
0:? Linker Objects
0:? 'gl_WorkGroupSize' ( const highp 3-component vector of uint WorkGroupSize)
0:? 1 (const uint)
0:? 1 (const uint)
0:? 1 (const uint)
0:? 't' (layout( column_major std430) buffer block{layout( column_major std430 offset=0) buffer structure{layout( std430) global 3-element array of highp int y} f})
0:? 'anon@0' (layout( column_major shared) coherent buffer block{layout( column_major shared) coherent buffer highp int x})
0:? 'z' ( global highp int)

6
glslang/MachineIndependent/ParseHelper.cpp
View File

@ -2409,12 +2409,6 @@ void TParseContext::builtInOpCheck(const TSourceLoc& loc, const TFunction& fnCan
arg0->getType().isFloatingDomain()) {
requireExtensions(loc, 1, &E_GL_EXT_shader_atomic_float2, fnCandidate.getName().c_str());
}
const TIntermTyped* base = TIntermediate::findLValueBase(arg0, true);
const TQualifier& qualifier = base->getType().getQualifier();
if (qualifier.storage != EvqShared && qualifier.storage != EvqBuffer)
error(loc,"Atomic memory function can only be used for shader storage block member or shared variable.", fnCandidate.getName().c_str(), "");
break;
}

1
gtests/AST.FromFile.cpp
View File

@ -282,7 +282,6 @@ INSTANTIATE_TEST_SUITE_P(
"terminate.vert",
"negativeWorkGroupSize.comp",
"textureoffset_sampler2darrayshadow.vert",
"atomicAdd.comp",
})),
FileNameAsCustomTestSuffix
);