commit f6f123d23608a4a5fe9c812d2452039a18da7e0b
author robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Mar 21 17:57:55 2012 +0000
committer robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Mar 21 17:57:55 2012 +0000
tree 2ce9c1b548b14dcf47fa5f8e77d170580cfe0e3a
parent 008c498b58e674c6fe595a359e3adbafddd05540

Added tracking of frame buffer objects to debug GL interface

http://codereview.appspot.com/5866043/




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

src/gpu/gl/GrGpuGLShaders.cpp

diff --git a/src/gpu/gl/GrGpuGLShaders.cpp b/src/gpu/gl/GrGpuGLShaders.cpp
index db7e3a7..cb156f7 100644
--- a/src/gpu/gl/GrGpuGLShaders.cpp
+++ b/src/gpu/gl/GrGpuGLShaders.cpp
@@ -125,6 +125,7 @@
 void GrGpuGLShaders::abandonResources(){
     INHERITED::abandonResources();
     fProgramCache->abandon();
+    fHWProgramID = 0;
 }
 
 void GrGpuGLShaders::DeleteProgram(const GrGLInterface* gl,
@@ -326,6 +327,13 @@
 }
 
 GrGpuGLShaders::~GrGpuGLShaders() {
+
+    if (fProgramData && 0 != fHWProgramID) {
+        // detach the current program so there is no confusion on OpenGL's part
+        // that we want it to be deleted
+        SkASSERT(fHWProgramID == fProgramData->fProgramID);
+        GL_CALL(UseProgram(0));
+    }
     delete fProgramCache;
 }