diff --git a/README.md b/README.md index dd258af..0eb1f53 100644 --- a/README.md +++ b/README.md @@ -3,12 +3,22 @@ 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) +* Jonas Oppenheim ([LinkedIn](https://www.linkedin.com/in/jonasoppenheim/), [GitHub](https://github.com/oppenheimj/), [personal](http://www.jonasoppenheim.com/)) +* Tested on: Windows 10, Ryzen 9 5950x, 32GB, RTX 3080 (personal machine) -### (TODO: Your README) +The purpose of this assignment was to get our machines set up with all the tools needed for the course. The following screenshots correspond to various requirements detailed in `INSTRUCTION.md`. -Include screenshots, analysis, etc. (Remember, this is public, so don't put -anything here that you don't want to share with the world.) +### 3.1.1: Modify the CUDA Project and Take a Screenshot +![3.1.1-m_yourName](images/3.1.1-m_yourName.png) +### 3.1.2: Analyze +![3.1.2-Nsight_trace](images/3.1.2-Nsight_trace.png) + +### 3.1.3: Nsight Debugging +![3.1.3-Warp_Info_and_Autos](images/3.1.3-Warp_Info_and_Autos.png) + +### 3.2: WebGL +![3.2-WebGL](images/3.2-WebGL.png) + +### 3.3: DXR +![3.3-DXR](images/3.3-DXR.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..078a9b8 100644 --- a/cuda-getting-started/src/main.cpp +++ b/cuda-getting-started/src/main.cpp @@ -10,8 +10,7 @@ * C main function. */ int main(int argc, char* argv[]) { - // TODO: Change this line to use your name! - m_yourName = "TODO: YOUR NAME HERE"; + m_yourName = "Jonas Oppenheim"; if (init(argc, argv)) { mainLoop(); diff --git a/dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl b/dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl index d817ca4..180331a 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.1, 0.3, 0.7); payload.color = float4(barycentrics, 1); } diff --git a/images/3.1.1-m_yourName.png b/images/3.1.1-m_yourName.png new file mode 100644 index 0000000..500d2e2 Binary files /dev/null and b/images/3.1.1-m_yourName.png differ diff --git a/images/3.1.2-Nsight_trace.png b/images/3.1.2-Nsight_trace.png new file mode 100644 index 0000000..836000e Binary files /dev/null and b/images/3.1.2-Nsight_trace.png differ diff --git a/images/3.1.3-Warp_Info_and_Autos.png b/images/3.1.3-Warp_Info_and_Autos.png new file mode 100644 index 0000000..7205730 Binary files /dev/null and b/images/3.1.3-Warp_Info_and_Autos.png differ diff --git a/images/3.2-WebGL.png b/images/3.2-WebGL.png new file mode 100644 index 0000000..bbe4b08 Binary files /dev/null and b/images/3.2-WebGL.png differ diff --git a/images/3.3-DXR.png b/images/3.3-DXR.png new file mode 100644 index 0000000..64b7ca6 Binary files /dev/null and b/images/3.3-DXR.png differ