Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: TheRealMJP/DeferredTexturing
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.0
Choose a base ref
...
head repository: TheRealMJP/DeferredTexturing
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing with 46,409 additions and 12,205 deletions.
  1. +5 −1 .gitignore
  2. +13 −12 BindlessDeferred/AppConfig.h
  3. +251 −241 BindlessDeferred/AppSettings.cpp
  4. +220 −214 BindlessDeferred/AppSettings.cs
  5. +158 −155 BindlessDeferred/AppSettings.h
  6. +54 −52 BindlessDeferred/AppSettings.hlsl
  7. +2,424 −2,083 BindlessDeferred/BindlessDeferred.cpp
  8. +151 −204 BindlessDeferred/BindlessDeferred.h
  9. +2 −2 BindlessDeferred/BindlessDeferred.sln
  10. +110 −77 BindlessDeferred/BindlessDeferred.vcxproj
  11. +141 −75 BindlessDeferred/BindlessDeferred.vcxproj.filters
  12. +22 −0 BindlessDeferred/BindlessDeferred_2019.sln
  13. +248 −0 BindlessDeferred/BindlessDeferred_2019.vcxproj
  14. +315 −0 BindlessDeferred/BindlessDeferred_2019.vcxproj.filters
  15. +22 −0 BindlessDeferred/BindlessDeferred_2022.sln
  16. +248 −0 BindlessDeferred/BindlessDeferred_2022.vcxproj
  17. +315 −0 BindlessDeferred/BindlessDeferred_2022.vcxproj.filters
  18. +9 −5 BindlessDeferred/ClusterVisualizer.hlsl
  19. +15 −7 BindlessDeferred/Clusters.hlsl
  20. +359 −333 BindlessDeferred/Deferred.hlsl
  21. +36 −8 BindlessDeferred/DepthOnly.hlsl
  22. +14 −7 BindlessDeferred/MSAAMask.hlsl
  23. +16 −0 BindlessDeferred/Manifest.txt
  24. +255 −229 BindlessDeferred/Mesh.hlsl
  25. +846 −749 BindlessDeferred/MeshRenderer.cpp
  26. +137 −140 BindlessDeferred/MeshRenderer.h
  27. +13 −12 BindlessDeferred/Picking.hlsl
  28. +22 −11 BindlessDeferred/PostProcessing.hlsl
  29. +6 −6 BindlessDeferred/PostProcessor.cpp
  30. +17 −15 BindlessDeferred/Resolve.hlsl
  31. +362 −331 BindlessDeferred/Shading.hlsl
  32. +5 −3 BindlessDeferred/SharedTypes.h
  33. +28 −28 BindlessDeferred/project.sublime-project
  34. +2 −0 Externals/.gitignore
  35. BIN Externals/DXCompiler/Bin/dxcompiler.dll
  36. BIN Externals/DXCompiler/Bin/dxil.dll
  37. +474 −0 Externals/DXCompiler/Include/d3d12shader.h
  38. +725 −0 Externals/DXCompiler/Include/dxcapi.h
  39. BIN Externals/DXCompiler/Lib/dxcompiler.lib
  40. +0 −891 Externals/DirectXTex Aug 2015/Include/BC.h
  41. +0 −67 Externals/DirectXTex Aug 2015/Include/BCDirectCompute.h
  42. +0 −237 Externals/DirectXTex Aug 2015/Include/DDS.h
  43. +0 −231 Externals/DirectXTex Aug 2015/Include/DirectXTexP.h
  44. +0 −422 Externals/DirectXTex Aug 2015/Include/Filters.h
  45. +0 −32 Externals/DirectXTex Aug 2015/Include/scoped.h
  46. BIN Externals/DirectXTex Aug 2015/Lib 2015/Debug/DirectXTex.lib
  47. BIN Externals/DirectXTex Aug 2015/Lib 2015/Debug/DirectXTex.pdb
  48. BIN Externals/DirectXTex Aug 2015/Lib 2015/Release/DirectXTex.lib
  49. BIN Externals/DirectXTex Aug 2015/Lib 2015/Release/DirectXTex.pdb
  50. +149 −94 Externals/{DirectXTex Aug 2015 → DirectXTex July 2017}/Include/DirectXTex.h
  51. +3 −5 Externals/{DirectXTex Aug 2015 → DirectXTex July 2017}/Include/DirectXTex.inl
  52. BIN Externals/DirectXTex July 2017/Lib 2017/Debug/DirectXTex.lib
  53. BIN Externals/DirectXTex July 2017/Lib 2017/Debug/DirectXTex.pdb
  54. BIN Externals/DirectXTex July 2017/Lib 2017/Release/DirectXTex.lib
  55. BIN Externals/DirectXTex July 2017/Lib 2017/Release/DirectXTex.pdb
  56. BIN Externals/HosekSky/Lib 2013/HosekSky.lib
  57. BIN Externals/HosekSky/Lib 2013/HosekSky_Dbg.lib
  58. BIN Externals/HosekSky/Lib 2013/hoseksky.pdb
  59. BIN Externals/HosekSky/Lib 2013/hoseksky_dbg.pdb
  60. BIN Externals/HosekSky/Lib 2015/HosekSky.lib
  61. BIN Externals/HosekSky/Lib 2015/HosekSky.pdb
  62. BIN Externals/HosekSky/Lib 2015/HosekSky_Dbg.lib
  63. BIN Externals/HosekSky/Lib 2015/HosekSky_Dbg.pdb
  64. +485 −0 Externals/WinPixEventRuntime/Include/WinPixEventRuntime/PIXEventsCommon.h
  65. +10,748 −0 Externals/WinPixEventRuntime/Include/WinPixEventRuntime/PIXEventsGenerated.h
  66. +120 −0 Externals/WinPixEventRuntime/Include/WinPixEventRuntime/pix3.h
  67. +55 −0 Externals/WinPixEventRuntime/Include/WinPixEventRuntime/pix3_win.h
  68. BIN Externals/WinPixEventRuntime/bin/WinPixEventRuntime.dll
  69. BIN Externals/WinPixEventRuntime/bin/WinPixEventRuntime.lib
  70. +19 −0 Externals/cxxopts/LICENSE
  71. +1,421 −0 Externals/cxxopts/include/cxxopts.hpp
  72. BIN Externals/imgui-1.46/Lib/Debug/imgui.lib
  73. BIN Externals/imgui-1.46/Lib/Debug/imgui.pdb
  74. BIN Externals/imgui-1.46/Lib/Release/imgui.lib
  75. BIN Externals/imgui-1.46/Lib/Release/imgui.pdb
  76. +9 −4 README.md
  77. +5 −0 SampleFramework12/.gitignore
  78. +0 −1,290 SampleFramework12/v1.00/Graphics/GraphicsTypes.cpp
  79. +0 −216 SampleFramework12/v1.00/Graphics/ShadowHelper.cpp
  80. +0 −37 SampleFramework12/v1.00/Graphics/ShadowHelper.h
  81. +0 −800 SampleFramework12/v1.00/Shaders/D3DX_DXGIFormatConvert.inl
  82. +0 −136 SampleFramework12/v1.00/Shaders/EVSMConvert.hlsl
  83. +0 −424 SampleFramework12/v1.00/Shaders/Shadows.hlsl
  84. +2 −0 SampleFramework12/v1.01/.gitignore
  85. +55 −8 SampleFramework12/{v1.00 → v1.01}/App.cpp
  86. +7 −2 SampleFramework12/{v1.00 → v1.01}/App.h
  87. 0 SampleFramework12/{v1.00 → v1.01}/Assert.cpp
  88. 0 SampleFramework12/{v1.00 → v1.01}/Assert.h
  89. 0 SampleFramework12/{v1.00 → v1.01}/Containers.h
  90. +17 −0 SampleFramework12/v1.01/EnkiTS/License.txt
  91. +228 −0 SampleFramework12/v1.01/EnkiTS/LockLessMultiReadPipe.h
  92. +533 −0 SampleFramework12/v1.01/EnkiTS/TaskScheduler.cpp
  93. +229 −0 SampleFramework12/v1.01/EnkiTS/TaskScheduler.h
  94. +104 −0 SampleFramework12/v1.01/EnkiTS/TaskScheduler_c.cpp
  95. +79 −0 SampleFramework12/v1.01/EnkiTS/TaskScheduler_c.h
  96. 0 SampleFramework12/{v1.00 → v1.01}/Exceptions.h
  97. 0 SampleFramework12/{v1.00 → v1.01}/FileIO.cpp
  98. +2 −2 SampleFramework12/{v1.00 → v1.01}/FileIO.h
  99. 0 SampleFramework12/{v1.00 → v1.01}/Graphics/BRDF.h
  100. 0 SampleFramework12/{v1.00 → v1.01}/Graphics/Camera.cpp
  101. +7 −2 SampleFramework12/{v1.00 → v1.01}/Graphics/Camera.h
  102. +340 −273 SampleFramework12/{v1.00 → v1.01}/Graphics/DX12.cpp
  103. +67 −65 SampleFramework12/{v1.00 → v1.01}/Graphics/DX12.h
  104. +213 −53 SampleFramework12/{v1.00 → v1.01}/Graphics/DX12_Helpers.cpp
  105. +43 −17 SampleFramework12/{v1.00 → v1.01}/Graphics/DX12_Helpers.h
  106. +165 −105 SampleFramework12/{v1.00 → v1.01}/Graphics/DX12_Upload.cpp
  107. +1 −0 SampleFramework12/{v1.00 → v1.01}/Graphics/DX12_Upload.h
  108. 0 SampleFramework12/{v1.00 → v1.01}/Graphics/DXErr.cpp
  109. 0 SampleFramework12/{v1.00 → v1.01}/Graphics/DXErr.h
  110. 0 SampleFramework12/{v1.00 → v1.01}/Graphics/Filtering.h
  111. +1,528 −0 SampleFramework12/v1.01/Graphics/GraphicsTypes.cpp
  112. +518 −469 SampleFramework12/{v1.00 → v1.01}/Graphics/GraphicsTypes.h
  113. +42 −23 SampleFramework12/{v1.00 → v1.01}/Graphics/Model.cpp
  114. +4 −4 SampleFramework12/{v1.00 → v1.01}/Graphics/Model.h
  115. +278 −255 SampleFramework12/{v1.00 → v1.01}/Graphics/PostProcessHelper.cpp
  116. +1 −1 SampleFramework12/{v1.00 → v1.01}/Graphics/PostProcessHelper.h
  117. +11 −5 SampleFramework12/{v1.00 → v1.01}/Graphics/Profiler.cpp
  118. 0 SampleFramework12/{v1.00 → v1.01}/Graphics/Profiler.h
  119. 0 SampleFramework12/{v1.00 → v1.01}/Graphics/SH.cpp
  120. 0 SampleFramework12/{v1.00 → v1.01}/Graphics/SH.h
  121. +51 −0 SampleFramework12/{v1.00 → v1.01}/Graphics/Sampling.cpp
  122. +7 −0 SampleFramework12/{v1.00 → v1.01}/Graphics/Sampling.h
  123. +248 −56 SampleFramework12/{v1.00 → v1.01}/Graphics/ShaderCompilation.cpp
  124. +1 −18 SampleFramework12/{v1.00 → v1.01}/Graphics/ShaderCompilation.h
  125. +631 −0 SampleFramework12/v1.01/Graphics/ShadowHelper.cpp
  126. +113 −0 SampleFramework12/v1.01/Graphics/ShadowHelper.h
  127. +61 −69 SampleFramework12/{v1.00 → v1.01}/Graphics/Skybox.cpp
  128. +6 −5 SampleFramework12/{v1.00 → v1.01}/Graphics/Skybox.h
  129. 0 SampleFramework12/{v1.00 → v1.01}/Graphics/Spectrum.cpp
  130. 0 SampleFramework12/{v1.00 → v1.01}/Graphics/Spectrum.h
  131. 0 SampleFramework12/{v1.00 → v1.01}/Graphics/SpriteFont.cpp
  132. 0 SampleFramework12/{v1.00 → v1.01}/Graphics/SpriteFont.h
  133. +42 −44 SampleFramework12/{v1.00 → v1.01}/Graphics/SpriteRenderer.cpp
  134. +3 −5 SampleFramework12/{v1.00 → v1.01}/Graphics/SpriteRenderer.h
  135. +15 −7 SampleFramework12/{v1.00 → v1.01}/Graphics/SwapChain.cpp
  136. +4 −2 SampleFramework12/{v1.00 → v1.01}/Graphics/SwapChain.h
  137. +33 −34 SampleFramework12/{v1.00 → v1.01}/Graphics/Textures.cpp
  138. 0 SampleFramework12/{v1.00 → v1.01}/Graphics/Textures.h
  139. +3 −1 Externals/HosekSky/Include/ArHosekSkyModel.c → SampleFramework12/v1.01/HosekSky/ArHosekSkyModel.cpp
  140. 0 {Externals/HosekSky/Include → SampleFramework12/v1.01/HosekSky}/ArHosekSkyModel.h
  141. 0 {Externals/HosekSky/Include → SampleFramework12/v1.01/HosekSky}/ArHosekSkyModelData_CIEXYZ.h
  142. 0 {Externals/HosekSky/Include → SampleFramework12/v1.01/HosekSky}/ArHosekSkyModelData_RGB.h
  143. 0 {Externals/HosekSky/Include → SampleFramework12/v1.01/HosekSky}/ArHosekSkyModelData_Spectral.h
  144. 0 {Externals/HosekSky/Include → SampleFramework12/v1.01/HosekSky}/README.txt
  145. +21 −0 SampleFramework12/v1.01/ImGui/LICENSE
  146. +9 −8 {Externals/imgui-1.46/Include → SampleFramework12/v1.01/ImGui}/imconfig.h
  147. +9,863 −0 SampleFramework12/v1.01/ImGui/imgui.cpp
  148. +398 −296 {Externals/imgui-1.46/Include → SampleFramework12/v1.01/ImGui}/imgui.h
  149. +2,643 −0 SampleFramework12/v1.01/ImGui/imgui_demo.cpp
  150. +2,420 −0 SampleFramework12/v1.01/ImGui/imgui_draw.cpp
  151. +214 −142 {Externals/imgui-1.46/Include → SampleFramework12/v1.01/ImGui}/imgui_internal.h
  152. +51 −15 {Externals/imgui-1.46/Include → SampleFramework12/v1.01/ImGui}/stb_rect_pack.h
  153. +128 −67 {Externals/imgui-1.46/Include → SampleFramework12/v1.01/ImGui}/stb_textedit.h
  154. +906 −109 {Externals/imgui-1.46/Include → SampleFramework12/v1.01/ImGui}/stb_truetype.h
  155. +47 −37 SampleFramework12/{v1.00 → v1.01}/ImGuiHelper.cpp
  156. +1 −0 SampleFramework12/{v1.00 → v1.01}/ImGuiHelper.h
  157. 0 SampleFramework12/{v1.00 → v1.01}/Input.cpp
  158. 0 SampleFramework12/{v1.00 → v1.01}/Input.h
  159. +1 −0 SampleFramework12/{v1.00 → v1.01}/InterfacePointers.h
  160. +30 −0 SampleFramework12/v1.01/Manifest.txt
  161. 0 SampleFramework12/{v1.00 → v1.01}/MurmurHash.cpp
  162. +1 −1 SampleFramework12/{v1.00 → v1.01}/MurmurHash.h
  163. 0 SampleFramework12/{v1.00 → v1.01}/PCH.cpp
  164. +20 −25 SampleFramework12/{v1.00 → v1.01}/PCH.h
  165. +2 −2 SampleFramework12/{v1.00 → v1.01}/SF12.props
  166. 0 SampleFramework12/{v1.00 → v1.01}/SF12_Math.cpp
  167. 0 SampleFramework12/{v1.00 → v1.01}/SF12_Math.h
  168. +13 −0 SampleFramework12/v1.01/Scripts/CopyDXC.bat
  169. +9 −0 SampleFramework12/v1.01/Scripts/CopyDXCToOutputDir.bat
  170. +1 −0 SampleFramework12/v1.01/Scripts/SoftCopy.bat
  171. 0 SampleFramework12/{v1.00 → v1.01}/Serialization.h
  172. +1 −0 SampleFramework12/{v1.00 → v1.01}/Settings.cpp
  173. +2 −0 SampleFramework12/{v1.00 → v1.01}/Settings.h
  174. BIN SampleFramework12/v1.01/SettingsCompiler.exe
  175. 0 SampleFramework12/{v1.00 → v1.01}/SettingsCompiler.sln
  176. 0 SampleFramework12/{v1.00 → v1.01}/SettingsCompiler/App.config
  177. 0 SampleFramework12/{v1.00 → v1.01}/SettingsCompiler/Properties/AssemblyInfo.cs
  178. +1 −1 SampleFramework12/{v1.00 → v1.01}/SettingsCompiler/SettingTypes.cs
  179. +10 −5 SampleFramework12/{v1.00 → v1.01}/SettingsCompiler/SettingsCompiler.cs
  180. 0 SampleFramework12/{v1.00 → v1.01}/SettingsCompiler/SettingsCompiler.csproj
  181. BIN SampleFramework12/v1.01/SettingsCompilerAttributes.dll
  182. 0 SampleFramework12/{v1.00 → v1.01}/SettingsCompilerAttributes/Attributes.cs
  183. 0 SampleFramework12/{v1.00 → v1.01}/SettingsCompilerAttributes/Properties/AssemblyInfo.cs
  184. 0 SampleFramework12/{v1.00 → v1.01}/SettingsCompilerAttributes/SettingsCompilerAttributes.csproj
  185. 0 SampleFramework12/{v1.00 → v1.01}/Shaders/BRDF.hlsl
  186. 0 SampleFramework12/{v1.00 → v1.01}/Shaders/Constants.hlsl
  187. 0 SampleFramework12/{v1.00 → v1.01}/Shaders/Conversion.hlsl
  188. +18 −7 SampleFramework12/{v1.00 → v1.01}/Shaders/DecodeTextureCS.hlsl
  189. +18 −0 SampleFramework12/v1.01/Shaders/DescriptorTables.hlsl
  190. +58 −60 SampleFramework12/{v1.00 → v1.01}/Shaders/EVSM.hlsl
  191. 0 SampleFramework12/{v1.00 → v1.01}/Shaders/FullScreenTriangle.hlsl
  192. +10 −2 SampleFramework12/{v1.00 → v1.01}/Shaders/ImGui.hlsl
  193. +140 −0 SampleFramework12/v1.01/Shaders/MSM.hlsl
  194. +13 −8 SampleFramework12/{v1.00 → v1.01}/Shaders/PPCommon.hlsl
  195. 0 SampleFramework12/{v1.00 → v1.01}/Shaders/Quaternion.hlsl
  196. 0 SampleFramework12/{v1.00 → v1.01}/Shaders/SH.hlsl
  197. +507 −0 SampleFramework12/v1.01/Shaders/SMConvert.hlsl
  198. +595 −0 SampleFramework12/v1.01/Shaders/Shadows.hlsl
  199. +4 −2 SampleFramework12/{v1.00 → v1.01}/Shaders/Skybox.hlsl
  200. +15 −5 SampleFramework12/{v1.00 → v1.01}/Shaders/Sprite.hlsl
  201. 0 SampleFramework12/{v1.00 → v1.01}/Timer.cpp
  202. 0 SampleFramework12/{v1.00 → v1.01}/Timer.h
  203. +1 −1 SampleFramework12/{v1.00 → v1.01}/TinyEXR.cpp
  204. 0 SampleFramework12/{v1.00 → v1.01}/TinyEXR.h
  205. BIN SampleFramework12/v1.01/Tools/Packager.exe
  206. +24 −0 SampleFramework12/v1.01/Tools/Packager/App.config
  207. +287 −0 SampleFramework12/v1.01/Tools/Packager/MainFrm.Designer.cs
  208. +594 −0 SampleFramework12/v1.01/Tools/Packager/MainFrm.cs
  209. +120 −0 SampleFramework12/v1.01/Tools/Packager/MainFrm.resx
  210. +89 −0 SampleFramework12/v1.01/Tools/Packager/Packager.csproj
  211. +22 −0 SampleFramework12/v1.01/Tools/Packager/Packager.sln
  212. +22 −0 SampleFramework12/v1.01/Tools/Packager/Program.cs
  213. +36 −0 SampleFramework12/v1.01/Tools/Packager/Properties/AssemblyInfo.cs
  214. +71 −0 SampleFramework12/v1.01/Tools/Packager/Properties/Resources.Designer.cs
  215. +117 −0 SampleFramework12/v1.01/Tools/Packager/Properties/Resources.resx
  216. +62 −0 SampleFramework12/v1.01/Tools/Packager/Properties/Settings.Designer.cs
  217. +15 −0 SampleFramework12/v1.01/Tools/Packager/Properties/Settings.settings
  218. +2 −0 SampleFramework12/{v1.00 → v1.01}/Utility.cpp
  219. +31 −1 SampleFramework12/{v1.00 → v1.01}/Utility.h
  220. 0 SampleFramework12/{v1.00 → v1.01}/Window.cpp
  221. 0 SampleFramework12/{v1.00 → v1.01}/Window.h
  222. 0 SampleFramework12/{v1.00 → v1.01}/sf12.natvis
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -55,6 +55,7 @@ ipch/
*.sdf
*.cachefile
*.VC.opendb
*.VC.db

# Visual Studio profiler
*.psess
@@ -135,6 +136,8 @@ UpgradeLog*.htm
App_Data/*.mdf
App_Data/*.ldf

.vs/

#############
## Windows detritus
#############
@@ -165,4 +168,5 @@ Temp_Lightmap.dds
imgui.ini

# Sublime
*.sublime-workspace
*.sublime-workspace
*.args.json
25 changes: 13 additions & 12 deletions BindlessDeferred/AppConfig.h
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
//=================================================================================================
//
// Bindless Deferred Texturing Sample
// by MJP
// http://mynameismjp.wordpress.com/
//
// All code and content licensed under the MIT license
//
//=================================================================================================

#define EnableSkyModel_ (1)
#define EnableEmbree_ (0)
//=================================================================================================
//
// Bindless Deferred Texturing Sample
// by MJP
// http://mynameismjp.wordpress.com/
//
// All code and content licensed under the MIT license
//
//=================================================================================================

#define EnableSkyModel_ (1)
#define EnableEmbree_ (0)
#define EnableShaderModel6_ (1)
Loading