diff --git a/README.md b/README.md index dd258af..6704fab 100644 --- a/README.md +++ b/README.md @@ -3,12 +3,32 @@ 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) +* Tabatha Hickman + * LinkedIn: https://www.linkedin.com/in/tabatha-hickman-335987140/ +* Part 2.3 (DXR) tested on: Windows 10, Xeon E5-1630 v4 @ 3.70GHz 32GB, GTX 1070 (SIGLAB computer) +* Everything else tested on: Windows 10, i7-5600U CPU @ 2.60GHz 16GB, GeForce 840M (personal computer) + * Note: I didn't restart after installing updates to my drivers, so that might have affected my results. -### (TODO: Your README) +**Note on Collaborators** -Include screenshots, analysis, etc. (Remember, this is public, so don't put -anything here that you don't want to share with the world.) +When I did my work on the Siglab machine for DXR, I went to push my commit and I was not allowed because I was logged in as Alexis. I tried to change this with git config, but to no avail. I ended up making Alexis a collaborator so that I could push my code up. We did not actually collaborate in any way, all of the work in this repository is my own. Sorry for the confusion! + +**Compute Capability of GPU** +Personal computer: 5.0 +SIGLAB computer: 6.1 + +**Proof of WebGL Support:** +![](images/webglSupport.JPG) + +**DXR Modified Triangle** +![](images/DXRTriangle.PNG) + +**Project Execution Output:** +![](images/projectBuild.JPG) + +**Nsight Analysis Results:** +![](images/NsightAnalysis.JPG) + +**Nsight Debugging Experimentation:** +![](images/NsightDebugging.JPG) diff --git a/cuda-getting-started/src/main.cpp b/cuda-getting-started/src/main.cpp index 886fd4c..5949e5e 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 = "Tabatha Hickman"; if (init(argc, argv)) { mainLoop(); diff --git a/dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl b/dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl index d817ca4..ad0248a 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(1, 0, 1); payload.color = float4(barycentrics, 1); } diff --git a/images/DXRTriangle.PNG b/images/DXRTriangle.PNG new file mode 100644 index 0000000..8d0259b Binary files /dev/null and b/images/DXRTriangle.PNG differ diff --git a/images/NsightAnalysis.JPG b/images/NsightAnalysis.JPG new file mode 100644 index 0000000..64cd46a Binary files /dev/null and b/images/NsightAnalysis.JPG differ diff --git a/images/NsightDebugging.JPG b/images/NsightDebugging.JPG new file mode 100644 index 0000000..1925479 Binary files /dev/null and b/images/NsightDebugging.JPG differ diff --git a/images/SiglabWebgl.PNG b/images/SiglabWebgl.PNG new file mode 100644 index 0000000..8d7e82e Binary files /dev/null and b/images/SiglabWebgl.PNG differ diff --git a/images/projectBuild.JPG b/images/projectBuild.JPG new file mode 100644 index 0000000..78e5b5b Binary files /dev/null and b/images/projectBuild.JPG differ diff --git a/images/webglSupport.JPG b/images/webglSupport.JPG new file mode 100644 index 0000000..675e022 Binary files /dev/null and b/images/webglSupport.JPG differ