Browse Source

Attempt to fix build without HAVE_CG

rdb 15 years ago
parent
commit
c700c23c28
2 changed files with 6 additions and 4 deletions
  1. 2 2
      panda/src/gobj/shader.cxx
  2. 4 2
      panda/src/gobj/shader.h

+ 2 - 2
panda/src/gobj/shader.cxx

@@ -474,7 +474,7 @@ cp_optimize_mat_spec(ShaderMatSpec &spec) {
 //  Description: 
 //  Description: 
 //               
 //               
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
-void Shader::recurse_parameters(CGparameter parameter, 
+void Shader::cg_recurse_parameters(CGparameter parameter, 
     const ShaderType& type, bool& success) {
     const ShaderType& type, bool& success) {
 
 
   if (parameter == 0)
   if (parameter == 0)
@@ -1469,7 +1469,7 @@ cg_analyze_entry_point(CGprogram prog, ShaderType type) {
   CGparameter parameter;
   CGparameter parameter;
   bool success = true;
   bool success = true;
 
 
-  recurse_parameters(cgGetFirstParameter(prog, CG_PROGRAM),type,success);
+  cg_recurse_parameters(cgGetFirstParameter(prog, CG_PROGRAM),type,success);
   return success;
   return success;
 }
 }
 
 

+ 4 - 2
panda/src/gobj/shader.h

@@ -369,10 +369,12 @@ public:
                           ShaderMatSpec &spec, bool fromflag);
                           ShaderMatSpec &spec, bool fromflag);
   int cp_dependency(ShaderMatInput inp);
   int cp_dependency(ShaderMatInput inp);
   void cp_optimize_mat_spec(ShaderMatSpec &spec);
   void cp_optimize_mat_spec(ShaderMatSpec &spec);
-  
-  void recurse_parameters(CGparameter parameter, 
+
+#ifdef HAVE_CG
+  void cg_recurse_parameters(CGparameter parameter, 
                           const ShaderType& type, 
                           const ShaderType& type, 
                           bool& success);
                           bool& success);
+#endif
   
   
   bool compile_parameter(const ShaderArgId        &arg_id, 
   bool compile_parameter(const ShaderArgId        &arg_id, 
                          const ShaderArgClass     &arg_class,
                          const ShaderArgClass     &arg_class,