diff --git a/README.md b/README.md index dd258af..bb6430a 100644 --- a/README.md +++ b/README.md @@ -3,12 +3,46 @@ 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) +* Alex Fu + * [LinkedIn](https://www.linkedin.com/in/alex-fu-b47b67238/) + * [Twitter](https://twitter.com/AlexFu8304) + * [Personal Website](https://thecger.com/) +* Tested on: Windows 10, i7-10750H @ 2.60GHz, 16GB, GTX 3060 6GB -### (TODO: Your README) +## CUDA -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.1 CUDA Compatibility +![My modified CUDA program](images/cuda.png) + +### 1.2 Nsight Timeline + +![The nsight timeline](images/nsight-timeline.png) + +### 1.3 Nsight Debug + +![The nsight debug demonstration](images/nsight-debug.png) + +## WebGL + +### WebGL 1 + +![My machine's webgl 1 compatibility](images/WebGL-Report.png) + +### WebGL 2 + +![My machine's webgl 2 compatibility](images/WebGL2-Report.png) + +## DXR + +### 1.1 FL-DXR Mode + +![FL-DXR](images/fl-dxr.png) + +### 1.2 FL Mode + +![FL](images/fl.png) + +### 1.3 FL Mode + +![FL](images/fl-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..69d100a 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 = "Alex Fu (CGGT)"; if (init(argc, argv)) { mainLoop(); diff --git a/dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl b/dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl index d817ca4..24a1b03 100644 --- a/dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl +++ b/dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl @@ -69,7 +69,8 @@ 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.4, 0.5, 0.6); payload.color = float4(barycentrics, 1); } diff --git a/images/WebGL-Report.png b/images/WebGL-Report.png new file mode 100644 index 0000000..bcf82c4 Binary files /dev/null and b/images/WebGL-Report.png differ diff --git a/images/WebGL2-Report.png b/images/WebGL2-Report.png new file mode 100644 index 0000000..2aedcb0 Binary files /dev/null and b/images/WebGL2-Report.png differ diff --git a/images/cuda.png b/images/cuda.png new file mode 100644 index 0000000..14a06ca Binary files /dev/null and b/images/cuda.png differ diff --git a/images/dxr.png b/images/dxr.png new file mode 100644 index 0000000..d4968e0 Binary files /dev/null and b/images/dxr.png differ diff --git a/images/fl-dxr.png b/images/fl-dxr.png new file mode 100644 index 0000000..d3b0681 Binary files /dev/null and b/images/fl-dxr.png differ diff --git a/images/fl.png b/images/fl.png new file mode 100644 index 0000000..80fae2a Binary files /dev/null and b/images/fl.png differ diff --git a/images/nsight-debug.png b/images/nsight-debug.png new file mode 100644 index 0000000..1a6a27e Binary files /dev/null and b/images/nsight-debug.png differ diff --git a/images/nsight-timeline.png b/images/nsight-timeline.png new file mode 100644 index 0000000..1da6b8d Binary files /dev/null and b/images/nsight-timeline.png differ