TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-02 09:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

compilation errors

Browse Source
This commit is contained in:
David Rose 2010-04-12 18:55:31 +00:00
parent 1708bea71b
commit 848d439f72
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
panda/src/gobj/shader.I
View File

@ -45,10 +45,10 @@ get_filename(const ShaderType &type) const {
// Access: Public // Access: Public
// Description: Return the Shader's text for the given shader type. // Description: Return the Shader's text for the given shader type.
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
INLINE const string Shader:: INLINE const string &Shader::
get_text(const ShaderType &type) const { get_text(const ShaderType &type) const {
if (_text->_separate) { if (_text->_separate) {
nassertr(type != ST_none || !_text->_shared.empty(), ""); nassertr(type != ST_none || !_text->_shared.empty(), _text->_shared);
switch (type) { switch (type) {
case ST_vertex: case ST_vertex:
return _text->_vertex; return _text->_vertex;

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

@ -468,6 +468,7 @@ cp_optimize_mat_spec(ShaderMatSpec &spec) {
spec._dep[1] = cp_dependency(spec._part[1]); spec._dep[1] = cp_dependency(spec._part[1]);
} }
#ifdef HAVE_CG
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Function: Shader::cg_recurse_parameters // Function: Shader::cg_recurse_parameters
// Access: Public // Access: Public
@ -519,6 +520,7 @@ void Shader::cg_recurse_parameters(CGparameter parameter,
} }
} while((parameter = cgGetNextParameter(parameter))!= 0); } while((parameter = cgGetNextParameter(parameter))!= 0);
} }
#endif // HAVE_CG
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
// Function: Shader::compile_parameter // Function: Shader::compile_parameter