mingzailao
/
mitsuba
mirror of https://github.com/Quartenia/mitsuba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

updated nvidia suppressions file for valgrind, fixed path resolution error in mitsuba.cpp

metadata
Wenzel Jakob 2010-09-13 21:35:46 +02:00
parent a5035b6b10
commit 7ecd3a5e73
4 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hgignore
View File

@ -60,3 +60,4 @@ tools/windows/mitsuba_res.res
^.externalToolBuilders/.*$ ^.externalToolBuilders/.*$
^.settings/.*$ ^.settings/.*$
^.cproject$ ^.cproject$
^.project$

3
src/mitsuba/mitsuba.cpp
View File

@ -95,7 +95,7 @@ int ubi_main(int argc, char **argv) {
networkHosts = "", destFile=""; networkHosts = "", destFile="";
bool quietMode = false, progressBars = true, skipExisting = false; bool quietMode = false, progressBars = true, skipExisting = false;
ELogLevel logLevel = EInfo; ELogLevel logLevel = EInfo;
FileResolver *fileResolver = Thread::getThread()->getFileResolver(); ref<FileResolver> fileResolver = Thread::getThread()->getFileResolver();
bool testCaseMode = false; bool testCaseMode = false;
std::map<std::string, std::string> parameters; std::map<std::string, std::string> parameters;
int blockSize = 32; int blockSize = 32;
@ -296,6 +296,7 @@ int ubi_main(int argc, char **argv) {
baseName = fs::basename(filename); baseName = fs::basename(filename);
ref<FileResolver> frClone = fileResolver->clone(); ref<FileResolver> frClone = fileResolver->clone();
frClone->addPath(filePath); frClone->addPath(filePath);
Thread::getThread()->setFileResolver(frClone);
SLog(EInfo, "Parsing scene description from \"%s\" ..", argv[i]); SLog(EInfo, "Parsing scene description from \"%s\" ..", argv[i]);

4
src/shapes/obj.cpp
View File

@ -277,8 +277,12 @@ public:
vertex.v = vertices.at(vertexId); vertex.v = vertices.at(vertexId);
if (hasNormals) if (hasNormals)
vertex.n = normals.at(normalId); vertex.n = normals.at(normalId);
else
vertex.n = Normal(0.0f);
if (hasTexcoords) if (hasTexcoords)
vertex.uv = texcoords.at(uvId); vertex.uv = texcoords.at(uvId);
else
vertex.uv = Point2(0.0f);
if (vertexMap.find(vertex) != vertexMap.end()) { if (vertexMap.find(vertex) != vertexMap.end()) {
key = vertexMap[vertex]; key = vertexMap[vertex];

20
tools/linux/nvidia.supp
View File

@ -1,7 +1,7 @@
{ {
<insert_a_suppression_name_here> <insert_a_suppression_name_here>
Memcheck:Cond Memcheck:Cond
obj:/usr/lib/libGLcore.so.195.36.31 obj:/usr/lib/libnvidia-glcore.so.256.44
obj:* obj:*
obj:* obj:*
obj:* obj:*
@ -14,7 +14,7 @@
<insert_a_suppression_name_here> <insert_a_suppression_name_here>
Memcheck:Cond Memcheck:Cond
fun:strcpy fun:strcpy
obj:/usr/lib/libGLcore.so.195.36.31 obj:/usr/lib/libnvidia-glcore.so.256.44
obj:* obj:*
obj:* obj:*
obj:* obj:*
@ -26,7 +26,7 @@
{ {
<insert_a_suppression_name_here> <insert_a_suppression_name_here>
Memcheck:Value8 Memcheck:Value8
obj:/usr/lib/libGLcore.so.195.36.31 obj:/usr/lib/libnvidia-glcore.so.256.44
obj:* obj:*
obj:* obj:*
obj:* obj:*
@ -39,7 +39,7 @@
<insert_a_suppression_name_here> <insert_a_suppression_name_here>
Memcheck:Cond Memcheck:Cond
fun:strcmp fun:strcmp
obj:/usr/lib/libGLcore.so.195.36.31 obj:/usr/lib/libnvidia-glcore.so.256.44
obj:* obj:*
obj:* obj:*
obj:* obj:*
@ -52,7 +52,7 @@
<insert_a_suppression_name_here> <insert_a_suppression_name_here>
Memcheck:Cond Memcheck:Cond
fun:strlen fun:strlen
obj:/usr/lib/libGLcore.so.195.36.31 obj:/usr/lib/libnvidia-glcore.so.256.44
obj:* obj:*
obj:* obj:*
obj:* obj:*
@ -64,23 +64,23 @@
{ {
<insert_a_suppression_name_here> <insert_a_suppression_name_here>
Memcheck:Cond Memcheck:Cond
obj:/usr/lib/libGLcore.so.195.36.31 obj:/usr/lib/libnvidia-glcore.so.256.44
} }
{ {
<insert_a_suppression_name_here> <insert_a_suppression_name_here>
Memcheck:Param Memcheck:Param
ioctl(generic) ioctl(generic)
fun:ioctl fun:ioctl
obj:/usr/lib/libGLcore.so.195.36.31 obj:/usr/lib/libnvidia-glcore.so.256.44
obj:/usr/lib/libGLcore.so.195.36.31 obj:/usr/lib/libnvidia-glcore.so.256.44
} }
{ {
<insert_a_suppression_name_here> <insert_a_suppression_name_here>
Memcheck:Param Memcheck:Param
ioctl(generic) ioctl(generic)
fun:ioctl fun:ioctl
obj:/usr/lib/libGLcore.so.195.36.31 obj:/usr/lib/libnvidia-glcore.so.256.44
obj:/usr/lib/libGLcore.so.195.36.31 obj:/usr/lib/libnvidia-glcore.so.256.44
obj:* obj:*
obj:* obj:*
obj:* obj:*