diff --git a/README.md b/README.md index dd258af..1f3f5ab 100644 --- a/README.md +++ b/README.md @@ -3,12 +3,36 @@ 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) +* Klayton Wittler + * [LinkedIn](https://www.linkedin.com/in/klayton-wittler/) +* Tested on: Windows 10 Pro, i7-7700K @ 4.20GHz 16.0GB, GTX 1070 8.192GB (my PC) -### (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.) +## WebGL support + +![](images/webGL_report.png) +![](images/webGL_test.png) + +## DXR support +`float3 barycentrics = float3(0, 0, 0.42);` + +![](images/dxr_modified_triangle.PNG) + +## Build and Run: getting-started + +![](images/getting-started_cpp.png) + +## Analysis +Timeline report + +![](images/nsight_timeline_report.png) + +## Nsight Debugging +index is set to 4200 + +![](images/autos_tab.png) + +`Nsight` -> `Windows` -> `CUDA Info` -> `CUDA Info 1` was not present. Instead screenshot is of `Nsight` -> `Windows` -> `Warp Info` + +![](images/warp_info.png) diff --git a/cuda-getting-started/src/main.cpp b/cuda-getting-started/src/main.cpp index 886fd4c..2c3d9f3 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 = "Klayton Wittler"; 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..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..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..3c77d1f 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,0.02,0.42); 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/autos_tab.png b/images/autos_tab.png new file mode 100644 index 0000000..753f5a4 Binary files /dev/null and b/images/autos_tab.png differ diff --git a/images/dxr_modified_triangle.PNG b/images/dxr_modified_triangle.PNG new file mode 100644 index 0000000..29aecdc Binary files /dev/null and b/images/dxr_modified_triangle.PNG differ diff --git a/images/dxr_test.PNG b/images/dxr_test.PNG new file mode 100644 index 0000000..3750b61 Binary files /dev/null and b/images/dxr_test.PNG differ diff --git a/images/getting-started_cpp.png b/images/getting-started_cpp.png new file mode 100644 index 0000000..2f8e447 Binary files /dev/null and b/images/getting-started_cpp.png differ diff --git a/images/nsight_timeline_report.png b/images/nsight_timeline_report.png new file mode 100644 index 0000000..0b25dd8 Binary files /dev/null and b/images/nsight_timeline_report.png differ diff --git a/images/warp_info.png b/images/warp_info.png new file mode 100644 index 0000000..ccae8e8 Binary files /dev/null and b/images/warp_info.png differ diff --git a/images/webGL_report.png b/images/webGL_report.png new file mode 100644 index 0000000..9196bd2 Binary files /dev/null and b/images/webGL_report.png differ diff --git a/images/webGL_test.png b/images/webGL_test.png new file mode 100644 index 0000000..7c3e846 Binary files /dev/null and b/images/webGL_test.png differ