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

SPV: Modify last merge: Have promoteScalar() generate the correct vectorType.

Browse Source
This commit is contained in:
John Kessenich 2015-12-09 19:08:42 -07:00
parent c51710e0a9
commit 76f7139789
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
SPIRV/SpvBuilder.cpp
View File

@ -1174,9 +1174,9 @@ void Builder::promoteScalar(Decoration precision, Id& left, Id& right)
int direction = getNumComponents(right) - getNumComponents(left); int direction = getNumComponents(right) - getNumComponents(left);
if (direction > 0) if (direction > 0)
left = smearScalar(precision, left, getTypeId(right)); left = smearScalar(precision, left, makeVectorType(getTypeId(left), getNumComponents(right)));
else if (direction < 0) else if (direction < 0)
right = smearScalar(precision, right, getTypeId(left)); right = smearScalar(precision, right, makeVectorType(getTypeId(right), getNumComponents(left)));
return; return;
} }
@ -1185,15 +1185,12 @@ void Builder::promoteScalar(Decoration precision, Id& left, Id& right)
Id Builder::smearScalar(Decoration /*precision*/, Id scalar, Id vectorType) Id Builder::smearScalar(Decoration /*precision*/, Id scalar, Id vectorType)
{ {
assert(getNumComponents(scalar) == 1); assert(getNumComponents(scalar) == 1);
assert(getTypeId(scalar) == getScalarTypeId(vectorType));
int numComponents = getNumTypeComponents(vectorType); int numComponents = getNumTypeComponents(vectorType);
if (numComponents == 1) if (numComponents == 1)
return scalar; return scalar;
// Make new vector type if the provided one is incompatible with type of the scalar
if (getTypeId(scalar) != getScalarTypeId(vectorType))
vectorType = makeVectorType(getTypeId(scalar), numComponents);
Instruction* smear = new Instruction(getUniqueId(), vectorType, OpCompositeConstruct); Instruction* smear = new Instruction(getUniqueId(), vectorType, OpCompositeConstruct);
for (int c = 0; c < numComponents; ++c) for (int c = 0; c < numComponents; ++c)
smear->addIdOperand(scalar); smear->addIdOperand(scalar);

9
SPIRV/SpvBuilder.h
View File

@ -279,12 +279,17 @@ public:
// - promoteScalar(scalar, scalar) // do nothing // - promoteScalar(scalar, scalar) // do nothing
// Other forms are not allowed. // Other forms are not allowed.
// //
// Generally, the type of 'scalar' does not need to be the same type as the components in 'vector'.
// The type of the created vector is a vector of components of the same type as the scalar.
//
// Note: One of the arguments will change, with the result coming back that way rather than // Note: One of the arguments will change, with the result coming back that way rather than
// through the return value. // through the return value.
void promoteScalar(Decoration precision, Id& left, Id& right); void promoteScalar(Decoration precision, Id& left, Id& right);
// make a value by smearing the scalar to fill the type // Make a value by smearing the scalar to fill the type.
Id smearScalar(Decoration precision, Id scalarVal, Id); // vectorType should be the correct type for making a vector of scalarVal.
// (No conversions are done.)
Id smearScalar(Decoration precision, Id scalarVal, Id vectorType);
// Create a call to a built-in function. // Create a call to a built-in function.
Id createBuiltinCall(Decoration precision, Id resultType, Id builtins, int entryPoint, std::vector<Id>& args); Id createBuiltinCall(Decoration precision, Id resultType, Id builtins, int entryPoint, std::vector<Id>& args);

4
glslang/Include/revision.h
View File

@ -2,5 +2,5 @@
// For the version, it uses the latest git tag followed by the number of commits. // For the version, it uses the latest git tag followed by the number of commits.
// For the date, it uses the current date (when then script is run). // For the date, it uses the current date (when then script is run).
#define GLSLANG_REVISION "SPIRV99.831" #define GLSLANG_REVISION "SPIRV99.836"
#define GLSLANG_DATE "08-Dec-2015" #define GLSLANG_DATE "09-Dec-2015"