aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests/Test.cpp
diff options
context:
space:
mode:
authorGravatar bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-10-13 13:33:08 +0000
committerGravatar bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2011-10-13 13:33:08 +0000
commite295313f019d36be5303673dd0c58c751e516fdb (patch)
tree6b897489326972a4231112894a1a7c6b23e7edcb /tests/Test.cpp
parent1ba7137fc0dcace0c1be1367fe977202c63746ba (diff)
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
Diffstat (limited to 'tests/Test.cpp')
-rw-r--r--tests/Test.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/Test.cpp b/tests/Test.cpp
index e8a16f4d50..55d884d255 100644
--- a/tests/Test.cpp
+++ b/tests/Test.cpp
@@ -8,7 +8,7 @@
#include "Test.h"
#include "GrContext.h"
-#include "SkEGLContext.h"
+#include "SkGLContext.h"
#include "SkTLazy.h"
using namespace skiatest;
@@ -79,12 +79,12 @@ bool Test::run() {
GrContext* GpuTest::GetContext() {
// preserve this order, we want gGrContext destroyed after gEGLContext
- static SkTLazy<SkEGLContext> gEGLContext;
+ static SkTLazy<SkGLContext> gGLContext;
static SkAutoTUnref<GrContext> gGrContext;
if (NULL == gGrContext.get()) {
- gEGLContext.init();
- if (gEGLContext.get()->init(800, 600)) {
+ gGLContext.init();
+ if (gGLContext.get()->init(800, 600)) {
gGrContext.reset(GrContext::Create(kOpenGL_Shaders_GrEngine, NULL));
}
}