diff options
| author |  joshualitt <joshualitt@chromium.org> | 2015-01-14 13:51:18 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-01-14 13:51:18 -0800 |
| commit | 89069a9bdb00fb4cd60b059daf94546c211b9c83 (patch) | |
| tree | e020c76fcaa614a70eb6dca99418e17d8e699f33 /src/gpu/gl/GrGLPathRendering.cpp | |
| parent | afdbedb73c005dc9d88ab4167167866d7302c253 (diff) | |
possible bug fix for nvpr
TBR=bsalomon@google.com
BUG=skia:
Review URL: https://codereview.chromium.org/850953003
Diffstat (limited to 'src/gpu/gl/GrGLPathRendering.cpp')
| -rw-r--r-- | src/gpu/gl/GrGLPathRendering.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gpu/gl/GrGLPathRendering.cpp b/src/gpu/gl/GrGLPathRendering.cpp index 93f892d3b3..e46f336351 100644 --- a/src/gpu/gl/GrGLPathRendering.cpp +++ b/src/gpu/gl/GrGLPathRendering.cpp @@ -88,7 +88,8 @@ void GrGLPathRendering::resetContext() { fHWProjectionMatrixState.invalidate(); // we don't use the model view matrix. GrGLenum matrixMode = - fGpu->glStandard() == kGLES_GrGLStandard ? GR_GL_PATH_MODELVIEW : GR_GL_MODELVIEW; + fGpu->glCaps().nvprSupport() == GrGLCaps::kNormal_NvprSupport ? GR_GL_PATH_MODELVIEW : + GR_GL_MODELVIEW; GL_CALL(MatrixLoadIdentity(matrixMode)); if (!caps().fragmentInputGenSupport) { @@ -356,7 +357,8 @@ void GrGLPathRendering::setProjectionMatrix(const SkMatrix& matrix, GrGLfloat glMatrix[4 * 4]; fHWProjectionMatrixState.getRTAdjustedGLMatrix<4>(glMatrix); GrGLenum matrixMode = - fGpu->glStandard() == kGLES_GrGLStandard ? GR_GL_PATH_PROJECTION : GR_GL_PROJECTION; + fGpu->glCaps().nvprSupport() == GrGLCaps::kNormal_NvprSupport ? GR_GL_PATH_PROJECTION : + GR_GL_PROJECTION; GL_CALL(MatrixLoadf(matrixMode, glMatrix)); } |