diff --git a/README.md b/README.md index dd258af..9b765b2 100644 --- a/README.md +++ b/README.md @@ -3,12 +3,40 @@ 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) +* Qiaosen Chen + * [LinkedIn](https://www.linkedin.com/in/qiaosen-chen-725699141/) +* Tested on: Windows 10, Intel(R) Core (TM) i5-9400 CPU @ 2.70GHz, NVIDIA GeForce GTX 1070 (personal computer).- -### (TODO: Your README) +## *Checking WebGL status* -Include screenshots, analysis, etc. (Remember, this is public, so don't put -anything here that you don't want to share with the world.) +![Chrome pic1](/images/chrome1.png) +![Chrome pic2](/images/chrome2.png) + +![Chrome pic3](/images/chrome3.png) + +![Chrome pic4](/images/chrome4.png) + +![Chrome pic5](/images/chrome5.png) + +![Chrome pic6](/images/chrome6.png) + + + +## DXR + +![Triangle](/images/triangle.png) + + + +## Modify + +![Modification](/images/cuda_test.png) + + + +## Analyze + +![Modification](/images/timeline.png) + +![Modification](/images/cuda_debug.png) \ No newline at end of file diff --git a/cuda-getting-started/src/kernel.cu b/cuda-getting-started/src/kernel.cu index e88c806..91bf86d 100644 --- a/cuda-getting-started/src/kernel.cu +++ b/cuda-getting-started/src/kernel.cu @@ -27,7 +27,7 @@ __global__ void createVersionVisualization(uchar4* PBOpos, int width, int height int y = (blockIdx.y * blockDim.y) + threadIdx.y; int index = x + (y * width); - if (x <= width && y <= height) { + if (x <= width && y <= height) { // Each thread writes one pixel location in the texture (textel) PBOpos[index].w = 0; PBOpos[index].x = 0; diff --git a/cuda-getting-started/src/main.cpp b/cuda-getting-started/src/main.cpp index 886fd4c..bd68b45 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 = "Qiaosen Chen"; if (init(argc, argv)) { mainLoop(); diff --git a/dxr-support/Libraries/D3D12RaytracingFallback/src/FallbackLayer.vcxproj b/dxr-support/Libraries/D3D12RaytracingFallback/src/FallbackLayer.vcxproj index 86785de..a91839e 100644 --- a/dxr-support/Libraries/D3D12RaytracingFallback/src/FallbackLayer.vcxproj +++ b/dxr-support/Libraries/D3D12RaytracingFallback/src/FallbackLayer.vcxproj @@ -28,12 +28,10 @@ StaticLibrary Unicode - v141 + v142 - - - + @@ -510,11 +508,12 @@ PrebuildCheck.bat + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + \ No newline at end of file diff --git a/dxr-support/Libraries/D3D12RaytracingFallback/src/FallbackLayer.vcxproj.filters b/dxr-support/Libraries/D3D12RaytracingFallback/src/FallbackLayer.vcxproj.filters index 6285ad0..fb2a980 100644 --- a/dxr-support/Libraries/D3D12RaytracingFallback/src/FallbackLayer.vcxproj.filters +++ b/dxr-support/Libraries/D3D12RaytracingFallback/src/FallbackLayer.vcxproj.filters @@ -192,6 +192,9 @@ + + + @@ -468,10 +471,10 @@ - Shaders + diff --git a/dxr-support/src/D3D12RaytracingHelloWorld/D3D12RaytracingHelloWorld.vcxproj b/dxr-support/src/D3D12RaytracingHelloWorld/D3D12RaytracingHelloWorld.vcxproj index d4d234f..0c8465c 100644 --- a/dxr-support/src/D3D12RaytracingHelloWorld/D3D12RaytracingHelloWorld.vcxproj +++ b/dxr-support/src/D3D12RaytracingHelloWorld/D3D12RaytracingHelloWorld.vcxproj @@ -21,13 +21,13 @@ Application true - v141 + v142 Unicode Application false - v141 + v142 true Unicode @@ -178,9 +178,7 @@ PrebuildCheck.bat - - Designer - + diff --git a/dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl b/dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl index d817ca4..1efe08e 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(1.f, 0.5f, 0.5f); payload.color = float4(barycentrics, 1); } diff --git a/dxr-support/src/D3D12RaytracingHelloWorld/packages.config b/dxr-support/src/D3D12RaytracingHelloWorld/packages.config new file mode 100644 index 0000000..19367ad --- /dev/null +++ b/dxr-support/src/D3D12RaytracingHelloWorld/packages.config @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/images/chrome1.png b/images/chrome1.png new file mode 100644 index 0000000..2cc495d Binary files /dev/null and b/images/chrome1.png differ diff --git a/images/chrome2.png b/images/chrome2.png new file mode 100644 index 0000000..be41f2b Binary files /dev/null and b/images/chrome2.png differ diff --git a/images/chrome3.png b/images/chrome3.png new file mode 100644 index 0000000..ecf828c Binary files /dev/null and b/images/chrome3.png differ diff --git a/images/chrome4.png b/images/chrome4.png new file mode 100644 index 0000000..84e1fe0 Binary files /dev/null and b/images/chrome4.png differ diff --git a/images/chrome5.png b/images/chrome5.png new file mode 100644 index 0000000..ef2fe2a Binary files /dev/null and b/images/chrome5.png differ diff --git a/images/chrome6.png b/images/chrome6.png new file mode 100644 index 0000000..a122885 Binary files /dev/null and b/images/chrome6.png differ diff --git a/images/cuda_debug.png b/images/cuda_debug.png new file mode 100644 index 0000000..53391b7 Binary files /dev/null and b/images/cuda_debug.png differ diff --git a/images/cuda_test.png b/images/cuda_test.png new file mode 100644 index 0000000..aec5213 Binary files /dev/null and b/images/cuda_test.png differ diff --git a/images/timeline.png b/images/timeline.png new file mode 100644 index 0000000..cd4ecf2 Binary files /dev/null and b/images/timeline.png differ diff --git a/images/triangle.png b/images/triangle.png new file mode 100644 index 0000000..3d83cee Binary files /dev/null and b/images/triangle.png differ