diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d163863 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +build/ \ No newline at end of file diff --git a/README.md b/README.md index dd258af..fdab741 100644 --- a/README.md +++ b/README.md @@ -3,12 +3,23 @@ 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) +* Tianyi Xiao + * [LinkedIn](https://www.linkedin.com/in/tianyi-xiao-20268524a/), [personal website](https://jackxty.github.io/), [Github](https://github.com/JackXTY). +* Tested on: Windows 11, i9-12900H @ 2.50GHz 16GB, Nvidia Geforce RTX 3070 Ti 8032MB (Personal Laptop) -### (TODO: Your README) +* Compute capability: 8.6 -Include screenshots, analysis, etc. (Remember, this is public, so don't put -anything here that you don't want to share with the world.) +### CUDA +![](images/Cuda.png) +### Analysis +![](images/Nsight.png) + +### Nsight Debug +![](images/warp_info_auto.png) + +### WebGL +![](images/webGL.png) + +### DXR +![](images/DXR.png) diff --git a/cuda-getting-started/src/main.cpp b/cuda-getting-started/src/main.cpp index 886fd4c..ff83753 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 = "Tianyi Xiao"; if (init(argc, argv)) { mainLoop(); diff --git a/dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl b/dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl index d817ca4..6df0fbf 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, 0.2, 0.5); payload.color = float4(barycentrics, 1); } diff --git a/images/Cuda.png b/images/Cuda.png new file mode 100644 index 0000000..cfb7a3b 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..0861d4e Binary files /dev/null and b/images/DXR.png differ diff --git a/images/Nsight.png b/images/Nsight.png new file mode 100644 index 0000000..bb0379b Binary files /dev/null and b/images/Nsight.png differ diff --git a/images/warp_info_auto.png b/images/warp_info_auto.png new file mode 100644 index 0000000..ea7b3ef Binary files /dev/null and b/images/warp_info_auto.png differ diff --git a/images/webGL.png b/images/webGL.png new file mode 100644 index 0000000..8c2816b Binary files /dev/null and b/images/webGL.png differ