diff --git a/INSTRUCTION.md b/INSTRUCTION.md index 19d8e35..960ceea 100644 --- a/INSTRUCTION.md +++ b/INSTRUCTION.md @@ -3,6 +3,7 @@ Project 0 Getting Started: Instructions This is due **September 3rd 2021**. (See [late policy](#late-policy) at the bottom) + **Summary:** In this project, you will set up your GPU development tools and verify that you can build, run, and do performance analysis. This project contains: diff --git a/README.md b/README.md index dd258af..77f8398 100644 --- a/README.md +++ b/README.md @@ -3,12 +3,14 @@ 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) +* Nathan Devlin + * [LinkedIn](https://www.linkedin.com/in/nathandevlin), [personal website](https://www.ndevlin.com), [twitter](NA), etc. +* Tested on: (TODO) Windows 10, Intel i7-1075H @ 2.60GHz 32GB RAM, RTX 2070 Super mobile 8 GB GDDR6 memory https://www.linkedin.com/in/nathandevlin Nvidia Driver 471.68 -### (TODO: Your README) +![](images/NathanDevlinScreenshot.png) +![](images/NSightTimelineScreenShot.png) +![](images/AutosAndWarpInfoScreenshot.png) +![](images/ColoredTriangleScreenshot.png) +![](images/RedTriangleScreenshot.png) -Include screenshots, analysis, etc. (Remember, this is public, so don't put -anything here that you don't want to share with the world.) diff --git a/cuda-getting-started/src/main.cpp b/cuda-getting-started/src/main.cpp index 886fd4c..13c9fec 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 = "Nathan Devlin"; if (init(argc, argv)) { mainLoop(); diff --git a/dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl b/dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl index d817ca4..87342ae 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.8, 0.2, 0.2);//float3(1 - attr.barycentrics.x - attr.barycentrics.y, attr.barycentrics.x, attr.barycentrics.y); payload.color = float4(barycentrics, 1); } diff --git a/images/AutosAndWarpInfoScreenshot.png b/images/AutosAndWarpInfoScreenshot.png new file mode 100644 index 0000000..77877a2 Binary files /dev/null and b/images/AutosAndWarpInfoScreenshot.png differ diff --git a/images/ColoredTriangleScreenshot.png b/images/ColoredTriangleScreenshot.png new file mode 100644 index 0000000..572bff1 Binary files /dev/null and b/images/ColoredTriangleScreenshot.png differ diff --git a/images/NSightTimelineScreenShot.png b/images/NSightTimelineScreenShot.png new file mode 100644 index 0000000..4516526 Binary files /dev/null and b/images/NSightTimelineScreenShot.png differ diff --git a/images/NathanDevlinScreenshot.png b/images/NathanDevlinScreenshot.png new file mode 100644 index 0000000..7230ebf Binary files /dev/null and b/images/NathanDevlinScreenshot.png differ diff --git a/images/RedTriangleScreenshot.png b/images/RedTriangleScreenshot.png new file mode 100644 index 0000000..4cdcbc8 Binary files /dev/null and b/images/RedTriangleScreenshot.png differ diff --git a/images/WebGLStatusScreenShot.png b/images/WebGLStatusScreenShot.png new file mode 100644 index 0000000..0f80254 Binary files /dev/null and b/images/WebGLStatusScreenShot.png differ