summaryrefslogtreecommitdiffstats
path: root/thirdparty/embree/kernels/common/state.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'thirdparty/embree/kernels/common/state.cpp')
-rw-r--r--thirdparty/embree/kernels/common/state.cpp19
1 files changed, 13 insertions, 6 deletions
diff --git a/thirdparty/embree/kernels/common/state.cpp b/thirdparty/embree/kernels/common/state.cpp
index db6b803041..1d73ae9629 100644
--- a/thirdparty/embree/kernels/common/state.cpp
+++ b/thirdparty/embree/kernels/common/state.cpp
@@ -192,10 +192,17 @@ namespace embree
const char* symbols[3] = { "=", ",", "|" };
bool State::parseFile(const FileName& fileName)
- {
- FILE* f = fopen(fileName.c_str(),"r");
- if (!f) return false;
- Ref<Stream<int> > file = new FileStream(f,fileName);
+ {
+ Ref<Stream<int> > file;
+ // -- GODOT start --
+ // try {
+ file = new FileStream(fileName);
+ // }
+ // catch (std::runtime_error& e) {
+ // (void) e;
+ // return false;
+ // }
+ // -- GODOT end --
std::vector<std::string> syms;
for (size_t i=0; i<sizeof(symbols)/sizeof(void*); i++)
@@ -393,7 +400,7 @@ namespace embree
grid_accel = cin->get().Identifier();
else if (tok == Token::Id("grid_accel_mb") && cin->trySymbol("="))
grid_accel_mb = cin->get().Identifier();
-
+
else if (tok == Token::Id("verbose") && cin->trySymbol("="))
verbose = cin->get().Int();
else if (tok == Token::Id("benchmark") && cin->trySymbol("="))
@@ -419,7 +426,7 @@ namespace embree
} while (cin->trySymbol("|"));
}
}
-
+
else if (tok == Token::Id("max_spatial_split_replications") && cin->trySymbol("="))
max_spatial_split_replications = cin->get().Float();