diff --git a/README.md b/README.md index dd258af..07184c1 100644 --- a/README.md +++ b/README.md @@ -3,12 +3,27 @@ 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) +* Nick Moon + * [LinkedIn](https://www.linkedin.com/in/nick-moon1/), [personal website](https://nicholasmoon.github.io/) +* Tested on: Windows 10, AMD Ryzen 9 5900HS @ 3.0GHz 32GB, NVIDIA RTX 3060 Laptop 6GB (Personal Laptop) -### (TODO: Your README) +### Results -Include screenshots, analysis, etc. (Remember, this is public, so don't put -anything here that you don't want to share with the world.) +Part 3.1.1 CUDA results: +![](images/cuda_image.PNG) + +Part 3.1.2 Nsight Profiler results: + +![](images/nsight_profiler_image.png) + +Part 3.1.3 Nsight Debugger results: + +![](images/nsight_debugger_image.png) + +Part 3.2 WebGL results: + +![](images/webgl_image.PNG) + +Part 3.3 DXR results: +![](images/dxr_image.PNG) diff --git a/cuda-getting-started/src/main.cpp b/cuda-getting-started/src/main.cpp index 886fd4c..ec9318e 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 = "Nick Moon"; if (init(argc, argv)) { mainLoop(); diff --git a/dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl b/dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl index d817ca4..eb3c74c 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(0.9,0.9,0.25); payload.color = float4(barycentrics, 1); } diff --git a/images/cuda_image.PNG b/images/cuda_image.PNG new file mode 100644 index 0000000..b923ed8 Binary files /dev/null and b/images/cuda_image.PNG differ diff --git a/images/dxr_image.PNG b/images/dxr_image.PNG new file mode 100644 index 0000000..e78c8f0 Binary files /dev/null and b/images/dxr_image.PNG differ diff --git a/images/nsight_debugger_image.png b/images/nsight_debugger_image.png new file mode 100644 index 0000000..05dbe6b Binary files /dev/null and b/images/nsight_debugger_image.png differ diff --git a/images/nsight_profiler_image.png b/images/nsight_profiler_image.png new file mode 100644 index 0000000..d2302ae Binary files /dev/null and b/images/nsight_profiler_image.png differ diff --git a/images/webgl_image.PNG b/images/webgl_image.PNG new file mode 100644 index 0000000..6762747 Binary files /dev/null and b/images/webgl_image.PNG differ