diff --git a/README.md b/README.md index dd258af..dd5ae7e 100644 --- a/README.md +++ b/README.md @@ -3,11 +3,26 @@ 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) +* Edward Zhang + * https://www.linkedin.com/in/edwardjczhang/ + * https://zedward23.github.io/personal_Website/ + +* Tested on: Windows 10 Home, i7-11800H @ 2.3GHz, 16.0GB, NVIDIA GeForce RTX 3060 Laptop GPU -### (TODO: Your README) +### Images +![](images/Part1%20Screenshot.png) + +![](images/Part2%20Screenshot.png) + +![](images/Part3.png) + +![](images/Part4.png) + +![](images/Part5.png) + +![](images/Part5.1.png) + +![](images/Part5.2.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..058bcad 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 = "Edward Zhang"; 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..3e79616 100644 --- a/dxr-support/Libraries/D3D12RaytracingFallback/src/FallbackLayer.vcxproj.filters +++ b/dxr-support/Libraries/D3D12RaytracingFallback/src/FallbackLayer.vcxproj.filters @@ -192,6 +192,12 @@ + + + + + + @@ -468,10 +474,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/DeviceResources.cpp b/dxr-support/src/D3D12RaytracingHelloWorld/DeviceResources.cpp index 6e89c11..b2ee732 100644 --- a/dxr-support/src/D3D12RaytracingHelloWorld/DeviceResources.cpp +++ b/dxr-support/src/D3D12RaytracingHelloWorld/DeviceResources.cpp @@ -155,7 +155,9 @@ void DeviceResources::CreateDeviceResources() D3D12_MESSAGE_ID hide[] = { D3D12_MESSAGE_ID_MAP_INVALID_NULLRANGE, - D3D12_MESSAGE_ID_UNMAP_INVALID_NULLRANGE + D3D12_MESSAGE_ID_UNMAP_INVALID_NULLRANGE, + D3D12_MESSAGE_ID_EXECUTECOMMANDLISTS_WRONGSWAPCHAINBUFFERREFERENCE, + D3D12_MESSAGE_ID_RESOURCE_BARRIER_MISMATCHING_COMMAND_LIST_TYPE, }; D3D12_INFO_QUEUE_FILTER filter = {}; filter.DenyList.NumIDs = _countof(hide); diff --git a/dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl b/dxr-support/src/D3D12RaytracingHelloWorld/Raytracing.hlsl index d817ca4..ba913e5 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(.8, 0, 0); payload.color = float4(barycentrics, 1); } diff --git a/images/Part1 Screenshot.png b/images/Part1 Screenshot.png new file mode 100644 index 0000000..24f9b9b Binary files /dev/null and b/images/Part1 Screenshot.png differ diff --git a/images/Part2 Screenshot.png b/images/Part2 Screenshot.png new file mode 100644 index 0000000..1538608 Binary files /dev/null and b/images/Part2 Screenshot.png differ diff --git a/images/Part3.png b/images/Part3.png new file mode 100644 index 0000000..6e2099c Binary files /dev/null and b/images/Part3.png differ diff --git a/images/Part4.png b/images/Part4.png new file mode 100644 index 0000000..9a72066 Binary files /dev/null and b/images/Part4.png differ diff --git a/images/Part5.1.png b/images/Part5.1.png new file mode 100644 index 0000000..51d69bb Binary files /dev/null and b/images/Part5.1.png differ diff --git a/images/Part5.2.png b/images/Part5.2.png new file mode 100644 index 0000000..844ab85 Binary files /dev/null and b/images/Part5.2.png differ diff --git a/images/Part5.png b/images/Part5.png new file mode 100644 index 0000000..170195c Binary files /dev/null and b/images/Part5.png differ