diff options
| author |  joshualitt <joshualitt@chromium.org> | 2015-09-11 10:44:13 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-09-11 10:44:14 -0700 |
| commit | e7afc2d85ba1db71ef8938ce3459cd78b30f71db (patch) | |
| tree | 00b2b7f563a77a8e6fd42e43fa6fd5cbe6b43df7 /src/gpu/gl/builders/GrGLProgramBuilder.cpp | |
| parent | 6efbe0537732a729d5bd500707dd0d8b0fc83553 (diff) | |
Start trying to collapse path program stuff
BUG=skia:
Review URL: https://codereview.chromium.org/1333273003
Diffstat (limited to 'src/gpu/gl/builders/GrGLProgramBuilder.cpp')
| -rw-r--r-- | src/gpu/gl/builders/GrGLProgramBuilder.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.cpp b/src/gpu/gl/builders/GrGLProgramBuilder.cpp index 84e4a99be2..8b1843c6cb 100644 --- a/src/gpu/gl/builders/GrGLProgramBuilder.cpp +++ b/src/gpu/gl/builders/GrGLProgramBuilder.cpp @@ -7,14 +7,6 @@ #include "GrGLProgramBuilder.h" -#include "gl/GrGLGeometryProcessor.h" -#include "gl/GrGLGpu.h" -#include "gl/GrGLPathProcessor.h" -#include "gl/GrGLProgram.h" -#include "gl/GrGLSLPrettyPrint.h" -#include "gl/GrGLUniformHandle.h" -#include "gl/GrGLXferProcessor.h" -#include "glsl/GrGLSLCaps.h" #include "GrAutoLocaleSetter.h" #include "GrCoordTransform.h" #include "GrGLPathProgramBuilder.h" @@ -22,6 +14,13 @@ #include "GrTexture.h" #include "SkRTConf.h" #include "SkTraceEvent.h" +#include "gl/GrGLGeometryProcessor.h" +#include "gl/GrGLGpu.h" +#include "gl/GrGLPathProcessor.h" +#include "gl/GrGLProgram.h" +#include "gl/GrGLSLPrettyPrint.h" +#include "gl/GrGLXferProcessor.h" +#include "glsl/GrGLSLCaps.h" #define GL_CALL(X) GR_GL_CALL(this->gpu()->glInterface(), X) #define GL_CALL_RET(R, X) GR_GL_CALL_RET(this->gpu()->glInterface(), R, X) @@ -162,7 +161,7 @@ GrGLProgramDataManager::UniformHandle GrGLProgramBuilder::addUniformArray( if (outName) { *outName = uni.fVariable.c_str(); } - return GrGLProgramDataManager::UniformHandle::CreateFromUniformIndex(fUniforms.count() - 1); + return GrGLProgramDataManager::UniformHandle(fUniforms.count() - 1); } void GrGLProgramBuilder::appendUniformDecls(ShaderVisibility visibility, |