From 4ac8cbba229f882e3d3070cd5e16da480d292d49 Mon Sep 17 00:00:00 2001
From: Shalin Shodhan <shalins@gmail.com>
Date: Tue, 27 Jul 2004 17:45:17 +0000
Subject: [PATCH] Cg shader support added

---
 panda/src/display/graphicsStateGuardian.cxx   | 3 ++-
 panda/src/glgsg/Sources.pp                    | 4 +---
 panda/src/glgsg/glgsg.h                       | 1 +
 panda/src/gsgbase/graphicsStateGuardianBase.h | 2 ++
 panda/src/mesadisplay/mesagsg.h               | 2 ++
 panda/src/wgldisplay/Sources.pp               | 1 +
 6 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/panda/src/display/graphicsStateGuardian.cxx b/panda/src/display/graphicsStateGuardian.cxx
index a13b9c7816..c7ab568b19 100644
--- a/panda/src/display/graphicsStateGuardian.cxx
+++ b/panda/src/display/graphicsStateGuardian.cxx
@@ -228,8 +228,9 @@ release_geom(GeomContext *) {
 void GraphicsStateGuardian::
 set_state_and_transform(const RenderState *state,
                         const TransformState *transform) {
-  set_state(state);
+
   set_transform(transform);
+  set_state(state);
 }
 
 ////////////////////////////////////////////////////////////////////
diff --git a/panda/src/glgsg/Sources.pp b/panda/src/glgsg/Sources.pp
index d5a4a2de86..4d078c3403 100644
--- a/panda/src/glgsg/Sources.pp
+++ b/panda/src/glgsg/Sources.pp
@@ -1,9 +1,7 @@
 #define BUILD_DIRECTORY $[HAVE_GL]
-
 #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \
                    dtoolutil:c dtoolbase:c dtool:m
-#define USE_PACKAGES gl
-
+#define USE_PACKAGES gl cg cggl
 #begin lib_target
   #define TARGET glgsg
   #define LOCAL_LIBS \
diff --git a/panda/src/glgsg/glgsg.h b/panda/src/glgsg/glgsg.h
index 807f70c660..33cb23a72a 100644
--- a/panda/src/glgsg/glgsg.h
+++ b/panda/src/glgsg/glgsg.h
@@ -35,6 +35,7 @@
 #define EXPCL_GL EXPCL_PANDAGL
 #define EXPTP_GL EXPTP_PANDAGL
 
+
 #ifdef WIN32_VC
 // Must include windows.h before gl.h on NT
 #include <windows.h>
diff --git a/panda/src/gsgbase/graphicsStateGuardianBase.h b/panda/src/gsgbase/graphicsStateGuardianBase.h
index ac2fd3d791..6bbc79746f 100644
--- a/panda/src/gsgbase/graphicsStateGuardianBase.h
+++ b/panda/src/gsgbase/graphicsStateGuardianBase.h
@@ -66,6 +66,7 @@ class AlphaTestAttrib;
 class DepthTestAttrib;
 class DepthWriteAttrib;
 class TexGenAttrib;
+class CgShaderAttrib;
 class CullFaceAttrib;
 class StencilAttrib;
 class ClipPlaneAttrib;
@@ -192,6 +193,7 @@ public:
   virtual void issue_depth_offset(const DepthOffsetAttrib *) { }
   virtual void issue_color_blend(const ColorBlendAttrib *) { }
   virtual void issue_tex_gen(const TexGenAttrib *) { }
+  virtual void issue_cg_shader_bind(const CgShaderAttrib *){}
   virtual void issue_stencil(const StencilAttrib *) { }
   virtual void issue_clip_plane(const ClipPlaneAttrib *) { }
 
diff --git a/panda/src/mesadisplay/mesagsg.h b/panda/src/mesadisplay/mesagsg.h
index c0ca2c218b..892b31f6dd 100644
--- a/panda/src/mesadisplay/mesagsg.h
+++ b/panda/src/mesadisplay/mesagsg.h
@@ -41,6 +41,8 @@
 #define EXPCL_GL EXPCL_PANDAMESA
 #define EXPTP_GL EXPTP_PANDAMESA
 
+#undef HAVE_CGGL // Mesa does not support Nvidia Cg... make sure it tries to compile
+                 // without it
 #include <GL/gl.h>
 #include <GL/glu.h>
 #include <GL/osmesa.h>
diff --git a/panda/src/wgldisplay/Sources.pp b/panda/src/wgldisplay/Sources.pp
index 12d50d24c7..a6cb3c7da7 100644
--- a/panda/src/wgldisplay/Sources.pp
+++ b/panda/src/wgldisplay/Sources.pp
@@ -2,6 +2,7 @@
 
 #define USE_PACKAGES gl
 
+
 #define OTHER_LIBS interrogatedb:c dconfig:c dtoolconfig:m \
                    dtoolutil:c dtoolbase:c dtool:m