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

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

Issue 98703002: Fix compilation with SK_ENABLE_INST_COUNT=1 (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « src/gpu/gl/GrGLInterface.cpp ('k') | src/gpu/gl/GrGLTexture.cpp » ('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 2011 Google Inc. 2 * Copyright 2011 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 "GrGLProgram.h" 8 #include "GrGLProgram.h"
9 9
10 #include "GrAllocator.h" 10 #include "GrAllocator.h"
11 #include "GrEffect.h" 11 #include "GrEffect.h"
12 #include "GrCoordTransform.h" 12 #include "GrCoordTransform.h"
13 #include "GrDrawEffect.h" 13 #include "GrDrawEffect.h"
14 #include "GrGLEffect.h" 14 #include "GrGLEffect.h"
15 #include "GrGpuGL.h" 15 #include "GrGpuGL.h"
16 #include "GrGLShaderVar.h" 16 #include "GrGLShaderVar.h"
17 #include "GrGLSL.h" 17 #include "GrGLSL.h"
18 #include "SkXfermode.h" 18 #include "SkXfermode.h"
19 19
20 SK_DEFINE_INST_COUNT(GrGLProgram)
21
22 #define GL_CALL(X) GR_GL_CALL(fGpu->glInterface(), X) 20 #define GL_CALL(X) GR_GL_CALL(fGpu->glInterface(), X)
23 #define GL_CALL_RET(R, X) GR_GL_CALL_RET(fGpu->glInterface(), R, X) 21 #define GL_CALL_RET(R, X) GR_GL_CALL_RET(fGpu->glInterface(), R, X)
24 22
25 GrGLProgram* GrGLProgram::Create(GrGpuGL* gpu, 23 GrGLProgram* GrGLProgram::Create(GrGpuGL* gpu,
26 const GrGLProgramDesc& desc, 24 const GrGLProgramDesc& desc,
27 const GrEffectStage* colorStages[], 25 const GrEffectStage* colorStages[],
28 const GrEffectStage* coverageStages[]) { 26 const GrEffectStage* coverageStages[]) {
29 GrGLProgram* program = SkNEW_ARGS(GrGLProgram, (gpu, desc, colorStages, cove rageStages)); 27 GrGLProgram* program = SkNEW_ARGS(GrGLProgram, (gpu, desc, colorStages, cove rageStages));
30 if (!program->succeeded()) { 28 if (!program->succeeded()) {
31 delete program; 29 delete program;
(...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after
349 347
350 fMatrixState.fViewMatrix = drawState.getViewMatrix(); 348 fMatrixState.fViewMatrix = drawState.getViewMatrix();
351 fMatrixState.fRenderTargetSize = size; 349 fMatrixState.fRenderTargetSize = size;
352 fMatrixState.fRenderTargetOrigin = rt->origin(); 350 fMatrixState.fRenderTargetOrigin = rt->origin();
353 351
354 GrGLfloat viewMatrix[3 * 3]; 352 GrGLfloat viewMatrix[3 * 3];
355 fMatrixState.getGLMatrix<3>(viewMatrix); 353 fMatrixState.getGLMatrix<3>(viewMatrix);
356 fUniformManager.setMatrix3f(fUniformHandles.fViewMatrixUni, viewMatrix); 354 fUniformManager.setMatrix3f(fUniformHandles.fViewMatrixUni, viewMatrix);
357 } 355 }
358 } 356 }
OLDNEW
« no previous file with comments | « src/gpu/gl/GrGLInterface.cpp ('k') | src/gpu/gl/GrGLTexture.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698