diff --git a/README.md b/README.md index dd258af..50323c5 100644 --- a/README.md +++ b/README.md @@ -3,12 +3,33 @@ 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) +* Gehan Zheng + * [LinkedIn](https://www.linkedin.com/in/gehan-zheng-05877b24a/), [personal website](https://grahamzen.github.io/). +* Tested on: Windows 10, AMD Ryzen 7 5800H @ 3.2GHz 16GB, GeForce RTX 3060 Laptop 6144MB (Personal Laptop) -### (TODO: Your README) +### Part 3.1: CUDA -Include screenshots, analysis, etc. (Remember, this is public, so don't put -anything here that you don't want to share with the world.) +Compute Capability: 8.6 +### Part 3.1.1: Modify the CUDA Project and Take a Screenshot +![1693562040944](image/README/1693562040944.png) + +### Part 3.1.2: Analyze + +![1693562617795](image/README/1693562617795.png) + +### Part 3.1.3: Nsight Debugging + +![1693572286534](image/README/1693572286534.png) + +### Part 3.2: WebGL + +![1693561230965](image/README/1693561230965.png) + +### Part 3.3: DXR + +![1693578475062](image/README/1693578475062.png) + +![1693578503682](image/README/1693578503682.png) + +![1693578517042](image/README/1693578517042.png) \ No newline at end of file diff --git a/cuda-getting-started/src/main.cpp b/cuda-getting-started/src/main.cpp index 886fd4c..84d58d8 100644 --- a/cuda-getting-started/src/main.cpp +++ b/cuda-getting-started/src/main.cpp @@ -10,8 +10,8 @@ * C main function. */ int main(int argc, char* argv[]) { - // TODO: Change this line to use your name! - m_yourName = "TODO: YOUR NAME HERE"; + // DONE: Change this line to use your name! + m_yourName = "Gehan Zheng"; 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..35320e6 100644 --- a/dxr-support/Libraries/D3D12RaytracingFallback/src/FallbackLayer.vcxproj +++ b/dxr-support/Libraries/D3D12RaytracingFallback/src/FallbackLayer.vcxproj @@ -28,7 +28,7 @@ StaticLibrary Unicode - v141 + v143 diff --git a/dxr-support/Libraries/D3D12RaytracingFallback/src/FallbackLayer.vcxproj.filters b/dxr-support/Libraries/D3D12RaytracingFallback/src/FallbackLayer.vcxproj.filters index 6285ad0..7de174c 100644 --- a/dxr-support/Libraries/D3D12RaytracingFallback/src/FallbackLayer.vcxproj.filters +++ b/dxr-support/Libraries/D3D12RaytracingFallback/src/FallbackLayer.vcxproj.filters @@ -192,6 +192,12 @@ + + + + + + diff --git a/dxr-support/src/D3D12RaytracingHelloWorld/D3D12RaytracingHelloWorld.vcxproj b/dxr-support/src/D3D12RaytracingHelloWorld/D3D12RaytracingHelloWorld.vcxproj index d4d234f..487a96d 100644 --- a/dxr-support/src/D3D12RaytracingHelloWorld/D3D12RaytracingHelloWorld.vcxproj +++ b/dxr-support/src/D3D12RaytracingHelloWorld/D3D12RaytracingHelloWorld.vcxproj @@ -21,13 +21,13 @@ Application true - v141 + v143 Unicode Application false - v141 + v143 true Unicode @@ -66,7 +66,7 @@ Disabled WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) true - ..\..\Libraries\D3D12RaytracingFallback\Include;$(IntDir);%(AdditionalIncludeDirectories) + ..\..\Libraries\D3D12RaytracingFallback\Include;$(IntDir);C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.20.27508\atlmfc\include;%(AdditionalIncludeDirectories) false @@ -76,6 +76,7 @@ true d3d12.lib;dxgi.lib;dxguid.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;%(AdditionalDependencies) d3d12.dll + C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.20.27508\atlmfc\lib\x64 true @@ -119,7 +120,7 @@ PrebuildCheck.bat true WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true - ..\..\Libraries\D3D12RaytracingFallback\Include;$(IntDir);%(AdditionalIncludeDirectories) + ..\..\Libraries\D3D12RaytracingFallback\Include;$(IntDir);C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.20.27508\atlmfc\include;%(AdditionalIncludeDirectories) false @@ -129,6 +130,7 @@ PrebuildCheck.bat true d3d12.lib;dxgi.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;%(AdditionalDependencies) d3d12.dll + C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Tools\MSVC\14.20.27508\atlmfc\lib\x64 true diff --git a/dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl b/dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl index d817ca4..b78e18c 100644 --- a/dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl +++ b/dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl @@ -69,7 +69,7 @@ void MyRaygenShader() [shader("closesthit")] void MyClosestHitShader(inout RayPayload payload, in MyAttributes attr) { - float3 barycentrics = float3(1 - attr.barycentrics.x - attr.barycentrics.y, attr.barycentrics.x, attr.barycentrics.y); + float3 barycentrics = float3(242.0/255, 80.0 / 255, 30.0 / 255); payload.color = float4(barycentrics, 1); } 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/image/README/1693561230965.png b/image/README/1693561230965.png new file mode 100644 index 0000000..09b8241 Binary files /dev/null and b/image/README/1693561230965.png differ diff --git a/image/README/1693562040944.png b/image/README/1693562040944.png new file mode 100644 index 0000000..23ffd3b Binary files /dev/null and b/image/README/1693562040944.png differ diff --git a/image/README/1693562617795.png b/image/README/1693562617795.png new file mode 100644 index 0000000..e7c2101 Binary files /dev/null and b/image/README/1693562617795.png differ diff --git a/image/README/1693572286534.png b/image/README/1693572286534.png new file mode 100644 index 0000000..79f2cfa Binary files /dev/null and b/image/README/1693572286534.png differ diff --git a/image/README/1693578475062.png b/image/README/1693578475062.png new file mode 100644 index 0000000..e9b6252 Binary files /dev/null and b/image/README/1693578475062.png differ diff --git a/image/README/1693578503682.png b/image/README/1693578503682.png new file mode 100644 index 0000000..5b2a154 Binary files /dev/null and b/image/README/1693578503682.png differ diff --git a/image/README/1693578517042.png b/image/README/1693578517042.png new file mode 100644 index 0000000..26b7fbc Binary files /dev/null and b/image/README/1693578517042.png differ