mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Modify atomic_uint binding check

Browse Source 
Modify atomic_uint binding check.

Currently, when not declared with offset, default atomic_unint won't check whether its binding is valid or not more than its limit value.
This commit is contained in:
Chow 2019-12-25 17:08:48 +08:00
parent bd97b6f9f2
commit 891ec09c62
3 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Test/450.comp
View File

@ -1,5 +1,8 @@
#version 450 core #version 450 core
layout(local_size_x = 0) in; // ERROR, 0 not allowed layout(local_size_x = 0) in; // ERROR, 0 not allowed
layout(binding=10000) uniform atomic_uint; // ERROR
void main() void main()
{ {
shared float f; // ERROR shared must be global shared float f; // ERROR shared must be global

13
Test/baseResults/450.comp.out
View File

@ -1,14 +1,15 @@
450.comp 450.comp
ERROR: 0:2: 'local_size_x' : must be at least 1 ERROR: 0:2: 'local_size_x' : must be at least 1
ERROR: 0:5: 'shared' : not allowed in nested scope ERROR: 0:4: 'binding' : atomic_uint binding is too large
ERROR: 2 compilation errors. No code generated. ERROR: 0:8: 'shared' : not allowed in nested scope
ERROR: 3 compilation errors. No code generated.
Shader version: 450 Shader version: 450
local_size = (1, 1, 1) local_size = (1, 1, 1)
ERROR: node is still EOpNull! ERROR: node is still EOpNull!
0:3 Function Definition: main( ( global void) 0:6 Function Definition: main( ( global void)
0:3 Function Parameters: 0:6 Function Parameters:
0:? Linker Objects 0:? Linker Objects
@ -18,7 +19,7 @@ Linked compute stage:
Shader version: 450 Shader version: 450
local_size = (1, 1, 1) local_size = (1, 1, 1)
ERROR: node is still EOpNull! ERROR: node is still EOpNull!
0:3 Function Definition: main( ( global void) 0:6 Function Definition: main( ( global void)
0:3 Function Parameters: 0:6 Function Parameters:
0:? Linker Objects 0:? Linker Objects

6
glslang/MachineIndependent/ParseHelper.cpp
View File

@ -6380,13 +6380,15 @@ const TFunction* TParseContext::findFunctionExplicitTypes(const TSourceLoc& loc,
void TParseContext::declareTypeDefaults(const TSourceLoc& loc, const TPublicType& publicType) void TParseContext::declareTypeDefaults(const TSourceLoc& loc, const TPublicType& publicType)
{ {
#ifndef GLSLANG_WEB #ifndef GLSLANG_WEB
if (publicType.basicType == EbtAtomicUint && publicType.qualifier.hasBinding() && if (publicType.basicType == EbtAtomicUint && publicType.qualifier.hasBinding()) {
publicType.qualifier.hasOffset()) {
if (publicType.qualifier.layoutBinding >= (unsigned int)resources.maxAtomicCounterBindings) { if (publicType.qualifier.layoutBinding >= (unsigned int)resources.maxAtomicCounterBindings) {
error(loc, "atomic_uint binding is too large", "binding", ""); error(loc, "atomic_uint binding is too large", "binding", "");
return; return;
} }
if(publicType.qualifier.hasOffset()) {
atomicUintOffsets[publicType.qualifier.layoutBinding] = publicType.qualifier.layoutOffset; atomicUintOffsets[publicType.qualifier.layoutBinding] = publicType.qualifier.layoutOffset;
}
return; return;
} }