TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-30 16:58:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

shader: //Cg profile should only affect the current shader

Browse Source 
Fixes #863
This commit is contained in:
rdb 2020-01-31 11:01:44 +01:00
parent dbb65549ea
commit e13e9851f2
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
panda/src/gobj/shader.cxx
View File

@ -2461,9 +2461,10 @@ read(const ShaderFile &sfile, BamCacheRecord *record) {
// Determine which language the shader is written in.
if (_language == SL_Cg) {
#ifdef HAVE_CG
cg_get_profile_from_header(_default_caps);
ShaderCaps caps = _default_caps;
cg_get_profile_from_header(caps);
if (!cg_analyze_shader(_default_caps)) {
if (!cg_analyze_shader(caps)) {
shader_cat.error()
<< "Shader encountered an error.\n";
return false;
@ -2551,9 +2552,10 @@ load(const ShaderFile &sbody, BamCacheRecord *record) {
// Determine which language the shader is written in.
if (_language == SL_Cg) {
#ifdef HAVE_CG
cg_get_profile_from_header(_default_caps);
ShaderCaps caps = _default_caps;
cg_get_profile_from_header(caps);
if (!cg_analyze_shader(_default_caps)) {
if (!cg_analyze_shader(caps)) {
shader_cat.error()
<< "Shader encountered an error.\n";
return false;