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: Klayton Wittler #13

Open
wants to merge 9 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
36 changes: 30 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)

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 = "Klayton Wittler";

if (init(argc, argv)) {
mainLoop();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,7 @@
<PlatformToolset>v141</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
<Import Project="..\..\..\Packages\WinPixEventRuntime.1.0.180612001\build\WinPixEventRuntime.targets" Condition="Exists('..\..\..\Packages\WinPixEventRuntime.1.0.180612001\build\WinPixEventRuntime.targets')" />
</ImportGroup>
<ImportGroup Label="ExtensionSettings" />
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'" Label="PropertySheets">
<Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" />
<Import Project="PropertySheets\Profile.props" />
Expand Down Expand Up @@ -510,11 +508,12 @@ PrebuildCheck.bat</Command>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\..\Packages\WinPixEventRuntime.1.0.180612001\build\WinPixEventRuntime.targets" Condition="Exists('..\..\Packages\WinPixEventRuntime.1.0.180612001\build\WinPixEventRuntime.targets')" />
<Import Project="..\..\..\packages\WinPixEventRuntime.1.0.180612001\build\WinPixEventRuntime.targets" Condition="Exists('..\..\..\packages\WinPixEventRuntime.1.0.180612001\build\WinPixEventRuntime.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>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}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\..\Packages\WinPixEventRuntime.1.0.180612001\build\WinPixEventRuntime.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\Packages\WinPixEventRuntime.1.0.180612001\build\WinPixEventRuntime.targets'))" />
<Error Condition="!Exists('..\..\..\packages\WinPixEventRuntime.1.0.180612001\build\WinPixEventRuntime.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\WinPixEventRuntime.1.0.180612001\build\WinPixEventRuntime.targets'))" />
</Target>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,9 @@
<FxCompile Include="*Lib.hlsl" />
<FxCompile Include="*Lib.hlsl" />
<FxCompile Include="*Lib.hlsl" />
<FxCompile Include="*Lib.hlsl" />
<FxCompile Include="*Lib.hlsl" />
<FxCompile Include="*Lib.hlsl" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="AccelerationStructureBuilderFactory.cpp">
Expand Down Expand Up @@ -468,10 +471,10 @@
<None Include="..\contributing.md" />
<None Include="..\developerguide.md" />
<None Include="..\readme.md" />
<None Include="packages.config" />
<None Include="CalculateMortonCodes.hlsli">
<Filter>Shaders</Filter>
</None>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<Filter Include="Shaders">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -178,9 +178,7 @@ PrebuildCheck.bat</Command>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="packages.config">
<SubType>Designer</SubType>
</None>
<None Include="packages.config" />
<None Include="readme.md" />
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

Expand Down
4 changes: 4 additions & 0 deletions dxr-support/src/D3D12RaytracingHelloWorld/packages.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="WinPixEventRuntime" version="1.0.180612001" targetFramework="native" />
</packages>
Binary file added images/autos_tab.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/dxr_modified_triangle.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/dxr_test.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/getting-started_cpp.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/nsight_timeline_report.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/warp_info.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/webGL_report.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/webGL_test.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.