Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

path tracer pull #21

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .README.md.swp
Binary file not shown.
Binary file added PROJ1_WIN/565Raytracer.sdf
Binary file not shown.
Binary file added PROJ1_WIN/565Raytracer.suo
Binary file not shown.
35 changes: 35 additions & 0 deletions PROJ1_WIN/565Raytracer/Debug/565Raytracer.Build.CppClean.log
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
S:\GitHub\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\565Raytracer.exe.embed.manifest
S:\GITHUB\PROJECT1-RAYTRACER\PROJ1_WIN\565RAYTRACER\DEBUG\565RAYTRACER.EXE.EMBED.MANIFEST.RES
S:\GITHUB\PROJECT1-RAYTRACER\PROJ1_WIN\565RAYTRACER\DEBUG\565RAYTRACER.EXE.INTERMEDIATE.MANIFEST
S:\GitHub\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\565Raytracer_manifest.rc
S:\GitHub\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\cl.command.1.tlog
S:\GitHub\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\CL.read.1.tlog
S:\GitHub\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\CL.write.1.tlog
S:\GITHUB\PROJECT1-RAYTRACER\PROJ1_WIN\565RAYTRACER\DEBUG\GLSLUTILITY.OBJ
S:\GITHUB\PROJECT1-RAYTRACER\PROJ1_WIN\565RAYTRACER\DEBUG\IMAGE.OBJ
S:\GitHub\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\link.7144.read.1.tlog
S:\GitHub\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\link.7144.write.1.tlog
S:\GitHub\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\link.7144-cvtres.read.1.tlog
S:\GitHub\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\link.7144-cvtres.write.1.tlog
S:\GitHub\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\link.command.1.tlog
S:\GitHub\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\link.read.1.tlog
S:\GitHub\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\link.write.1.tlog
S:\GitHub\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\link-cvtres.read.1.tlog
S:\GitHub\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\link-cvtres.write.1.tlog
S:\GITHUB\PROJECT1-RAYTRACER\PROJ1_WIN\565RAYTRACER\DEBUG\MAIN.OBJ
S:\GitHub\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\mt.command.1.tlog
S:\GitHub\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\mt.read.1.tlog
S:\GitHub\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\mt.write.1.tlog
S:\GitHub\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\raytraceKernel.cu.cache
S:\GitHub\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\rc.command.1.tlog
S:\GitHub\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\rc.read.1.tlog
S:\GitHub\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\rc.write.1.tlog
S:\GITHUB\PROJECT1-RAYTRACER\PROJ1_WIN\565RAYTRACER\DEBUG\SCENE.OBJ
S:\GITHUB\PROJECT1-RAYTRACER\PROJ1_WIN\565RAYTRACER\DEBUG\STB_IMAGE.OBJ
S:\GITHUB\PROJECT1-RAYTRACER\PROJ1_WIN\565RAYTRACER\DEBUG\STB_IMAGE_WRITE.OBJ
S:\GITHUB\PROJECT1-RAYTRACER\PROJ1_WIN\565RAYTRACER\DEBUG\UTILITIES.OBJ
S:\GitHub\Project1-RayTracer\PROJ1_WIN\565Raytracer\Debug\vc100.idb
S:\GITHUB\PROJECT1-RAYTRACER\PROJ1_WIN\565RAYTRACER\DEBUG\VC100.PDB
S:\GITHUB\PROJECT1-RAYTRACER\PROJ1_WIN\DEBUG\565RAYTRACER.EXE
S:\GITHUB\PROJECT1-RAYTRACER\PROJ1_WIN\DEBUG\565RAYTRACER.ILK
S:\GITHUB\PROJECT1-RAYTRACER\PROJ1_WIN\DEBUG\565RAYTRACER.PDB
10 changes: 10 additions & 0 deletions PROJ1_WIN/565Raytracer/Debug/565Raytracer.exe.embed.manifest
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
<security>
<requestedPrivileges>
<requestedExecutionLevel level="asInvoker" uiAccess="false"></requestedExecutionLevel>
</requestedPrivileges>
</security>
</trustInfo>
</assembly>
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
<assembly xmlns='urn:schemas-microsoft-com:asm.v1' manifestVersion='1.0'>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
<security>
<requestedPrivileges>
<requestedExecutionLevel level='asInvoker' uiAccess='false' />
</requestedPrivileges>
</security>
</trustInfo>
</assembly>
2 changes: 2 additions & 0 deletions PROJ1_WIN/565Raytracer/Debug/565Raytracer.lastbuildstate
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#v4.0:v100:false
Debug|Win32|S:\GitHub\Project1-RayTracer\PROJ1_WIN\|
73 changes: 73 additions & 0 deletions PROJ1_WIN/565Raytracer/Debug/565Raytracer.log
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
Build started 9/29/2013 3:18:46 PM.
1>Project "S:\GitHub\Project1-RayTracer\PROJ1_WIN\565Raytracer\565Raytracer.vcxproj" on node 2 (build target(s)).
1>InitializeBuildStatus:
Creating "Debug\565Raytracer.unsuccessfulbuild" because "AlwaysCreate" was specified.
AddCudaCompileDeps:
c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\cl.exe /E /nologo /showIncludes /TP /I"C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v4.0\include" /I"C:/ProgramData/NVIDIA Corporation/NVIDIA GPU Computing SDK 4.0/C/common/inc" /I../shared/glew/includes /I../shared/freeglut/includes /I"C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v4.0\bin" /I"C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v4.0\include" /I. /FIcuda_runtime.h /c S:\GitHub\Project1-RayTracer\src\raytraceKernel.cu
AddCudaCompilePropsDeps:
Skipping target "AddCudaCompilePropsDeps" because all output files are up-to-date with respect to the input files.
CudaBuild:
Compiling CUDA source file ..\..\src\raytraceKernel.cu...
cmd.exe /C "C:\Users\dbanks\AppData\Local\Temp\117d8180fa02461083f6a46070782de5.cmd"
"C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v4.0\bin\nvcc.exe" -gencode=arch=compute_10,code=\"sm_10,compute_10\" --use-local-env --cl-version 2010 -ccbin "c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin" -I"C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v4.0\include" -I"C:/ProgramData/NVIDIA Corporation/NVIDIA GPU Computing SDK 4.0/C/common/inc" -I"../shared/glew/includes" -I"../shared/freeglut/includes" -I"C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v4.0\include" -G0 --keep-dir "Debug" -maxrregcount=0 --machine 32 --compile -D_NEXUS_DEBUG -g -Xcompiler "/EHsc /nologo /Od /Zi /MDd " -o "S:\GitHub\Project1-RayTracer\PROJ1_WIN\565Raytracer\Win32/Debug/raytraceKernel.cu.obj" "S:\GitHub\Project1-RayTracer\src\raytraceKernel.cu"

C:\user>"C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v4.0\bin\nvcc.exe" -gencode=arch=compute_10,code=\"sm_10,compute_10\" --use-local-env --cl-version 2010 -ccbin "c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin" -I"C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v4.0\include" -I"C:/ProgramData/NVIDIA Corporation/NVIDIA GPU Computing SDK 4.0/C/common/inc" -I"../shared/glew/includes" -I"../shared/freeglut/includes" -I"C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v4.0\include" -G0 --keep-dir "Debug" -maxrregcount=0 --machine 32 --compile -D_NEXUS_DEBUG -g -Xcompiler "/EHsc /nologo /Od /Zi /MDd " -o "S:\GitHub\Project1-RayTracer\PROJ1_WIN\565Raytracer\Win32/Debug/raytraceKernel.cu.obj" "S:\GitHub\Project1-RayTracer\src\raytraceKernel.cu"
raytraceKernel.cu
tmpxft_00000e08_00000000-0_raytraceKernel.cudafe1.gpu
tmpxft_00000e08_00000000-5_raytraceKernel.cudafe2.gpu
raytraceKernel.cu
1>s:\github\project1-raytracer\src\glm\core\_swizzle.hpp(194): warning : missing return statement at end of non-void function "glm::detail::_swizzle_base2<ValueType, VecType, N, E0, E1, E2, E3, 1>::operator=(const glm::detail::_swizzle_base2<ValueType, VecType, N, E0, E1, E2, E3, 1>::Stub &)"

1>ptxas C : /Users/dbanks/AppData/Local/Temp/tmpxft_00000e08_00000000-1_raytraceKernel.ptx, line 260; warning : Double is not supported. Demoting to float
tmpxft_00000e08_00000000-0_raytraceKernel.cudafe1.cpp
tmpxft_00000e08_00000000-11_raytraceKernel.ii
ClCompile:
c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\CL.exe /c /I"C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v4.0\include" /I"C:\ProgramData\NVIDIA Corporation\NVIDIA GPU Computing SDK 4.0\C\common\inc" /I../shared/glew/include /I../shared/freeglut/include /I"C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v4.0\include" /ZI /nologo /W3 /WX- /Od /Oy- /D WIN32 /D _DEBUG /D _CONSOLE /D _UNICODE /D UNICODE /Gm /EHsc /RTC1 /MDd /GS /fp:precise /Zc:wchar_t /Zc:forScope /Fo"Debug\\" /Fd"Debug\vc100.pdb" /Gd /TP /analyze- /errorReport:prompt ..\..\src\main.cpp ..\..\src\scene.cpp ..\..\src\utilities.cpp
utilities.cpp
main.cpp
Note: including lib: glut32.lib

1>s:\github\project1-raytracer\src\main.cpp(108): warning C4018: '<' : signed/unsigned mismatch
1>s:\github\project1-raytracer\src\main.cpp(117): warning C4018: '<' : signed/unsigned mismatch
1>s:\github\project1-raytracer\src\main.cpp(120): warning C4018: '<' : signed/unsigned mismatch
Generating Code...
Compiling...
scene.cpp
1>s:\github\project1-raytracer\src\scene.cpp(150): warning C4244: '=' : conversion from 'double' to 'float', possible loss of data
1>s:\github\project1-raytracer\src\scene.cpp(204): warning C4244: 'initializing' : conversion from 'double' to 'float', possible loss of data
1>s:\github\project1-raytracer\src\scene.cpp(206): warning C4244: 'initializing' : conversion from 'double' to 'float', possible loss of data
1>s:\github\project1-raytracer\src\scene.cpp(240): warning C4244: '=' : conversion from 'double' to 'float', possible loss of data
1>s:\github\project1-raytracer\src\scene.cpp(245): warning C4244: '=' : conversion from 'double' to 'float', possible loss of data
1>s:\github\project1-raytracer\src\scene.cpp(247): warning C4244: '=' : conversion from 'double' to 'float', possible loss of data
1>s:\github\project1-raytracer\src\scene.cpp(249): warning C4244: '=' : conversion from 'double' to 'float', possible loss of data
1>s:\github\project1-raytracer\src\scene.cpp(251): warning C4244: '=' : conversion from 'double' to 'float', possible loss of data
1>s:\github\project1-raytracer\src\scene.cpp(256): warning C4244: '=' : conversion from 'double' to 'float', possible loss of data
1>s:\github\project1-raytracer\src\scene.cpp(258): warning C4244: '=' : conversion from 'double' to 'float', possible loss of data
Generating Code...
All outputs are up-to-date.
ManifestResourceCompile:
All outputs are up-to-date.
Link:
c:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\bin\link.exe /ERRORREPORT:PROMPT /OUT:"S:\GitHub\Project1-RayTracer\PROJ1_WIN\Debug\565Raytracer.exe" /INCREMENTAL /NOLOGO /LIBPATH:../shared/glew/lib /LIBPATH:../shared/freeglut/lib /LIBPATH:"C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v4.0\lib\Win32" cudart.lib glew32.lib glu32.lib opengl32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /MANIFEST /ManifestFile:"Debug\565Raytracer.exe.intermediate.manifest" /MANIFESTUAC:"level='asInvoker' uiAccess='false'" /DEBUG /PDB:"S:\GitHub\Project1-RayTracer\PROJ1_WIN\Debug\565Raytracer.pdb" /SUBSYSTEM:CONSOLE /TLBID:1 /ENTRY:"mainCRTStartup" /DYNAMICBASE /NXCOMPAT /IMPLIB:"S:\GitHub\Project1-RayTracer\PROJ1_WIN\Debug\565Raytracer.lib" /MACHINE:X86 "S:\GitHub\Project1-RayTracer\PROJ1_WIN\565Raytracer\Win32/Debug/raytraceKernel.cu.obj"
Debug\565Raytracer.exe.embed.manifest.res
Debug\glslUtility.obj
Debug\image.obj
Debug\main.obj
Debug\scene.obj
Debug\stb_image.obj
Debug\stb_image_write.obj
Debug\utilities.obj
Manifest:
C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\bin\mt.exe /nologo /verbose /out:"Debug\565Raytracer.exe.embed.manifest" /manifest Debug\565Raytracer.exe.intermediate.manifest
All outputs are up-to-date.
LinkEmbedManifest:
All outputs are up-to-date.
565Raytracer.vcxproj -> S:\GitHub\Project1-RayTracer\PROJ1_WIN\Debug\565Raytracer.exe
FinalizeBuildStatus:
Deleting file "Debug\565Raytracer.unsuccessfulbuild".
Touching "Debug\565Raytracer.lastbuildstate".
1>Done Building Project "S:\GitHub\Project1-RayTracer\PROJ1_WIN\565Raytracer\565Raytracer.vcxproj" (build target(s)).

Build succeeded.

Time Elapsed 00:00:26.05
Binary file not shown.
Binary file added PROJ1_WIN/565Raytracer/Debug/CL.read.1.tlog
Binary file not shown.
Binary file added PROJ1_WIN/565Raytracer/Debug/CL.write.1.tlog
Binary file not shown.
Binary file added PROJ1_WIN/565Raytracer/Debug/cl.command.1.tlog
Binary file not shown.
Binary file added PROJ1_WIN/565Raytracer/Debug/glslUtility.obj
Binary file not shown.
Binary file added PROJ1_WIN/565Raytracer/Debug/image.obj
Binary file not shown.
1 change: 1 addition & 0 deletions PROJ1_WIN/565Raytracer/Debug/link-cvtres.read.1.tlog
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
��
1 change: 1 addition & 0 deletions PROJ1_WIN/565Raytracer/Debug/link-cvtres.write.1.tlog
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
��
1 change: 1 addition & 0 deletions PROJ1_WIN/565Raytracer/Debug/link.2528-cvtres.read.1.tlog
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
��
1 change: 1 addition & 0 deletions PROJ1_WIN/565Raytracer/Debug/link.2528-cvtres.write.1.tlog
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
��
1 change: 1 addition & 0 deletions PROJ1_WIN/565Raytracer/Debug/link.2528.read.1.tlog
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
��
1 change: 1 addition & 0 deletions PROJ1_WIN/565Raytracer/Debug/link.2528.write.1.tlog
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
��
1 change: 1 addition & 0 deletions PROJ1_WIN/565Raytracer/Debug/link.7260-cvtres.read.1.tlog
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
��
1 change: 1 addition & 0 deletions PROJ1_WIN/565Raytracer/Debug/link.7260-cvtres.write.1.tlog
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
��
1 change: 1 addition & 0 deletions PROJ1_WIN/565Raytracer/Debug/link.7260.read.1.tlog
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
��
1 change: 1 addition & 0 deletions PROJ1_WIN/565Raytracer/Debug/link.7260.write.1.tlog
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
��
1 change: 1 addition & 0 deletions PROJ1_WIN/565Raytracer/Debug/link.8156-cvtres.read.1.tlog
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
��
1 change: 1 addition & 0 deletions PROJ1_WIN/565Raytracer/Debug/link.8156-cvtres.write.1.tlog
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
��
1 change: 1 addition & 0 deletions PROJ1_WIN/565Raytracer/Debug/link.8156.read.1.tlog
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
��
1 change: 1 addition & 0 deletions PROJ1_WIN/565Raytracer/Debug/link.8156.write.1.tlog
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
��
Binary file added PROJ1_WIN/565Raytracer/Debug/link.command.1.tlog
Binary file not shown.
Binary file added PROJ1_WIN/565Raytracer/Debug/link.read.1.tlog
Binary file not shown.
Binary file added PROJ1_WIN/565Raytracer/Debug/link.write.1.tlog
Binary file not shown.
Binary file added PROJ1_WIN/565Raytracer/Debug/main.obj
Binary file not shown.
Binary file added PROJ1_WIN/565Raytracer/Debug/mt.command.1.tlog
Binary file not shown.
Binary file added PROJ1_WIN/565Raytracer/Debug/mt.read.1.tlog
Binary file not shown.
Binary file added PROJ1_WIN/565Raytracer/Debug/mt.write.1.tlog
Binary file not shown.
26 changes: 26 additions & 0 deletions PROJ1_WIN/565Raytracer/Debug/raytraceKernel.cu.cache
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
Identity=..\..\src\raytraceKernel.cu
AdditionalDeps=
AdditionalOptions=
CInterleavedPTX=false
CodeGeneration=compute_10,sm_10
CompileOut=S:\GitHub\Project1-RayTracer\PROJ1_WIN\565Raytracer\Win32/Debug/raytraceKernel.cu.obj
CudaToolkitCustomDir=
Defines=
Emulation=false
FastMath=false
GPUDebugInfo=true
HostDebugInfo=true
Include=C:\Program Files\NVIDIA GPU Computing Toolkit\CUDA\v4.0\include;C:/ProgramData/NVIDIA Corporation/NVIDIA GPU Computing SDK 4.0/C/common/inc;../shared/glew/includes;../shared/freeglut/includes
Keep=false
KeepDir=Debug
MaxRegCount=0
NvccCompilation=compile
NvccPath=
Optimization=Od
PtxAsOptionV=false
RequiredIncludes=
Runtime=MDd
RuntimeChecks=Default
TargetMachinePlatform=32
TypeInfo=false
Warning=W3
Loading