| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  * Copyright 2014 Google Inc. | 2  * Copyright 2014 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 #include "GrGLSLGeometryProcessor.h" | 8 #include "GrGLSLGeometryProcessor.h" | 
| 9 | 9 | 
| 10 #include "GrCoordTransform.h" | 10 #include "GrCoordTransform.h" | 
| 11 #include "glsl/GrGLSLFragmentShaderBuilder.h" | 11 #include "glsl/GrGLSLFragmentShaderBuilder.h" | 
| 12 #include "glsl/GrGLSLProcessorTypes.h" | 12 #include "glsl/GrGLSLProcessorTypes.h" | 
| 13 #include "glsl/GrGLSLUniformHandler.h" | 13 #include "glsl/GrGLSLUniformHandler.h" | 
| 14 #include "glsl/GrGLSLVarying.h" | 14 #include "glsl/GrGLSLVarying.h" | 
| 15 #include "glsl/GrGLSLVertexShaderBuilder.h" | 15 #include "glsl/GrGLSLVertexShaderBuilder.h" | 
| 16 | 16 | 
| 17 void GrGLSLGeometryProcessor::emitCode(EmitArgs& args) { | 17 void GrGLSLGeometryProcessor::emitCode(EmitArgs& args) { | 
| 18     GrGLSLVertexBuilder* vBuilder = args.fVertBuilder; | 18     GrGLSLVertexBuilder* vBuilder = args.fVertBuilder; | 
| 19     GrGPArgs gpArgs; | 19     GrGPArgs gpArgs; | 
| 20     this->onEmitCode(args, &gpArgs); | 20     this->onEmitCode(args, &gpArgs); | 
| 21     vBuilder->transformToNormalizedDeviceSpace(gpArgs.fPositionVar); | 21     vBuilder->transformToNormalizedDeviceSpace(gpArgs.fPositionVar); | 
|  | 22     if (kVec2f_GrSLType == gpArgs.fPositionVar.getType()) { | 
|  | 23         args.fVaryingHandler->setNoPerspective(); | 
|  | 24     } | 
| 22 } | 25 } | 
| 23 | 26 | 
| 24 void GrGLSLGeometryProcessor::emitTransforms(GrGLSLVertexBuilder* vb, | 27 void GrGLSLGeometryProcessor::emitTransforms(GrGLSLVertexBuilder* vb, | 
| 25                                              GrGLSLVaryingHandler* varyingHandle
     r, | 28                                              GrGLSLVaryingHandler* varyingHandle
     r, | 
| 26                                              GrGLSLUniformHandler* uniformHandle
     r, | 29                                              GrGLSLUniformHandler* uniformHandle
     r, | 
| 27                                              const GrShaderVar& posVar, | 30                                              const GrShaderVar& posVar, | 
| 28                                              const char* localCoords, | 31                                              const char* localCoords, | 
| 29                                              const SkMatrix& localMatrix, | 32                                              const SkMatrix& localMatrix, | 
| 30                                              const TransformsIn& tin, | 33                                              const TransformsIn& tin, | 
| 31                                              TransformsOut* tout) { | 34                                              TransformsOut* tout) { | 
| (...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 147             gpArgs->fPositionVar.set(kVec2f_GrSLType, "pos2"); | 150             gpArgs->fPositionVar.set(kVec2f_GrSLType, "pos2"); | 
| 148             vertBuilder->codeAppendf("vec2 %s = vec2(%s * vec3(%s, 1));", | 151             vertBuilder->codeAppendf("vec2 %s = vec2(%s * vec3(%s, 1));", | 
| 149                                      gpArgs->fPositionVar.c_str(), viewMatrixNam
     e, posName); | 152                                      gpArgs->fPositionVar.c_str(), viewMatrixNam
     e, posName); | 
| 150         } else { | 153         } else { | 
| 151             gpArgs->fPositionVar.set(kVec3f_GrSLType, "pos3"); | 154             gpArgs->fPositionVar.set(kVec3f_GrSLType, "pos3"); | 
| 152             vertBuilder->codeAppendf("vec3 %s = %s * vec3(%s, 1);", | 155             vertBuilder->codeAppendf("vec3 %s = %s * vec3(%s, 1);", | 
| 153                                      gpArgs->fPositionVar.c_str(), viewMatrixNam
     e, posName); | 156                                      gpArgs->fPositionVar.c_str(), viewMatrixNam
     e, posName); | 
| 154         } | 157         } | 
| 155     } | 158     } | 
| 156 } | 159 } | 
| OLD | NEW | 
|---|