Commit 22d63dae by Jamie Madill Committed by Shannon Woods

Fix an improper usage of getCols, which should be getNominalSize, in unsigned int vector code.

TRAC #23263 Signed-off-by: Shannon Woods Author: Jamie Madill
parent d3ff2169
...@@ -2924,7 +2924,7 @@ TString OutputHLSL::typeString(const TType &type) ...@@ -2924,7 +2924,7 @@ TString OutputHLSL::typeString(const TType &type)
case 4: return "int4"; case 4: return "int4";
} }
case EbtUInt: case EbtUInt:
switch (type.getCols()) switch (type.getNominalSize())
{ {
case 1: return "uint"; case 1: return "uint";
case 2: return "uint2"; case 2: return "uint2";
...@@ -3501,7 +3501,7 @@ GLenum OutputHLSL::glVariableType(const TType &type) ...@@ -3501,7 +3501,7 @@ GLenum OutputHLSL::glVariableType(const TType &type)
} }
else if (type.isVector()) else if (type.isVector())
{ {
switch(type.getCols()) switch(type.getNominalSize())
{ {
case 2: return GL_UNSIGNED_INT_VEC2; case 2: return GL_UNSIGNED_INT_VEC2;
case 3: return GL_UNSIGNED_INT_VEC3; case 3: return GL_UNSIGNED_INT_VEC3;
......
...@@ -73,7 +73,7 @@ static ShDataType getVariableDataType(const TType& type) ...@@ -73,7 +73,7 @@ static ShDataType getVariableDataType(const TType& type)
if (type.isMatrix()) { if (type.isMatrix()) {
UNREACHABLE(); UNREACHABLE();
} else if (type.isVector()) { } else if (type.isVector()) {
switch (type.getCols()) { switch (type.getNominalSize()) {
case 2: return SH_UNSIGNED_INT_VEC2; case 2: return SH_UNSIGNED_INT_VEC2;
case 3: return SH_UNSIGNED_INT_VEC3; case 3: return SH_UNSIGNED_INT_VEC3;
case 4: return SH_UNSIGNED_INT_VEC4; case 4: return SH_UNSIGNED_INT_VEC4;
......
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