| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright 2013 Google Inc. | 2  * Copyright 2013 Google Inc. | 
| 3  * | 3  * | 
| 4  * Use of this source code is governed by a BSD-style license that can be | 4  * Use of this source code is governed by a BSD-style license that can be | 
| 5  * found in the LICENSE file. | 5  * found in the LICENSE file. | 
| 6  */ | 6  */ | 
| 7 | 7 | 
| 8 #ifndef GrGLSLPrimitiveProcessor_DEFINED | 8 #ifndef GrGLSLPrimitiveProcessor_DEFINED | 
| 9 #define GrGLSLPrimitiveProcessor_DEFINED | 9 #define GrGLSLPrimitiveProcessor_DEFINED | 
| 10 | 10 | 
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 95                                   const SkTArray<const GrCoordTransform*, true>&
      transforms) = 0; | 95                                   const SkTArray<const GrCoordTransform*, true>&
      transforms) = 0; | 
| 96 | 96 | 
| 97 protected: | 97 protected: | 
| 98     void setupUniformColor(GrGLSLPPFragmentBuilder* fragBuilder, | 98     void setupUniformColor(GrGLSLPPFragmentBuilder* fragBuilder, | 
| 99                            GrGLSLUniformHandler* uniformHandler, | 99                            GrGLSLUniformHandler* uniformHandler, | 
| 100                            const char* outputName, | 100                            const char* outputName, | 
| 101                            UniformHandle* colorUniform); | 101                            UniformHandle* colorUniform); | 
| 102 | 102 | 
| 103     struct Transform { | 103     struct Transform { | 
| 104         Transform() : fType(kVoid_GrSLType) { fCurrentValue = SkMatrix::InvalidM
     atrix(); } | 104         Transform() : fType(kVoid_GrSLType) { fCurrentValue = SkMatrix::InvalidM
     atrix(); } | 
| 105         UniformHandle  fHandle; |  | 
| 106         SkMatrix       fCurrentValue; | 105         SkMatrix       fCurrentValue; | 
| 107         GrSLType       fType; | 106         GrSLType       fType; | 
| 108     }; | 107     }; | 
| 109 |  | 
| 110     SkSTArray<8, SkSTArray<2, Transform, true> > fInstalledTransforms; |  | 
| 111 }; | 108 }; | 
| 112 | 109 | 
| 113 #endif | 110 #endif | 
| OLD | NEW | 
|---|