TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 10:22:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix annoying compiler warnings

Browse Source
This commit is contained in:
rdb 2008-12-25 14:27:20 +00:00
parent f7770ced0d
commit 1770e50147
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1033,11 +1033,11 @@ cg_release_resources() {
// Description: xyz // Description: xyz
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
CGprogram Shader:: CGprogram Shader::
cg_compile_entry_point(char *entry, const ShaderCaps &caps, bool fshader) cg_compile_entry_point(const char *entry, const ShaderCaps &caps, bool fshader)
{ {
CGprogram prog; CGprogram prog;
CGerror err; CGerror err;
char *compiler_args[100]; const char *compiler_args[100];
int nargs = 0; int nargs = 0;
int active = fshader ? caps._active_fprofile : caps._active_vprofile; int active = fshader ? caps._active_fprofile : caps._active_vprofile;
int ultimate = fshader ? caps._ultimate_fprofile : caps._ultimate_vprofile; int ultimate = fshader ? caps._ultimate_fprofile : caps._ultimate_vprofile;

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

@ -257,7 +257,7 @@ public:
private: private:
ShaderArgType cg_parameter_type(CGparameter p); ShaderArgType cg_parameter_type(CGparameter p);
ShaderArgDir cg_parameter_dir(CGparameter p); ShaderArgDir cg_parameter_dir(CGparameter p);
CGprogram cg_compile_entry_point(char *entry, const ShaderCaps &caps, bool fshader); CGprogram cg_compile_entry_point(const char *entry, const ShaderCaps &caps, bool fshader);
bool cg_analyze_entry_point(CGprogram prog, bool fshader); bool cg_analyze_entry_point(CGprogram prog, bool fshader);
bool cg_analyze_shader(const ShaderCaps &caps); bool cg_analyze_shader(const ShaderCaps &caps);
bool cg_compile_shader(const ShaderCaps &caps); bool cg_compile_shader(const ShaderCaps &caps);

4
panda/src/gobj/vertexDataPage.cxx
View File

@ -404,7 +404,7 @@ make_resident() {
#endif #endif
z_source.opaque = Z_NULL; z_source.opaque = Z_NULL;
z_source.msg = "no error message"; z_source.msg = (char *) "no error message";
z_source.next_in = (Bytef *)(char *)_page_data; z_source.next_in = (Bytef *)(char *)_page_data;
z_source.avail_in = _size; z_source.avail_in = _size;
@ -497,7 +497,7 @@ make_compressed() {
#endif #endif
z_dest.opaque = Z_NULL; z_dest.opaque = Z_NULL;
z_dest.msg = "no error message"; z_dest.msg = (char *) "no error message";
int result = deflateInit(&z_dest, vertex_data_compression_level); int result = deflateInit(&z_dest, vertex_data_compression_level);
if (result < 0) { if (result < 0) {

5
panda/src/gobj/vertexDataSaveFile.cxx
View File

@ -131,7 +131,10 @@ VertexDataSaveFile(const Filename &directory, const string &prefix,
if (result == 0) { if (result == 0) {
// We've got the file. Truncate it first, for good measure, in // We've got the file. Truncate it first, for good measure, in
// case there's an old version of the file we picked up. // case there's an old version of the file we picked up.
ftruncate(_fd, 0); if (ftruncate(_fd, 0) < 0) {
gobj_cat.warning()
<< "Couldn't truncate vertex data save file.\n";
}
// On Unix, it's safe to unlink (delete) the temporary file // On Unix, it's safe to unlink (delete) the temporary file
// after it's been opened. The file remains open, but // after it's been opened. The file remains open, but