diff --git a/README.md b/README.md index dd258af..7ea2b01 100644 --- a/README.md +++ b/README.md @@ -3,12 +3,60 @@ 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) +* Keyan Zhai + * [LinkedIn](https://www.linkedin.com/in/keyanzhai), [personal website](https://keyanzhai.github.io/) +* Tested on: Windows 10 Pro, AMD Ryzen 7 5800X 8-Core Processor 3.80 GHz, RTX 3080 10GB (personal) -### (TODO: Your README) + +--- + +## Compute Capability of CUDA-compatible GPU + +* GPU: GeForce RTX 3080 +* Compute Capability: 8.6 + +--- + +## CMake modification + +Changed line 97 of `CUDAComputesList.cmake` from + +```cmake +FOREACH(VER 20 30 32 35 37 50 52 53 60 61 62 70 72 75 80 86) +``` + +to + +```cmake +FOREACH(VER 32 35 37 50 52 53 60 61 62 70 72 75 80 86) +``` + +> Reference: + +--- + +## Part 3.1: CUDA + +### Part 3.1.1 Modify the CUDA Project and Take a Screenshot + +![](images/3-1-1.png) + +### Part 3.1.2: Analyze + +![](images/3-1-2.png) + +### Part 3.1.3: Nsight Debugging + +![](images/3-1-3.png) + +## Part 3.2: WebGL + +![](images/3-2.png) + +## Part 3.3: DXR + +![](images/3-3.png) \ No newline at end of file diff --git a/cuda-getting-started/cmake/CUDAComputesList.cmake b/cuda-getting-started/cmake/CUDAComputesList.cmake index 28fe5f0..273dc08 100644 --- a/cuda-getting-started/cmake/CUDAComputesList.cmake +++ b/cuda-getting-started/cmake/CUDAComputesList.cmake @@ -94,7 +94,8 @@ MACRO(SET_COMPUTE VERSION) ENDMACRO(SET_COMPUTE) # Iterate over compute versions. Create variables and enable computes if needed -FOREACH(VER 20 30 32 35 37 50 52 53 60 61 62 70 72 75) +# FOREACH(VER 20 30 32 35 37 50 52 53 60 61 62 70 72 75) +FOREACH(VER 32 35 37 50 52 53 60 61 62 70 72 75 80 86) OPTION(CUDA_COMPUTE_${VER} "CUDA Compute Capability ${VER}" OFF) MARK_AS_ADVANCED(CUDA_COMPUTE_${VER}) IF(${CUDA_COMPUTE_${VER}}) diff --git a/cuda-getting-started/src/main.cpp b/cuda-getting-started/src/main.cpp index 886fd4c..2ae7ac0 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 = "Keyan Zhai"; if (init(argc, argv)) { mainLoop(); diff --git a/dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl b/dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl index d817ca4..b5fef65 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, 0.8, 0); payload.color = float4(barycentrics, 1); } diff --git a/images/3-1-1.png b/images/3-1-1.png new file mode 100644 index 0000000..a086f65 Binary files /dev/null and b/images/3-1-1.png differ diff --git a/images/3-1-2.png b/images/3-1-2.png new file mode 100644 index 0000000..8cb3f25 Binary files /dev/null and b/images/3-1-2.png differ diff --git a/images/3-1-3.png b/images/3-1-3.png new file mode 100644 index 0000000..6cf6f0a Binary files /dev/null and b/images/3-1-3.png differ diff --git a/images/3-2.png b/images/3-2.png new file mode 100644 index 0000000..06d2edf Binary files /dev/null and b/images/3-2.png differ diff --git a/images/3-3.png b/images/3-3.png new file mode 100644 index 0000000..a868f42 Binary files /dev/null and b/images/3-3.png differ