From 56b180596c40bf3a3e923f6df8721e5fe63a49e4 Mon Sep 17 00:00:00 2001 From: Shalin Shodhan Date: Thu, 5 Aug 2004 21:34:52 +0000 Subject: [PATCH] virtual function table fix for issue_cg_bind --- panda/src/glstuff/glGraphicsStateGuardian_src.cxx | 2 -- panda/src/glstuff/glGraphicsStateGuardian_src.h | 5 +---- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/panda/src/glstuff/glGraphicsStateGuardian_src.cxx b/panda/src/glstuff/glGraphicsStateGuardian_src.cxx index d406417d87..e6f6cee540 100644 --- a/panda/src/glstuff/glGraphicsStateGuardian_src.cxx +++ b/panda/src/glstuff/glGraphicsStateGuardian_src.cxx @@ -39,9 +39,7 @@ #include "colorWriteAttrib.h" #include "texMatrixAttrib.h" #include "texGenAttrib.h" -#ifdef HAVE_CGGL #include "cgShaderAttrib.h" -#endif #include "materialAttrib.h" #include "renderModeAttrib.h" #include "fogAttrib.h" diff --git a/panda/src/glstuff/glGraphicsStateGuardian_src.h b/panda/src/glstuff/glGraphicsStateGuardian_src.h index 96afb252f9..4321ead1a7 100644 --- a/panda/src/glstuff/glGraphicsStateGuardian_src.h +++ b/panda/src/glstuff/glGraphicsStateGuardian_src.h @@ -35,9 +35,7 @@ #include "graphicsWindow.h" #include "pset.h" #include "pmap.h" -#ifdef HAVE_CGGL #include "cgShader.h" -#endif class PlaneNode; class Light; @@ -111,9 +109,8 @@ public: virtual void issue_fog(const FogAttrib *attrib); virtual void issue_depth_offset(const DepthOffsetAttrib *attrib); virtual void issue_tex_gen(const TexGenAttrib *attrib); -#ifdef HAVE_CGGL virtual void issue_cg_shader_bind(const CgShaderAttrib *attrib); -#endif + // virtual void issue_stencil(const StencilAttrib *attrib); virtual void bind_light(PointLight *light_obj, const NodePath &light,