michael@0: From: Jeff Gilbert <jgilbert@mozilla.com>
michael@0: 
michael@0: diff --git a/gfx/angle/src/compiler/Types.h b/gfx/angle/src/compiler/Types.h
michael@0: --- a/gfx/angle/src/compiler/Types.h
michael@0: +++ b/gfx/angle/src/compiler/Types.h
michael@0: @@ -90,17 +90,17 @@ private:
michael@0:  //
michael@0:  // Base class for things that have a type.
michael@0:  //
michael@0:  class TType
michael@0:  {
michael@0:  public:
michael@0:      POOL_ALLOCATOR_NEW_DELETE();
michael@0:      TType() {}
michael@0: -    TType(TBasicType t, TPrecision p, TQualifier q = EvqTemporary, int s = 1, bool m = false, bool a = false) :
michael@0: +    TType(TBasicType t, TPrecision p, TQualifier q = EvqTemporary, char s = 1, bool m = false, bool a = false) :
michael@0:              type(t), precision(p), qualifier(q), size(s), matrix(m), array(a), arraySize(0), structure(0)
michael@0:      {
michael@0:      }
michael@0:      explicit TType(const TPublicType &p);
michael@0:      TType(TStructure* userDef, TPrecision p = EbpUndefined) :
michael@0:              type(EbtStruct), precision(p), qualifier(EvqTemporary), size(1), matrix(false), array(false), arraySize(0), structure(userDef)
michael@0:      {
michael@0:      }
michael@0: @@ -229,22 +229,22 @@ public:
michael@0:  
michael@0:      bool isStructureContainingArrays() const {
michael@0:          return structure ? structure->containsArrays() : false;
michael@0:      }
michael@0:  
michael@0:  private:
michael@0:      TString buildMangledName() const;
michael@0:  
michael@0: -    TBasicType type      : 6;
michael@0: +    TBasicType type;
michael@0:      TPrecision precision;
michael@0: -    TQualifier qualifier : 7;
michael@0: -    int size             : 8; // size of vector or matrix, not size of array
michael@0: -    unsigned int matrix  : 1;
michael@0: -    unsigned int array   : 1;
michael@0: +    TQualifier qualifier;
michael@0: +    char size; // size of vector or matrix, not size of array
michael@0: +    bool matrix;
michael@0: +    bool array;
michael@0:      int arraySize;
michael@0:  
michael@0:      TStructure* structure;      // 0 unless this is a struct
michael@0:  
michael@0:      mutable TString mangled;
michael@0:  };
michael@0:  
michael@0:  //