diff --git a/README.md b/README.md index dd258af..a5a72fa 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) +* Tom Donnelly + * [LinkedIn]https://www.linkedin.com/in/the-tom-donnelly/ +* Tested on: Windows 11, AMD Ryzen 9 5900X, NVIDIA GeForce RTX 3070 (Personal Desktop) -### (TODO: Your README) -Include screenshots, analysis, etc. (Remember, this is public, so don't put -anything here that you don't want to share with the world.) +### (README) +3.1 +Compute Capability sm: 8.6 +3.1.1 +![](images/blocks.png) +3.1.2 +![](images/Timeline.png) +3.1.3 +![](images/warp-info.png) +3.2 +![](images/webgl1.png) +![](images/webgl2.png) +3,3 +![](images/triangle.png) diff --git a/cuda-getting-started/src/main.cpp b/cuda-getting-started/src/main.cpp index 886fd4c..be44b0e 100644 --- a/cuda-getting-started/src/main.cpp +++ b/cuda-getting-started/src/main.cpp @@ -10,8 +10,7 @@ * C main function. */ int main(int argc, char* argv[]) { - // TODO: Change this line to use your name! - m_yourName = "TODO: YOUR NAME HERE"; + m_yourName = "Tom Donnelly"; 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..d43f4f6 100644 --- a/dxr-support/Libraries/D3D12RaytracingFallback/src/FallbackLayer.vcxproj +++ b/dxr-support/Libraries/D3D12RaytracingFallback/src/FallbackLayer.vcxproj @@ -31,9 +31,7 @@ v141 - - - + @@ -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..3e79616 100644 --- a/dxr-support/Libraries/D3D12RaytracingFallback/src/FallbackLayer.vcxproj.filters +++ b/dxr-support/Libraries/D3D12RaytracingFallback/src/FallbackLayer.vcxproj.filters @@ -192,6 +192,12 @@ + + + + + + @@ -468,10 +474,10 @@ - Shaders + diff --git a/dxr-support/src/D3D12RaytracingHelloWorld/D3D12RaytracingHelloWorld.vcxproj b/dxr-support/src/D3D12RaytracingHelloWorld/D3D12RaytracingHelloWorld.vcxproj index d4d234f..909fff3 100644 --- a/dxr-support/src/D3D12RaytracingHelloWorld/D3D12RaytracingHelloWorld.vcxproj +++ b/dxr-support/src/D3D12RaytracingHelloWorld/D3D12RaytracingHelloWorld.vcxproj @@ -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..d471114 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.5,0.4,0.94); 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/Timeline.png b/images/Timeline.png new file mode 100644 index 0000000..20dc254 Binary files /dev/null and b/images/Timeline.png differ diff --git a/images/blocks.png b/images/blocks.png new file mode 100644 index 0000000..47b7ada Binary files /dev/null and b/images/blocks.png differ diff --git a/images/triangle.png b/images/triangle.png new file mode 100644 index 0000000..65b9f0e Binary files /dev/null and b/images/triangle.png differ diff --git a/images/warp-info.png b/images/warp-info.png new file mode 100644 index 0000000..f5489a5 Binary files /dev/null and b/images/warp-info.png differ diff --git a/images/webgl1.png b/images/webgl1.png new file mode 100644 index 0000000..71db3fd Binary files /dev/null and b/images/webgl1.png differ diff --git a/images/webgl2.png b/images/webgl2.png new file mode 100644 index 0000000..5262ba0 Binary files /dev/null and b/images/webgl2.png differ