Skip to content

G
glslang
Unverified Commit e08ed0cc by John Kessenich Committed by GitHub
Options

Merge pull request #1190 from jfmarquis/hlsl-store-type-propagation

HLSL: Fix possibly incorrect type conversion in Store2-3-4
parents 848a0ccb 3f0aff8e
Showing with 37 additions and 25 deletions
Test/baseResults/hlsl.structbuffer.byte.frag.out
...@@ -41,13 +41,13 @@ gl_FragCoord origin is upper left ...@@ -41,13 +41,13 @@ gl_FragCoord origin is upper left
0:10 Constant: 0:10 Constant:
0:10 2 (const int) 0:10 2 (const int)
0:? Construct vec2 ( temp 2-component vector of uint) 0:? Construct vec2 ( temp 2-component vector of uint)
0:10 indirect index ( temp float) 0:10 indirect index ( temp uint)
0:10 @data: direct index for structure (layout( row_major std430) buffer implicitly-sized array of uint) 0:10 @data: direct index for structure (layout( row_major std430) buffer implicitly-sized array of uint)
0:10 'sbuf' (layout( row_major std430) readonly buffer block{layout( row_major std430) buffer implicitly-sized array of uint @data}) 0:10 'sbuf' (layout( row_major std430) readonly buffer block{layout( row_major std430) buffer implicitly-sized array of uint @data})
0:10 Constant: 0:10 Constant:
0:10 0 (const uint) 0:10 0 (const uint)
0:10 'byteAddrTemp' ( temp int) 0:10 'byteAddrTemp' ( temp int)
0:10 indirect index ( temp float) 0:10 indirect index ( temp uint)
0:10 @data: direct index for structure (layout( row_major std430) buffer implicitly-sized array of uint) 0:10 @data: direct index for structure (layout( row_major std430) buffer implicitly-sized array of uint)
0:10 'sbuf' (layout( row_major std430) readonly buffer block{layout( row_major std430) buffer implicitly-sized array of uint @data}) 0:10 'sbuf' (layout( row_major std430) readonly buffer block{layout( row_major std430) buffer implicitly-sized array of uint @data})
0:10 Constant: 0:10 Constant:
...@@ -73,13 +73,13 @@ gl_FragCoord origin is upper left ...@@ -73,13 +73,13 @@ gl_FragCoord origin is upper left
0:11 Constant: 0:11 Constant:
0:11 2 (const int) 0:11 2 (const int)
0:? Construct vec3 ( temp 3-component vector of uint) 0:? Construct vec3 ( temp 3-component vector of uint)
0:11 indirect index ( temp float) 0:11 indirect index ( temp uint)
0:11 @data: direct index for structure (layout( row_major std430) buffer implicitly-sized array of uint) 0:11 @data: direct index for structure (layout( row_major std430) buffer implicitly-sized array of uint)
0:11 'sbuf' (layout( row_major std430) readonly buffer block{layout( row_major std430) buffer implicitly-sized array of uint @data}) 0:11 'sbuf' (layout( row_major std430) readonly buffer block{layout( row_major std430) buffer implicitly-sized array of uint @data})
0:11 Constant: 0:11 Constant:
0:11 0 (const uint) 0:11 0 (const uint)
0:11 'byteAddrTemp' ( temp int) 0:11 'byteAddrTemp' ( temp int)
0:11 indirect index ( temp float) 0:11 indirect index ( temp uint)
0:11 @data: direct index for structure (layout( row_major std430) buffer implicitly-sized array of uint) 0:11 @data: direct index for structure (layout( row_major std430) buffer implicitly-sized array of uint)
0:11 'sbuf' (layout( row_major std430) readonly buffer block{layout( row_major std430) buffer implicitly-sized array of uint @data}) 0:11 'sbuf' (layout( row_major std430) readonly buffer block{layout( row_major std430) buffer implicitly-sized array of uint @data})
0:11 Constant: 0:11 Constant:
...@@ -88,7 +88,7 @@ gl_FragCoord origin is upper left ...@@ -88,7 +88,7 @@ gl_FragCoord origin is upper left
0:11 'byteAddrTemp' ( temp int) 0:11 'byteAddrTemp' ( temp int)
0:11 Constant: 0:11 Constant:
0:11 1 (const int) 0:11 1 (const int)
0:11 indirect index ( temp float) 0:11 indirect index ( temp uint)
0:11 @data: direct index for structure (layout( row_major std430) buffer implicitly-sized array of uint) 0:11 @data: direct index for structure (layout( row_major std430) buffer implicitly-sized array of uint)
0:11 'sbuf' (layout( row_major std430) readonly buffer block{layout( row_major std430) buffer implicitly-sized array of uint @data}) 0:11 'sbuf' (layout( row_major std430) readonly buffer block{layout( row_major std430) buffer implicitly-sized array of uint @data})
0:11 Constant: 0:11 Constant:
...@@ -111,13 +111,13 @@ gl_FragCoord origin is upper left ...@@ -111,13 +111,13 @@ gl_FragCoord origin is upper left
0:12 Constant: 0:12 Constant:
0:12 2 (const int) 0:12 2 (const int)
0:? Construct vec4 ( temp 4-component vector of uint) 0:? Construct vec4 ( temp 4-component vector of uint)
0:12 indirect index ( temp float) 0:12 indirect index ( temp uint)
0:12 @data: direct index for structure (layout( row_major std430) buffer implicitly-sized array of uint) 0:12 @data: direct index for structure (layout( row_major std430) buffer implicitly-sized array of uint)
0:12 'sbuf' (layout( row_major std430) readonly buffer block{layout( row_major std430) buffer implicitly-sized array of uint @data}) 0:12 'sbuf' (layout( row_major std430) readonly buffer block{layout( row_major std430) buffer implicitly-sized array of uint @data})
0:12 Constant: 0:12 Constant:
0:12 0 (const uint) 0:12 0 (const uint)
0:12 'byteAddrTemp' ( temp int) 0:12 'byteAddrTemp' ( temp int)
0:12 indirect index ( temp float) 0:12 indirect index ( temp uint)
0:12 @data: direct index for structure (layout( row_major std430) buffer implicitly-sized array of uint) 0:12 @data: direct index for structure (layout( row_major std430) buffer implicitly-sized array of uint)
0:12 'sbuf' (layout( row_major std430) readonly buffer block{layout( row_major std430) buffer implicitly-sized array of uint @data}) 0:12 'sbuf' (layout( row_major std430) readonly buffer block{layout( row_major std430) buffer implicitly-sized array of uint @data})
0:12 Constant: 0:12 Constant:
...@@ -126,7 +126,7 @@ gl_FragCoord origin is upper left ...@@ -126,7 +126,7 @@ gl_FragCoord origin is upper left
0:12 'byteAddrTemp' ( temp int) 0:12 'byteAddrTemp' ( temp int)
0:12 Constant: 0:12 Constant:
0:12 1 (const int) 0:12 1 (const int)
0:12 indirect index ( temp float) 0:12 indirect index ( temp uint)
0:12 @data: direct index for structure (layout( row_major std430) buffer implicitly-sized array of uint) 0:12 @data: direct index for structure (layout( row_major std430) buffer implicitly-sized array of uint)
0:12 'sbuf' (layout( row_major std430) readonly buffer block{layout( row_major std430) buffer implicitly-sized array of uint @data}) 0:12 'sbuf' (layout( row_major std430) readonly buffer block{layout( row_major std430) buffer implicitly-sized array of uint @data})
0:12 Constant: 0:12 Constant:
...@@ -135,7 +135,7 @@ gl_FragCoord origin is upper left ...@@ -135,7 +135,7 @@ gl_FragCoord origin is upper left
0:12 'byteAddrTemp' ( temp int) 0:12 'byteAddrTemp' ( temp int)
0:12 Constant: 0:12 Constant:
0:12 2 (const int) 0:12 2 (const int)
0:12 indirect index ( temp float) 0:12 indirect index ( temp uint)
0:12 @data: direct index for structure (layout( row_major std430) buffer implicitly-sized array of uint) 0:12 @data: direct index for structure (layout( row_major std430) buffer implicitly-sized array of uint)
0:12 'sbuf' (layout( row_major std430) readonly buffer block{layout( row_major std430) buffer implicitly-sized array of uint @data}) 0:12 'sbuf' (layout( row_major std430) readonly buffer block{layout( row_major std430) buffer implicitly-sized array of uint @data})
0:12 Constant: 0:12 Constant:
...@@ -205,13 +205,13 @@ gl_FragCoord origin is upper left ...@@ -205,13 +205,13 @@ gl_FragCoord origin is upper left
0:10 Constant: 0:10 Constant:
0:10 2 (const int) 0:10 2 (const int)
0:? Construct vec2 ( temp 2-component vector of uint) 0:? Construct vec2 ( temp 2-component vector of uint)
0:10 indirect index ( temp float) 0:10 indirect index ( temp uint)
0:10 @data: direct index for structure (layout( row_major std430) buffer implicitly-sized array of uint) 0:10 @data: direct index for structure (layout( row_major std430) buffer implicitly-sized array of uint)
0:10 'sbuf' (layout( row_major std430) readonly buffer block{layout( row_major std430) buffer implicitly-sized array of uint @data}) 0:10 'sbuf' (layout( row_major std430) readonly buffer block{layout( row_major std430) buffer implicitly-sized array of uint @data})
0:10 Constant: 0:10 Constant:
0:10 0 (const uint) 0:10 0 (const uint)
0:10 'byteAddrTemp' ( temp int) 0:10 'byteAddrTemp' ( temp int)
0:10 indirect index ( temp float) 0:10 indirect index ( temp uint)
0:10 @data: direct index for structure (layout( row_major std430) buffer implicitly-sized array of uint) 0:10 @data: direct index for structure (layout( row_major std430) buffer implicitly-sized array of uint)
0:10 'sbuf' (layout( row_major std430) readonly buffer block{layout( row_major std430) buffer implicitly-sized array of uint @data}) 0:10 'sbuf' (layout( row_major std430) readonly buffer block{layout( row_major std430) buffer implicitly-sized array of uint @data})
0:10 Constant: 0:10 Constant:
...@@ -237,13 +237,13 @@ gl_FragCoord origin is upper left ...@@ -237,13 +237,13 @@ gl_FragCoord origin is upper left
0:11 Constant: 0:11 Constant:
0:11 2 (const int) 0:11 2 (const int)
0:? Construct vec3 ( temp 3-component vector of uint) 0:? Construct vec3 ( temp 3-component vector of uint)
0:11 indirect index ( temp float) 0:11 indirect index ( temp uint)
0:11 @data: direct index for structure (layout( row_major std430) buffer implicitly-sized array of uint) 0:11 @data: direct index for structure (layout( row_major std430) buffer implicitly-sized array of uint)
0:11 'sbuf' (layout( row_major std430) readonly buffer block{layout( row_major std430) buffer implicitly-sized array of uint @data}) 0:11 'sbuf' (layout( row_major std430) readonly buffer block{layout( row_major std430) buffer implicitly-sized array of uint @data})
0:11 Constant: 0:11 Constant:
0:11 0 (const uint) 0:11 0 (const uint)
0:11 'byteAddrTemp' ( temp int) 0:11 'byteAddrTemp' ( temp int)
0:11 indirect index ( temp float) 0:11 indirect index ( temp uint)
0:11 @data: direct index for structure (layout( row_major std430) buffer implicitly-sized array of uint) 0:11 @data: direct index for structure (layout( row_major std430) buffer implicitly-sized array of uint)
0:11 'sbuf' (layout( row_major std430) readonly buffer block{layout( row_major std430) buffer implicitly-sized array of uint @data}) 0:11 'sbuf' (layout( row_major std430) readonly buffer block{layout( row_major std430) buffer implicitly-sized array of uint @data})
0:11 Constant: 0:11 Constant:
...@@ -252,7 +252,7 @@ gl_FragCoord origin is upper left ...@@ -252,7 +252,7 @@ gl_FragCoord origin is upper left
0:11 'byteAddrTemp' ( temp int) 0:11 'byteAddrTemp' ( temp int)
0:11 Constant: 0:11 Constant:
0:11 1 (const int) 0:11 1 (const int)
0:11 indirect index ( temp float) 0:11 indirect index ( temp uint)
0:11 @data: direct index for structure (layout( row_major std430) buffer implicitly-sized array of uint) 0:11 @data: direct index for structure (layout( row_major std430) buffer implicitly-sized array of uint)
0:11 'sbuf' (layout( row_major std430) readonly buffer block{layout( row_major std430) buffer implicitly-sized array of uint @data}) 0:11 'sbuf' (layout( row_major std430) readonly buffer block{layout( row_major std430) buffer implicitly-sized array of uint @data})
0:11 Constant: 0:11 Constant:
...@@ -275,13 +275,13 @@ gl_FragCoord origin is upper left ...@@ -275,13 +275,13 @@ gl_FragCoord origin is upper left
0:12 Constant: 0:12 Constant:
0:12 2 (const int) 0:12 2 (const int)
0:? Construct vec4 ( temp 4-component vector of uint) 0:? Construct vec4 ( temp 4-component vector of uint)
0:12 indirect index ( temp float) 0:12 indirect index ( temp uint)
0:12 @data: direct index for structure (layout( row_major std430) buffer implicitly-sized array of uint) 0:12 @data: direct index for structure (layout( row_major std430) buffer implicitly-sized array of uint)
0:12 'sbuf' (layout( row_major std430) readonly buffer block{layout( row_major std430) buffer implicitly-sized array of uint @data}) 0:12 'sbuf' (layout( row_major std430) readonly buffer block{layout( row_major std430) buffer implicitly-sized array of uint @data})
0:12 Constant: 0:12 Constant:
0:12 0 (const uint) 0:12 0 (const uint)
0:12 'byteAddrTemp' ( temp int) 0:12 'byteAddrTemp' ( temp int)
0:12 indirect index ( temp float) 0:12 indirect index ( temp uint)
0:12 @data: direct index for structure (layout( row_major std430) buffer implicitly-sized array of uint) 0:12 @data: direct index for structure (layout( row_major std430) buffer implicitly-sized array of uint)
0:12 'sbuf' (layout( row_major std430) readonly buffer block{layout( row_major std430) buffer implicitly-sized array of uint @data}) 0:12 'sbuf' (layout( row_major std430) readonly buffer block{layout( row_major std430) buffer implicitly-sized array of uint @data})
0:12 Constant: 0:12 Constant:
...@@ -290,7 +290,7 @@ gl_FragCoord origin is upper left ...@@ -290,7 +290,7 @@ gl_FragCoord origin is upper left
0:12 'byteAddrTemp' ( temp int) 0:12 'byteAddrTemp' ( temp int)
0:12 Constant: 0:12 Constant:
0:12 1 (const int) 0:12 1 (const int)
0:12 indirect index ( temp float) 0:12 indirect index ( temp uint)
0:12 @data: direct index for structure (layout( row_major std430) buffer implicitly-sized array of uint) 0:12 @data: direct index for structure (layout( row_major std430) buffer implicitly-sized array of uint)
0:12 'sbuf' (layout( row_major std430) readonly buffer block{layout( row_major std430) buffer implicitly-sized array of uint @data}) 0:12 'sbuf' (layout( row_major std430) readonly buffer block{layout( row_major std430) buffer implicitly-sized array of uint @data})
0:12 Constant: 0:12 Constant:
...@@ -299,7 +299,7 @@ gl_FragCoord origin is upper left ...@@ -299,7 +299,7 @@ gl_FragCoord origin is upper left
0:12 'byteAddrTemp' ( temp int) 0:12 'byteAddrTemp' ( temp int)
0:12 Constant: 0:12 Constant:
0:12 2 (const int) 0:12 2 (const int)
0:12 indirect index ( temp float) 0:12 indirect index ( temp uint)
0:12 @data: direct index for structure (layout( row_major std430) buffer implicitly-sized array of uint) 0:12 @data: direct index for structure (layout( row_major std430) buffer implicitly-sized array of uint)
0:12 'sbuf' (layout( row_major std430) readonly buffer block{layout( row_major std430) buffer implicitly-sized array of uint @data}) 0:12 'sbuf' (layout( row_major std430) readonly buffer block{layout( row_major std430) buffer implicitly-sized array of uint @data})
0:12 Constant: 0:12 Constant:
......
Test/baseResults/hlsl.structbuffer.fn2.comp.out
...@@ -18,13 +18,13 @@ local_size = (256, 1, 1) ...@@ -18,13 +18,13 @@ local_size = (256, 1, 1)
0:6 Constant: 0:6 Constant:
0:6 2 (const int) 0:6 2 (const int)
0:? Construct vec2 ( temp 2-component vector of uint) 0:? Construct vec2 ( temp 2-component vector of uint)
0:6 indirect index ( temp float) 0:6 indirect index ( temp uint)
0:6 @data: direct index for structure (layout( row_major std430) buffer implicitly-sized array of uint) 0:6 @data: direct index for structure (layout( row_major std430) buffer implicitly-sized array of uint)
0:6 'buffer' (layout( row_major std430) readonly buffer block{layout( row_major std430) buffer implicitly-sized array of uint @data}) 0:6 'buffer' (layout( row_major std430) readonly buffer block{layout( row_major std430) buffer implicitly-sized array of uint @data})
0:6 Constant: 0:6 Constant:
0:6 0 (const uint) 0:6 0 (const uint)
0:6 'byteAddrTemp' ( temp int) 0:6 'byteAddrTemp' ( temp int)
0:6 indirect index ( temp float) 0:6 indirect index ( temp uint)
0:6 @data: direct index for structure (layout( row_major std430) buffer implicitly-sized array of uint) 0:6 @data: direct index for structure (layout( row_major std430) buffer implicitly-sized array of uint)
0:6 'buffer' (layout( row_major std430) readonly buffer block{layout( row_major std430) buffer implicitly-sized array of uint @data}) 0:6 'buffer' (layout( row_major std430) readonly buffer block{layout( row_major std430) buffer implicitly-sized array of uint @data})
0:6 Constant: 0:6 Constant:
...@@ -87,13 +87,13 @@ local_size = (256, 1, 1) ...@@ -87,13 +87,13 @@ local_size = (256, 1, 1)
0:6 Constant: 0:6 Constant:
0:6 2 (const int) 0:6 2 (const int)
0:? Construct vec2 ( temp 2-component vector of uint) 0:? Construct vec2 ( temp 2-component vector of uint)
0:6 indirect index ( temp float) 0:6 indirect index ( temp uint)
0:6 @data: direct index for structure (layout( row_major std430) buffer implicitly-sized array of uint) 0:6 @data: direct index for structure (layout( row_major std430) buffer implicitly-sized array of uint)
0:6 'buffer' (layout( row_major std430) readonly buffer block{layout( row_major std430) buffer implicitly-sized array of uint @data}) 0:6 'buffer' (layout( row_major std430) readonly buffer block{layout( row_major std430) buffer implicitly-sized array of uint @data})
0:6 Constant: 0:6 Constant:
0:6 0 (const uint) 0:6 0 (const uint)
0:6 'byteAddrTemp' ( temp int) 0:6 'byteAddrTemp' ( temp int)
0:6 indirect index ( temp float) 0:6 indirect index ( temp uint)
0:6 @data: direct index for structure (layout( row_major std430) buffer implicitly-sized array of uint) 0:6 @data: direct index for structure (layout( row_major std430) buffer implicitly-sized array of uint)
0:6 'buffer' (layout( row_major std430) readonly buffer block{layout( row_major std430) buffer implicitly-sized array of uint @data}) 0:6 'buffer' (layout( row_major std430) readonly buffer block{layout( row_major std430) buffer implicitly-sized array of uint @data})
0:6 Constant: 0:6 Constant:
......
Test/baseResults/hlsl.structbuffer.rwbyte.frag.out
This source diff could not be displayed because it is too large. You can view the blob instead.
hlsl/hlslParseHelper.cpp
...@@ -3302,7 +3302,13 @@ void HlslParseContext::decomposeStructBufferMethods(const TSourceLoc& loc, TInte ...@@ -3302,7 +3302,13 @@ void HlslParseContext::decomposeStructBufferMethods(const TSourceLoc& loc, TInte
const TOperator idxOp = (offsetIdx->getQualifier().storage == EvqConst) ? EOpIndexDirect const TOperator idxOp = (offsetIdx->getQualifier().storage == EvqConst) ? EOpIndexDirect
: EOpIndexIndirect; : EOpIndexIndirect;
vec = intermediate.growAggregate(vec, intermediate.addIndex(idxOp, argArray, offsetIdx, loc)); TIntermTyped* indexVal = intermediate.addIndex(idxOp, argArray, offsetIdx, loc);
TType derefType(argArray->getType(), 0);
derefType.getQualifier().makeTemporary();
indexVal->setType(derefType);
vec = intermediate.growAggregate(vec, indexVal);
} }
vec->setType(TType(argArray->getBasicType(), EvqTemporary, size)); vec->setType(TType(argArray->getBasicType(), EvqTemporary, size));
...@@ -3366,8 +3372,14 @@ void HlslParseContext::decomposeStructBufferMethods(const TSourceLoc& loc, TInte ...@@ -3366,8 +3372,14 @@ void HlslParseContext::decomposeStructBufferMethods(const TSourceLoc& loc, TInte
const TType derefType(argArray->getType(), 0); const TType derefType(argArray->getType(), 0);
lValue->setType(derefType); lValue->setType(derefType);
TIntermTyped* rValue = (size == 1) ? argValue : TIntermTyped* rValue;
intermediate.addIndex(EOpIndexDirect, argValue, idxConst, loc); if (size == 1) {
rValue = argValue;
} else {
rValue = intermediate.addIndex(EOpIndexDirect, argValue, idxConst, loc);
const TType indexType(argValue->getType(), 0);
rValue->setType(indexType);
}
TIntermTyped* assign = intermediate.addAssign(EOpAssign, lValue, rValue, loc); TIntermTyped* assign = intermediate.addAssign(EOpAssign, lValue, rValue, loc);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment