diff options
| author |  joshualitt <joshualitt@chromium.org> | 2014-10-07 12:42:26 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-10-07 12:42:26 -0700 |
| commit | db0d3ca07008ea2c1f24d0fd9ceecf10af6ae63b (patch) | |
| tree | 12ff0bd9f07193593b7db1d52ef2fe0478c00aeb /tests | |
| parent | fe1233c3f12f81bb675718516bbb32f72af726ec (diff) | |
Revert of Cleanup of shader building system (patchset #25 id:470001 of https://codereview.chromium.org/611653002/)
Reason for revert:
Seems to have messed up windows 7 gms
Original issue's description:
> Cleanup of shader building system
>
> this is a huge refactor and cleanup of the gl shader building system in
> Skia. The entire shader building pipeline is now part of
> GrGLProgramCreator, which takes a gp, and some fps, and creates a
> program. I added some subclasses of GrGLProgram to handle the
> eccentricities of Nvpr/Nvpres. Outside of the builders folder
> and GrGLPrograms, this change is basically just a rename
>
>
> solo gp
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/fe1233c3f12f81bb675718516bbb32f72af726ec
TBR=bsalomon@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/635533005
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/GLProgramsTest.cpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/tests/GLProgramsTest.cpp b/tests/GLProgramsTest.cpp index c31aa1e0da..d8ce3fdc9f 100644 --- a/tests/GLProgramsTest.cpp +++ b/tests/GLProgramsTest.cpp @@ -16,7 +16,6 @@ #include "GrContextFactory.h" #include "GrOptDrawState.h" #include "effects/GrConfigConversionEffect.h" -#include "gl/builders/GrGLProgramBuilder.h" #include "gl/GrGLPathRendering.h" #include "gl/GrGpuGL.h" #include "SkChecksum.h" @@ -25,7 +24,7 @@ static void get_stage_stats(const GrFragmentStage stage, bool* readsDst, bool* readsFragPosition, bool* requiresVertexShader) { - if (stage.getProcessor()->willReadDstColor()) { + if (stage.getFragmentProcessor()->willReadDstColor()) { *readsDst = true; } if (stage.getProcessor()->willReadFragmentPosition()) { @@ -336,14 +335,12 @@ bool GrGpuGL::programUnitTest(int maxStages) { SkAutoTUnref<GrOptDrawState> optState(GrOptDrawState::Create(this->getDrawState(), *this->caps(), drawType)); - SkAutoTUnref<GrGLProgram> program( - GrGLProgramBuilder::CreateProgram(*optState, - pdesc, - drawType, - geometryProcessor, - stages, - stages + numColorStages, - this)); + SkAutoTUnref<GrGLProgram> program(GrGLProgram::Create(this, + *optState.get(), + pdesc, + geometryProcessor.get(), + stages, + stages + numColorStages)); for (int s = 0; s < numStages; ++s) { SkDELETE(stages[s]); } |