commit 71cd868d1411a7f212e93b70a7f90fccb6b7944b
author daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu Apr 29 03:35:25 2010 +0000
committer daniel@transgaming.com <daniel@transgaming.com@736b8ea6-26fd-11df-bfd4-992fa37f6226> Thu Apr 29 03:35:25 2010 +0000
tree 53d4f6f8abe3999f5dd7f60c14df54d8b93460d9
parent feba9ba5e60ef66afe928b4996a5a1d964d64d3a

Deleting program does not delete shaders that are marked

TRAC #12012

Also fixes failure to delete flagged program upon glUseProgram(0).

Signed-off-by: Nicolas Capens
Signed-off-by: Daniel Koch

Author:    Andrew Lewycky

git-svn-id: https://angleproject.googlecode.com/svn/trunk@201 736b8ea6-26fd-11df-bfd4-992fa37f6226

src/libGLESv2/Program.cpp

diff --git a/src/libGLESv2/Program.cpp b/src/libGLESv2/Program.cpp
index aa74319..18a46c0 100644
--- a/src/libGLESv2/Program.cpp
+++ b/src/libGLESv2/Program.cpp
@@ -58,6 +58,16 @@
 Program::~Program()
 {
     unlink(true);
+
+    if (mVertexShader != NULL)
+    {
+        mVertexShader->detach();
+    }
+
+    if (mFragmentShader != NULL)
+    {
+        mFragmentShader->detach();
+    }
 }
 
 bool Program::attachShader(Shader *shader)