diff options
| author |  egdaniel <egdaniel@google.com> | 2014-12-10 07:43:49 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-12-10 07:43:50 -0800 |
| commit | 4dffc940c430eec66d4707490eace19c9b3f7904 (patch) | |
| tree | cce5e8c525a5acec67c4398c95c165223320d679 /src/gpu/gl/GrGLProgram.h | |
| parent | 28828d00b20d90b6caf91e4b0b31e80acadf2d57 (diff) | |
Create xfer processor backend.
This includes:
-Having an actual XP stage at the end of the gl pipeline.
-All Blending work is handled by XP until actually setting GL blend states
-GLPrograms test to test XP
BUG=skia:
Review URL: https://codereview.chromium.org/764643004
Diffstat (limited to 'src/gpu/gl/GrGLProgram.h')
| -rw-r--r-- | src/gpu/gl/GrGLProgram.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/gpu/gl/GrGLProgram.h b/src/gpu/gl/GrGLProgram.h index 36bf860233..ea8be85251 100644 --- a/src/gpu/gl/GrGLProgram.h +++ b/src/gpu/gl/GrGLProgram.h @@ -141,6 +141,7 @@ protected: GrGLuint programID, const UniformInfoArray&, GrGLInstalledGeoProc* geometryProcessor, + GrGLInstalledXferProc* xferProcessor, GrGLInstalledFragProcs* fragmentProcessors); // Sets the texture units for samplers. @@ -180,6 +181,7 @@ protected: // the installed effects SkAutoTDelete<GrGLInstalledGeoProc> fGeometryProcessor; + SkAutoTDelete<GrGLInstalledXferProc> fXferProcessor; SkAutoTUnref<GrGLInstalledFragProcs> fFragmentProcessors; GrProgramDesc fDesc; @@ -205,6 +207,7 @@ protected: const BuiltinUniformHandles&, GrGLuint programID, const UniformInfoArray&, + GrGLInstalledXferProc* xferProcessor, GrGLInstalledFragProcs* fragmentProcessors); virtual void onSetMatrixAndRenderTargetHeight(const GrOptDrawState&); @@ -223,6 +226,7 @@ private: const BuiltinUniformHandles&, GrGLuint programID, const UniformInfoArray&, + GrGLInstalledXferProc* xferProcessor, GrGLInstalledFragProcs* fragmentProcessors, const SeparableVaryingInfoArray& separableVaryings); virtual void didSetData(GrGpu::DrawType) SK_OVERRIDE; @@ -252,7 +256,8 @@ private: const BuiltinUniformHandles&, GrGLuint programID, const UniformInfoArray&, - GrGLInstalledFragProcs* fragmentProcessors, + GrGLInstalledXferProc* xp, + GrGLInstalledFragProcs* fps, int texCoordSetCnt); virtual void didSetData(GrGpu::DrawType) SK_OVERRIDE; virtual void setTransformData(const GrPendingFragmentStage&, |