From 5f4fe3bc3277ed9b19a29207fa50b12314f89eca Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Sat, 12 Sep 2009 10:45:49 +0000
Subject: [PATCH] Fix some compiler warnings

---
 panda/src/glstuff/glGraphicsStateGuardian_src.cxx | 4 ----
 panda/src/glstuff/glShaderContext_src.cxx         | 7 ++++++-
 panda/src/glstuff/glShaderContext_src.h           | 3 ---
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/panda/src/glstuff/glGraphicsStateGuardian_src.cxx b/panda/src/glstuff/glGraphicsStateGuardian_src.cxx
index 145904c5e0..9664348655 100644
--- a/panda/src/glstuff/glGraphicsStateGuardian_src.cxx
+++ b/panda/src/glstuff/glGraphicsStateGuardian_src.cxx
@@ -122,15 +122,11 @@ CPT(Shader::ShaderFile) default_shader_name = new Shader::ShaderFile("default-sh
 CPT(Shader::ShaderFile) default_shader_body = new Shader::ShaderFile("\
 uniform mediump mat4 p3d_ModelViewProjectionMatrix;\
 attribute highp vec4 p3d_Vertex;\
-
 void main(void) {\
-
   gl_Position = p3d_ModelViewProjectionMatrix * p3d_Vertex;\
 }\n",
 "void main(void) {\
-
   gl_FragColor = vec4(1.0, 0.0, 0.0, 1.0);\
-
 }\n");
 #endif
 
diff --git a/panda/src/glstuff/glShaderContext_src.cxx b/panda/src/glstuff/glShaderContext_src.cxx
index cc2f860520..9e3e96475e 100755
--- a/panda/src/glstuff/glShaderContext_src.cxx
+++ b/panda/src/glstuff/glShaderContext_src.cxx
@@ -354,6 +354,9 @@ release_resources(GSG *gsg) {
   if (_cg_context) {
     cgDestroyContext(_cg_context);
     _cg_context  = 0;
+    if (_cg_vprogram != 0) cgDestroyProgram(_cg_vprogram);
+    if (_cg_fprogram != 0) cgDestroyProgram(_cg_fprogram);
+    if (_cg_gprogram != 0) cgDestroyProgram(_cg_gprogram);
     _cg_vprogram = 0;
     _cg_fprogram = 0;
     _cg_gprogram = 0;
@@ -492,6 +495,8 @@ issue_parameters(GSG *gsg, int altered) {
     return;
   }
 
+  //FIXME: this could be much faster if we used deferred parameter setting.
+
   for (int i=0; i<(int)_shader->_mat_spec.size(); i++) {
     if (altered & (_shader->_mat_spec[i]._dep[0] | _shader->_mat_spec[i]._dep[1])) {
       const LMatrix4f *val = gsg->fetch_specified_value(_shader->_mat_spec[i], altered);
@@ -840,7 +845,7 @@ update_shader_texture_bindings(CLP(ShaderContext) *prev, GSG *gsg) {
 ////////////////////////////////////////////////////////////////////
 #ifdef HAVE_CG
 void CLP(ShaderContext)::
-cg_report_errors() {
+  cg_report_errors() {
   CGerror err = cgGetError();
   if (err != CG_NO_ERROR) {
     GLCAT.error() << cgGetErrorString(err) << "\n";
diff --git a/panda/src/glstuff/glShaderContext_src.h b/panda/src/glstuff/glShaderContext_src.h
index 0d309adf79..8e2b23f8f4 100755
--- a/panda/src/glstuff/glShaderContext_src.h
+++ b/panda/src/glstuff/glShaderContext_src.h
@@ -55,10 +55,7 @@ private:
   CGcontext _cg_context;
   CGprogram _cg_vprogram;
   CGprogram _cg_fprogram;
-
-  // BEGIN CG2 CHANGE
   CGprogram _cg_gprogram;
-  // END CG2 CHANGE
 
   pvector <CGparameter> _cg_parameter_map;
   void cg_report_errors();