Browse Source

virtual function table fix for issue_cg_bind

Shalin Shodhan 21 years ago
parent
commit
56b180596c

+ 0 - 2
panda/src/glstuff/glGraphicsStateGuardian_src.cxx

@@ -39,9 +39,7 @@
 #include "colorWriteAttrib.h"
 #include "colorWriteAttrib.h"
 #include "texMatrixAttrib.h"
 #include "texMatrixAttrib.h"
 #include "texGenAttrib.h"
 #include "texGenAttrib.h"
-#ifdef HAVE_CGGL
 #include "cgShaderAttrib.h"
 #include "cgShaderAttrib.h"
-#endif
 #include "materialAttrib.h"
 #include "materialAttrib.h"
 #include "renderModeAttrib.h"
 #include "renderModeAttrib.h"
 #include "fogAttrib.h"
 #include "fogAttrib.h"

+ 1 - 4
panda/src/glstuff/glGraphicsStateGuardian_src.h

@@ -35,9 +35,7 @@
 #include "graphicsWindow.h"
 #include "graphicsWindow.h"
 #include "pset.h"
 #include "pset.h"
 #include "pmap.h"
 #include "pmap.h"
-#ifdef HAVE_CGGL
 #include "cgShader.h"
 #include "cgShader.h"
-#endif
 class PlaneNode;
 class PlaneNode;
 class Light;
 class Light;
 
 
@@ -111,9 +109,8 @@ public:
   virtual void issue_fog(const FogAttrib *attrib);
   virtual void issue_fog(const FogAttrib *attrib);
   virtual void issue_depth_offset(const DepthOffsetAttrib *attrib);
   virtual void issue_depth_offset(const DepthOffsetAttrib *attrib);
   virtual void issue_tex_gen(const TexGenAttrib *attrib);
   virtual void issue_tex_gen(const TexGenAttrib *attrib);
-#ifdef HAVE_CGGL
   virtual void issue_cg_shader_bind(const CgShaderAttrib *attrib);
   virtual void issue_cg_shader_bind(const CgShaderAttrib *attrib);
-#endif
+
   //  virtual void issue_stencil(const StencilAttrib *attrib);
   //  virtual void issue_stencil(const StencilAttrib *attrib);
 
 
   virtual void bind_light(PointLight *light_obj, const NodePath &light, 
   virtual void bind_light(PointLight *light_obj, const NodePath &light,