commit e295313f019d36be5303673dd0c58c751e516fdb
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Oct 13 13:33:08 2011 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Oct 13 13:33:08 2011 +0000
tree 6b897489326972a4231112894a1a7c6b23e7edcb
parent 1ba7137fc0dcace0c1be1367fe977202c63746ba

move utils/SkEGLContext to gpu/SkGLContext, some gpu.gyp cleanup, set eol style LF on all gpu files

Review URL: http://codereview.appspot.com/5242056/



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

gm/gmmain.cpp

diff --git a/gm/gmmain.cpp b/gm/gmmain.cpp
index e74b0bc..1f10c5a 100644
--- a/gm/gmmain.cpp
+++ b/gm/gmmain.cpp
@@ -12,7 +12,7 @@
 #include "SkColorPriv.h"
 #include "SkData.h"
 #include "SkDevice.h"
-#include "SkEGLContext.h"
+#include "SkGLContext.h"
 #include "SkGpuCanvas.h"
 #include "SkGpuDevice.h"
 #include "SkGraphics.h"
@@ -606,9 +606,9 @@
         maxH = SkMax32(size.height(), maxH);
     }
     // setup a GL context for drawing offscreen
-    SkEGLContext eglContext;
+    SkGLContext glContext;
     GrRenderTarget* rt = NULL;
-    if (eglContext.init(maxW, maxH)) {
+    if (glContext.init(maxW, maxH)) {
         gGrContext = GrContext::CreateGLShaderContext();
         if (NULL != gGrContext) {
             GrPlatformSurfaceDesc desc;
@@ -617,7 +617,7 @@
             desc.fWidth = maxW;
             desc.fHeight = maxH;
             desc.fStencilBits = 8;
-            desc.fPlatformRenderTarget = eglContext.getFBOID();
+            desc.fPlatformRenderTarget = glContext.getFBOID();
             desc.fSurfaceType = kRenderTarget_GrPlatformSurfaceType;
             rt = static_cast<GrRenderTarget*>(gGrContext->createPlatformSurface(desc));
             if (NULL == rt) {