TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 17:35:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

handle incorrect display modules better

Browse Source
This commit is contained in:
David Rose 2012-01-09 23:30:31 +00:00
parent 59fb785d68
commit 15d2441661
1 changed files with 39 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
panda/src/display/graphicsPipeSelection.cxx
View File

@ -355,6 +355,8 @@ load_aux_modules() {
////////////////////////////////////////////////////////////////////
bool GraphicsPipeSelection::
add_pipe_type(TypeHandle type, PipeConstructorFunc *func) {
nassertr(func != NULL, false);
if (!type.is_derived_from(GraphicsPipe::get_class_type())) {
display_cat.warning()
<< "Attempt to register " << type << " as a GraphicsPipe type.\n";
@ -375,6 +377,11 @@ add_pipe_type(TypeHandle type, PipeConstructorFunc *func) {
}
}
if (display_cat.is_debug()) {
display_cat.debug()
<< "Registering " << type << " as a GraphicsPipe type.\n";
}
// Ok, now add a new entry.
_pipe_types.push_back(PipeType(type, func));
@ -455,39 +462,43 @@ load_named_module(const string &name) {
<< "symbol of " << symbol_name << " = " << dso_symbol << "\n";
}
TypeHandle pipe_type = TypeHandle::none();
if (dso_symbol == (void *)NULL) {
// Couldn't find the module function.
unload_dso(handle);
return TypeHandle::none();
}
// We successfully loaded the module, and we found the
// get_pipe_type_* recommendation function. Call it to figure
// out what pipe type we should expect.
typedef int FuncType();
int pipe_type_index = (*(FuncType *)dso_symbol)();
if (display_cat.is_debug()) {
display_cat.debug()
<< "pipe_type_index = " << pipe_type_index << "\n";
}
display_cat.warning()
<< "Unable to find " << symbol_name << " in " << dlname.get_basename()
<< "\n";
if (pipe_type_index == 0) {
// The recommendation function had no advice, weird.
unload_dso(handle);
return TypeHandle::none();
} else {
// We successfully loaded the module, and we found the
// get_pipe_type_* recommendation function. Call it to figure
// out what pipe type we should expect.
typedef int FuncType();
int pipe_type_index = (*(FuncType *)dso_symbol)();
if (display_cat.is_debug()) {
display_cat.debug()
<< "pipe_type_index = " << pipe_type_index << "\n";
}
if (pipe_type_index != 0) {
TypeRegistry *type_reg = TypeRegistry::ptr();
pipe_type = type_reg->find_type_by_id(pipe_type_index);
if (display_cat.is_debug()) {
display_cat.debug()
<< "pipe_type = " << pipe_type << "\n";
}
}
}
TypeRegistry *type_reg = TypeRegistry::ptr();
TypeHandle pipe_type = type_reg->find_type_by_id(pipe_type_index);
if (display_cat.is_debug()) {
display_cat.debug()
<< "pipe_type = " << pipe_type << "\n";
}
if (pipe_type == TypeHandle::none()) {
// The recommendation function returned a bogus type index, weird.
unload_dso(handle);
return TypeHandle::none();
// The recommendation function returned a bogus type index, or the
// function didn't work at all. We can't safely unload the
// module, though, because it may have assigned itself into the
// GraphicsPipeSelection table. So we carry on.
display_cat.warning()
<< "No default pipe type available for " << dlname.get_basename()
<< "\n";
}
LoadedModule &module = _loaded_modules[name];