| 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 "GrGLFullProgramBuilder.h" | 8 #include "GrGLFullProgramBuilder.h" |
| 9 #include "../GrGLGeometryProcessor.h" | 9 #include "../GrGLGeometryProcessor.h" |
| 10 #include "../GrGpuGL.h" | 10 #include "../GrGpuGL.h" |
| (...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 208 SkTDArray<GrGLuint>* shader
Ids) const { | 208 SkTDArray<GrGLuint>* shader
Ids) const { |
| 209 return INHERITED::compileAndAttachShaders(programId, shaderIds) | 209 return INHERITED::compileAndAttachShaders(programId, shaderIds) |
| 210 && fVS.compileAndAttachShaders(programId, shaderIds) | 210 && fVS.compileAndAttachShaders(programId, shaderIds) |
| 211 #if GR_GL_EXPERIMENTAL_GS | 211 #if GR_GL_EXPERIMENTAL_GS |
| 212 && (!desc().getHeader().fExperimentalGS | 212 && (!desc().getHeader().fExperimentalGS |
| 213 || fGS.compileAndAttachShaders(programId, shaderIds)) | 213 || fGS.compileAndAttachShaders(programId, shaderIds)) |
| 214 #endif | 214 #endif |
| 215 ; | 215 ; |
| 216 } | 216 } |
| 217 | 217 |
| 218 void GrGLFullProgramBuilder::bindProgramLocations(GrGLuint programId) { | 218 void GrGLFullProgramBuilder::bindProgramLocations(const GrOptDrawState& optState
, |
| 219 fVS.bindProgramLocations(programId); | 219 GrGLuint programId) { |
| 220 INHERITED::bindProgramLocations(programId); | 220 fVS.bindProgramLocations(optState, programId); |
| 221 INHERITED::bindProgramLocations(optState, programId); |
| 221 } | 222 } |
| OLD | NEW |