diff --git a/INSTRUCTION.md b/INSTRUCTION.md index 19d8e35..477eae9 100644 --- a/INSTRUCTION.md +++ b/INSTRUCTION.md @@ -140,7 +140,7 @@ It is recommended that you use Nsight. Nsight is shipped with CUDA. If you set u * If you have an older GPU, like GTX 9xx or older, then you may have to use *Start CUDA Debugging (Legacy)*. 3. If prompted, select the *Connect Unsecurely* option to start Nsight. 4. Exit the app. -5. Now place a breakpoint at Line 79 of `kernel.cu` => `if (x <= width && y <= height) {` +5. Now place a breakpoint at Line 30 of `kernel.cu` => `if (x <= width && y <= height) {` 6. Restart the CUDA Debugging. This time, the breakpoint should be hit. * The *Autos* and *Locals* debugging tabs should appear at the bottom. (You can also open this from Debug -> Windows -> Autos/Locals) * Notice the values that are in the autos. diff --git a/README.md b/README.md index dd258af..63a8170 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) +* Zirui Zang + * [LinkedIn](https://www.linkedin.com/in/zirui-zang/) +* Tested on: Windows 10, AMD Ryzen 7 3700X @ 3.60GHz 32GB, RTX2070 SUPER 8GB (Personal) -### (TODO: Your README) +### Screenshots +Part 3.1.1: Modify the CUDA Project +![Part 3.1.1](images/1.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.) +Part 3.1.2: Analyze +![Part 3.1.2](images/5.png) +Part 3.1.3: Nsight Debugging +![Part 3.1.3](images/2.png) + +Part 3.2: WebGL +![Part 3.2](images/3.png) + +Part 3.3: DXR +![Part 3.3](images/4.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..0523421 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 = "Zirui Zang"; if (init(argc, argv)) { mainLoop(); diff --git a/dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl b/dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl index d817ca4..f050dc5 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.2, 0.3, 0.7); payload.color = float4(barycentrics, 1); } diff --git a/images/1.png b/images/1.png new file mode 100644 index 0000000..dc4bb6b Binary files /dev/null and b/images/1.png differ diff --git a/images/2.png b/images/2.png new file mode 100644 index 0000000..77bbdb5 Binary files /dev/null and b/images/2.png differ diff --git a/images/3.png b/images/3.png new file mode 100644 index 0000000..a26a61c Binary files /dev/null and b/images/3.png differ diff --git a/images/4.png b/images/4.png new file mode 100644 index 0000000..0926aa3 Binary files /dev/null and b/images/4.png differ diff --git a/images/5.png b/images/5.png new file mode 100644 index 0000000..b76acbc Binary files /dev/null and b/images/5.png differ