From 89069a9bdb00fb4cd60b059daf94546c211b9c83 Mon Sep 17 00:00:00 2001 From: joshualitt Date: Wed, 14 Jan 2015 13:51:18 -0800 Subject: possible bug fix for nvpr TBR=bsalomon@google.com BUG=skia: Review URL: https://codereview.chromium.org/850953003 --- src/gpu/gl/GrGLPathRendering.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/gpu/gl/GrGLPathRendering.cpp') 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)); } -- cgit v1.2.3