Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Project 0: Tabatha Hickman #26

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 26 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

2 changes: 1 addition & 1 deletion cuda-getting-started/src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
3 changes: 2 additions & 1 deletion dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
Binary file added images/DXRTriangle.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/NsightAnalysis.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/NsightDebugging.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/SiglabWebgl.PNG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/projectBuild.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/webglSupport.JPG
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.