commit 0694ea7f6a16e946972b9c625f434e80eb42bb5f
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Sep 18 13:00:28 2013 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Sep 18 13:00:28 2013 +0000
tree 8a93916e28e1954fc631258bfb2715707fef958c
parent 688d362b4545e1beadebb7ba5886813d7038883c

Fix to allow ovals GM to finish on N7

R=jvanverth@google.com, robertphillips@google.com

Author: bsalomon@google.com

Review URL: https://chromiumcodereview.appspot.com/23477079

git-svn-id: http://skia.googlecode.com/svn/trunk@11340 2bbb7eff-a529-9590-31e7-b0007b416f81

src/gpu/gl/GrGLContext.cpp

diff --git a/src/gpu/gl/GrGLContext.cpp b/src/gpu/gl/GrGLContext.cpp
index 93f3691..097fce2 100644
--- a/src/gpu/gl/GrGLContext.cpp
+++ b/src/gpu/gl/GrGLContext.cpp
@@ -13,6 +13,7 @@
     fGLVersion = ctxInfo.fGLVersion;
     fGLSLGeneration = ctxInfo.fGLSLGeneration;
     fVendor = ctxInfo.fVendor;
+    fRenderer = ctxInfo.fRenderer;
     fExtensions = ctxInfo.fExtensions;
     fIsMesa = ctxInfo.fIsMesa;
     *fGLCaps = *ctxInfo.fGLCaps.get();
@@ -38,6 +39,8 @@
 
             fVendor = GrGLGetVendor(interface);
 
+            fRenderer = GrGLGetRenderer(interface);
+
             fIsMesa = GrGLIsMesaFromVersionString(ver);
 
             fGLCaps->init(*this, interface);
@@ -56,6 +59,7 @@
     fGLVersion = GR_GL_VER(0, 0);
     fGLSLGeneration = static_cast<GrGLSLGeneration>(0);
     fVendor = kOther_GrGLVendor;
+    fRenderer = kOther_GrGLRenderer;
     fIsMesa = false;
     fExtensions.reset();
     fGLCaps->reset();