diff --git a/README.md b/README.md index dd258af..85b53ba 100644 --- a/README.md +++ b/README.md @@ -3,11 +3,18 @@ Project 0 Getting Started **University of Pennsylvania, CIS 565: GPU Programming and Architecture, Project 0** -* (TODO) YOUR NAME HERE - * (TODO) [LinkedIn](), [personal website](), [twitter](), etc. -* Tested on: (TODO) Windows 22, i7-2222 @ 2.22GHz 22GB, GTX 222 222MB (Moore 2222 Lab) +* Gangzheng Tong + * www.gtong.me + * www.linkedin.com/in/gztong +* Tested on: Windows 10 Pro 64-bit, E3-1225 @ 3.3GHz 16GB, GTX 1060 3GB, personal computer -### (TODO: Your README) +### Gangzheng Tong + +![](images/chrome.png) +![](images/D3D12.png) +![](images/cuda.png) +![](images/analyze.png) +![](images/nsight.png) Include screenshots, analysis, etc. (Remember, this is public, so don't put anything here that you don't want to share with the world.) diff --git a/cuda-getting-started/src/main.cpp b/cuda-getting-started/src/main.cpp index 886fd4c..d3a0432 100644 --- a/cuda-getting-started/src/main.cpp +++ b/cuda-getting-started/src/main.cpp @@ -11,7 +11,7 @@ */ int main(int argc, char* argv[]) { // TODO: Change this line to use your name! - m_yourName = "TODO: YOUR NAME HERE"; + m_yourName = "Gangzheng Tong"; if (init(argc, argv)) { mainLoop(); diff --git a/dxr-support/Libraries/D3D12RaytracingFallback/src/FallbackLayer.vcxproj b/dxr-support/Libraries/D3D12RaytracingFallback/src/FallbackLayer.vcxproj index 86785de..a91839e 100644 --- a/dxr-support/Libraries/D3D12RaytracingFallback/src/FallbackLayer.vcxproj +++ b/dxr-support/Libraries/D3D12RaytracingFallback/src/FallbackLayer.vcxproj @@ -28,12 +28,10 @@ StaticLibrary Unicode - v141 + v142 - - - + @@ -510,11 +508,12 @@ PrebuildCheck.bat + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/dxr-support/Libraries/D3D12RaytracingFallback/src/FallbackLayer.vcxproj.filters b/dxr-support/Libraries/D3D12RaytracingFallback/src/FallbackLayer.vcxproj.filters index 6285ad0..3e79616 100644 --- a/dxr-support/Libraries/D3D12RaytracingFallback/src/FallbackLayer.vcxproj.filters +++ b/dxr-support/Libraries/D3D12RaytracingFallback/src/FallbackLayer.vcxproj.filters @@ -192,6 +192,12 @@ + + + + + + @@ -468,10 +474,10 @@ - Shaders + diff --git a/dxr-support/src/D3D12RaytracingHelloWorld/D3D12RaytracingHelloWorld.vcxproj b/dxr-support/src/D3D12RaytracingHelloWorld/D3D12RaytracingHelloWorld.vcxproj index d4d234f..bc563bd 100644 --- a/dxr-support/src/D3D12RaytracingHelloWorld/D3D12RaytracingHelloWorld.vcxproj +++ b/dxr-support/src/D3D12RaytracingHelloWorld/D3D12RaytracingHelloWorld.vcxproj @@ -27,7 +27,7 @@ Application false - v141 + v142 true Unicode @@ -178,9 +178,7 @@ PrebuildCheck.bat - - Designer - + diff --git a/dxr-support/src/D3D12RaytracingHelloWorld/packages.config b/dxr-support/src/D3D12RaytracingHelloWorld/packages.config new file mode 100644 index 0000000..19367ad --- /dev/null +++ b/dxr-support/src/D3D12RaytracingHelloWorld/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/images/D3D12.png b/images/D3D12.png new file mode 100644 index 0000000..55be2eb Binary files /dev/null and b/images/D3D12.png differ diff --git a/images/analyze.png b/images/analyze.png new file mode 100644 index 0000000..eb1c4fa Binary files /dev/null and b/images/analyze.png differ diff --git a/images/chrome.png b/images/chrome.png new file mode 100644 index 0000000..6983ab9 Binary files /dev/null and b/images/chrome.png differ diff --git a/images/cuda.png b/images/cuda.png new file mode 100644 index 0000000..b4b4882 Binary files /dev/null and b/images/cuda.png differ diff --git a/images/nsight.png b/images/nsight.png new file mode 100644 index 0000000..504debb Binary files /dev/null and b/images/nsight.png differ