aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/gl/GrGpuGL.cpp
diff options
context:
space:
mode:
authorGravatar bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-06-01 15:08:19 +0000
committerGravatar bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-06-01 15:08:19 +0000
commitc1d2a58ec8510b226e080f5415a05723a686aab3 (patch)
treebff373cd08c95545e9a674eaf431325e3482d2d2 /src/gpu/gl/GrGpuGL.cpp
parent1f90287df3129cb267422e482c52ebeca6a8990f (diff)
Move GrGpuGL::ProgramCache declaration to header
Review URL: http://codereview.appspot.com/6245083/ git-svn-id: http://skia.googlecode.com/svn/trunk@4113 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu/gl/GrGpuGL.cpp')
-rw-r--r--src/gpu/gl/GrGpuGL.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/gpu/gl/GrGpuGL.cpp b/src/gpu/gl/GrGpuGL.cpp
index 29c7900c45..8817068207 100644
--- a/src/gpu/gl/GrGpuGL.cpp
+++ b/src/gpu/gl/GrGpuGL.cpp
@@ -207,7 +207,8 @@ GrGpuGL::GrGpuGL(const GrGLContextInfo& ctxInfo) : fGLContextInfo(ctxInfo) {
this->initCaps();
- this->createProgramCache();
+ fProgramData = NULL;
+ fProgramCache = new ProgramCache(this->glContextInfo());
#if 0
this->programUnitTest();
@@ -225,7 +226,9 @@ GrGpuGL::~GrGpuGL() {
GL_CALL(UseProgram(0));
}
- this->deleteProgramCache();
+ delete fProgramCache;
+ fProgramCache = NULL;
+ fProgramData = NULL;
// This must be called by before the GrDrawTarget destructor
this->releaseGeometry();