Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(190)

Side by Side Diff: src/gpu/gl/GrGLProgramDataManager.cpp

Issue 808593003: Rename GrGpuGL to GrGLGpu for consistency (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: rebase Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/gpu/gl/GrGLProgramDataManager.h ('k') | src/gpu/gl/GrGLProgramDesc.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2012 Google Inc. 2 * Copyright 2012 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 "gl/GrGLPathRendering.h" 8 #include "gl/GrGLPathRendering.h"
9 #include "gl/GrGLUniformHandle.h" 9 #include "gl/GrGLUniformHandle.h"
10 #include "gl/GrGpuGL.h" 10 #include "gl/GrGpuGL.h"
11 #include "SkMatrix.h" 11 #include "SkMatrix.h"
12 12
13 #define ASSERT_ARRAY_UPLOAD_IN_BOUNDS(UNI, COUNT) \ 13 #define ASSERT_ARRAY_UPLOAD_IN_BOUNDS(UNI, COUNT) \
14 SkASSERT(arrayCount <= uni.fArrayCount || \ 14 SkASSERT(arrayCount <= uni.fArrayCount || \
15 (1 == arrayCount && GrGLShaderVar::kNonArray == uni.fArrayCoun t)) 15 (1 == arrayCount && GrGLShaderVar::kNonArray == uni.fArrayCoun t))
16 16
17 GrGLProgramDataManager::GrGLProgramDataManager(GrGpuGL* gpu, const UniformInfoAr ray& uniforms) 17 GrGLProgramDataManager::GrGLProgramDataManager(GrGLGpu* gpu, const UniformInfoAr ray& uniforms)
18 : fGpu(gpu) { 18 : fGpu(gpu) {
19 int count = uniforms.count(); 19 int count = uniforms.count();
20 fUniforms.push_back_n(count); 20 fUniforms.push_back_n(count);
21 for (int i = 0; i < count; i++) { 21 for (int i = 0; i < count; i++) {
22 Uniform& uniform = fUniforms[i]; 22 Uniform& uniform = fUniforms[i];
23 const UniformInfo& builderUniform = uniforms[i]; 23 const UniformInfo& builderUniform = uniforms[i];
24 SkASSERT(GrGLShaderVar::kNonArray == builderUniform.fVariable.getArrayCo unt() || 24 SkASSERT(GrGLShaderVar::kNonArray == builderUniform.fVariable.getArrayCo unt() ||
25 builderUniform.fVariable.getArrayCount() > 0); 25 builderUniform.fVariable.getArrayCount() > 0);
26 SkDEBUGCODE( 26 SkDEBUGCODE(
27 uniform.fArrayCount = builderUniform.fVariable.getArrayCount(); 27 uniform.fArrayCount = builderUniform.fVariable.getArrayCount();
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
251 matrix.get(SkMatrix::kMPersp0), 251 matrix.get(SkMatrix::kMPersp0),
252 matrix.get(SkMatrix::kMSkewX), 252 matrix.get(SkMatrix::kMSkewX),
253 matrix.get(SkMatrix::kMScaleY), 253 matrix.get(SkMatrix::kMScaleY),
254 matrix.get(SkMatrix::kMPersp1), 254 matrix.get(SkMatrix::kMPersp1),
255 matrix.get(SkMatrix::kMTransX), 255 matrix.get(SkMatrix::kMTransX),
256 matrix.get(SkMatrix::kMTransY), 256 matrix.get(SkMatrix::kMTransY),
257 matrix.get(SkMatrix::kMPersp2), 257 matrix.get(SkMatrix::kMPersp2),
258 }; 258 };
259 this->setMatrix3f(u, mt); 259 this->setMatrix3f(u, mt);
260 } 260 }
OLDNEW
« no previous file with comments | « src/gpu/gl/GrGLProgramDataManager.h ('k') | src/gpu/gl/GrGLProgramDesc.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698