From aa7a6bb5f7cdf0e177b36a06f786fb59f139e72f Mon Sep 17 00:00:00 2001 From: David Rose Date: Mon, 1 Jun 2009 23:27:32 +0000 Subject: [PATCH] protect for cg 1.x --- panda/src/glstuff/glGraphicsStateGuardian_src.cxx | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/panda/src/glstuff/glGraphicsStateGuardian_src.cxx b/panda/src/glstuff/glGraphicsStateGuardian_src.cxx index b3b0d503ec..19f15a127b 100644 --- a/panda/src/glstuff/glGraphicsStateGuardian_src.cxx +++ b/panda/src/glstuff/glGraphicsStateGuardian_src.cxx @@ -760,11 +760,15 @@ reset() { } else { _shader_caps._active_vprofile = (int)cgGLGetLatestProfile(CG_GL_VERTEX); _shader_caps._active_fprofile = (int)cgGLGetLatestProfile(CG_GL_FRAGMENT); +#ifdef CG_CL_GEOMETRY _shader_caps._active_gprofile = (int)cgGLGetLatestProfile(CG_GL_GEOMETRY); // CG2 CHANGE +#endif } _shader_caps._ultimate_vprofile = (int)CG_PROFILE_VP40; _shader_caps._ultimate_fprofile = (int)CG_PROFILE_FP40; +#ifdef CG_PROFILE_GPU_CP _shader_caps._ultimate_gprofile = (int)CG_PROFILE_GPU_GP; // CG2 CHANGE +#endif _glBindProgram = (PFNGLBINDPROGRAMARBPROC) get_extension_func(GLPREFIX_QUOTED, "BindProgramARB"); // Bug workaround for radeons.