diff --git a/README.md b/README.md index dd258af..eb05d9c 100644 --- a/README.md +++ b/README.md @@ -3,12 +3,34 @@ 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) +* Yilin Liu + * [LinkedIn](https://www.linkedin.com/in/yilin-liu-9538ba1a5/), [Personal Website](https://yilin.games/) +* Tested on: Windows 10, i7-10750H @ 2.59GHz 32GB, GeForce RTX 2070 with Max-Q 8192MB (Personal Laptop) -### (TODO: Your README) +### Project 0 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.) +#### 1. CUDA Capability 7.5 +![capability](images/capability.png) + +#### 2. NVIDIA NSight System Analysis + +![report](images/report.png) + +#### 3. NVIDIA NSight Debugger + +![debugger](images/debugger.png) + +#### 4. WebGL Report + +![report](images/report.png) + +#### 5. DXR + +![dxr-modified](images/dxr-modified.png) + +#### 6. FL-DXR + +![fl-dxr-modified](images/fl-dxr-modified.png) + +The machine only supports FL-DXR and DXR. diff --git a/cuda-getting-started/src/main.cpp b/cuda-getting-started/src/main.cpp index 886fd4c..68221d4 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 = "TODO: Yilin Liu"; if (init(argc, argv)) { mainLoop(); diff --git a/dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl b/dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl index d817ca4..c21c5f0 100644 --- a/dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl +++ b/dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl @@ -69,7 +69,9 @@ 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(1 - attr.barycentrics.x - attr.barycentrics.y, attr.barycentrics.x, attr.barycentrics.y); + float3 barycentrics = float3(0.7, 0.2, 0.3); + payload.color = float4(barycentrics, 1); } diff --git a/images/capability.png b/images/capability.png new file mode 100644 index 0000000..e6e1a5f Binary files /dev/null and b/images/capability.png differ diff --git a/images/debugger.png b/images/debugger.png new file mode 100644 index 0000000..7f9f198 Binary files /dev/null and b/images/debugger.png differ diff --git a/images/dxr-modified.png b/images/dxr-modified.png new file mode 100644 index 0000000..77de69d Binary files /dev/null and b/images/dxr-modified.png differ diff --git a/images/fl-dxr-modified.png b/images/fl-dxr-modified.png new file mode 100644 index 0000000..87e13b7 Binary files /dev/null and b/images/fl-dxr-modified.png differ diff --git a/images/report.png b/images/report.png new file mode 100644 index 0000000..74ed632 Binary files /dev/null and b/images/report.png differ diff --git a/images/webgl_report.png b/images/webgl_report.png new file mode 100644 index 0000000..556dc29 Binary files /dev/null and b/images/webgl_report.png differ