commit 9085c8db49e19fa71eef29d4145a3820e53e115b
author Alexis Hetu <sugoi@google.com> Mon Jun 01 13:48:07 2015 -0400
committer Alexis Hétu <sugoi@google.com> Sun Jun 07 18:59:44 2015 +0000
tree 450984038c550d5af734dd02154d50639881206a
parent 8e851c1a0b9e923ceb77751b7ae7221d22833bcb

Adding base type changes related to Uniform Blocks

This cl should be a NOOP. It simply adds some basic
functionality in BaseTypes.h that will be useful in
eventually enabling Uniform Blocks in the parser.

Change-Id: I0c2b3200e0ae95ddce86367663081c2aef751308
Reviewed-on: https://swiftshader-review.googlesource.com/3311
Tested-by: Alexis Hétu <sugoi@google.com>
Reviewed-by: Nicolas Capens <capn@google.com>

src/OpenGL/compiler/Types.h

diff --git a/src/OpenGL/compiler/Types.h b/src/OpenGL/compiler/Types.h
index be5d61f..de16d51 100644
--- a/src/OpenGL/compiler/Types.h
+++ b/src/OpenGL/compiler/Types.h
@@ -152,7 +152,7 @@
 	bool isScalar() const { return primarySize == 1 && !isMatrix() && !structure; }
 	bool isRegister() const { return !isMatrix() && !structure && !array; }   // Fits in a 4-element register
 	bool isStruct() const { return structure != 0; }
-	bool isScalarInt() const { return isScalar() && (type == EbtInt || type == EbtUInt); }
+	bool isScalarInt() const { return isScalar() && IsInteger(type); }
 
     TTypeList* getStruct() const { return structure; }
     void setStruct(TTypeList* s) { structure = s; computeDeepestStructNesting(); }