Last update

.github/workflows/build.yml

@@ -8,6 +8,8 @@ on:
         branches:
             - "main"
 
+permissions: {}
+
 jobs:
     build:
         runs-on: windows-2022

ReShade.vcxproj

@@ -45,7 +45,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{0401ADF5-D085-4A3D-95B2-D9B7896BB338}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
     <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'&gt;='16.0'">10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -266,7 +266,7 @@
       <FloatingPointModel>Fast</FloatingPointModel>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalOptions>/Zc:threadSafeInit- /utf-8 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalOptions Condition="'$(VisualStudioVersion)'&gt;='16.0'">/Zc:char8_t- %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
@@ -308,7 +308,7 @@
       <FloatingPointModel>Fast</FloatingPointModel>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalOptions>/Zc:threadSafeInit- /utf-8 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalOptions Condition="'$(VisualStudioVersion)'&gt;='16.0'">/Zc:char8_t- %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
@@ -349,7 +349,7 @@
       <FloatingPointModel>Fast</FloatingPointModel>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalOptions>/Zc:threadSafeInit- /utf-8 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalOptions Condition="'$(VisualStudioVersion)'&gt;='16.0'">/Zc:char8_t- %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
@@ -389,7 +389,7 @@
       <FloatingPointModel>Fast</FloatingPointModel>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalOptions>/Zc:threadSafeInit- /utf-8 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalOptions Condition="'$(VisualStudioVersion)'&gt;='16.0'">/Zc:char8_t- %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
@@ -430,7 +430,7 @@
       <FloatingPointModel>Fast</FloatingPointModel>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalOptions>/Zc:threadSafeInit- /utf-8 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalOptions Condition="'$(VisualStudioVersion)'&gt;='16.0'">/Zc:char8_t- %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
@@ -475,7 +475,7 @@
       <FloatingPointModel>Fast</FloatingPointModel>
       <RuntimeTypeInfo>false</RuntimeTypeInfo>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
-      <AdditionalOptions>/Zc:threadSafeInit- /utf-8 %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
       <AdditionalOptions Condition="'$(VisualStudioVersion)'&gt;='16.0'">/Zc:char8_t- %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
@@ -634,8 +634,12 @@
       <PreprocessorDefinitions Condition="'$(Platform)'=='Win32'">_X86_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Platform)'=='x64'">_AMD64_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
-    <ClCompile Include="source\opengl\opengl.cpp" />
-    <ClCompile Include="source\opengl\opengl_hooks_ffp.cpp" />
+    <ClCompile Include="source\opengl\opengl.cpp">
+      <AdditionalOptions Condition="'$(Configuration)'=='Release' Or '$(Configuration)'=='Release Signed' Or '$(Configuration)'=='Release App'">/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
+    <ClCompile Include="source\opengl\opengl_hooks_ffp.cpp">
+      <AdditionalOptions Condition="'$(Configuration)'=='Release' Or '$(Configuration)'=='Release Signed' Or '$(Configuration)'=='Release App'">/Zc:threadSafeInit- %(AdditionalOptions)</AdditionalOptions>
+    </ClCompile>
     <ClCompile Include="source\opengl\opengl_hooks_wgl.cpp" />
     <ClCompile Include="source\opengl\opengl_impl_command_list.cpp" />
     <ClCompile Include="source\opengl\opengl_impl_command_queue.cpp" />

ReShadeFX.vcxproj

@@ -21,7 +21,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{D1C2099B-BEC7-4993-8947-01D4A1F7EAE2}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
     <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'&gt;='16.0'">10.0</WindowsTargetPlatformVersion>
     <ProjectName>ReShade FX</ProjectName>
   </PropertyGroup>

ReShadeFXC.vcxproj

@@ -21,7 +21,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{65640687-0740-4681-B018-17DBF33E061C}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
     <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'&gt;='16.0'">10.0</WindowsTargetPlatformVersion>
     <ProjectName>FXC</ProjectName>
   </PropertyGroup>

ReShadeInject.vcxproj

@@ -21,7 +21,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{D388A856-4100-49AB-8FAF-62D63F8AC155}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
     <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'&gt;='16.0'">10.0</WindowsTargetPlatformVersion>
     <ProjectName>Injector</ProjectName>
   </PropertyGroup>

deps/ImGui.vcxproj

@@ -20,7 +20,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{9A62233B-0B70-4B48-91E8-35AA666BC32E}</ProjectGuid>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
     <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'&gt;='16.0'">10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

deps/MinHook.vcxproj

@@ -20,7 +20,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{783FEDFB-5124-4F8C-87BC-70AA8490266B}</ProjectGuid>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
     <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'&gt;='16.0'">10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

deps/fpng.vcxproj

@@ -20,7 +20,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{79F676AF-1A25-49BB-9549-E533D162FB0A}</ProjectGuid>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
     <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'&gt;='16.0'">10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

deps/glad.vcxproj

@@ -20,7 +20,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{09C0D610-9B82-40D8-B37E-0D26E3BFF77F}</ProjectGuid>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
     <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'&gt;='16.0'">10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

deps/jxl_simple_lossless.vcxproj

@@ -20,7 +20,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{54216c95-7b51-46d3-ab11-4b341e76a774}</ProjectGuid>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
     <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'&gt;='16.0'">10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -86,7 +86,9 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="jxl_simple_lossless\simple_lossless.cc" />
+    <ClCompile Include="jxl_simple_lossless\simple_lossless.cc">
+      <ForcedIncludeFiles Condition="'$(PlatformToolset)'=='v141' Or '$(PlatformToolset)'=='v142'">intrin.h</ForcedIncludeFiles>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="jxl_simple_lossless\simple_lossless.h" />

deps/stb.vcxproj

@@ -20,7 +20,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{723BDEF8-4A39-4961-BDAB-54074012FF47}</ProjectGuid>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.19041.0</WindowsTargetPlatformVersion>
     <WindowsTargetPlatformVersion Condition="'$(VisualStudioVersion)'&gt;='16.0'">10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />

examples/04-api_trace/api_trace_addon.cpp

@@ -585,7 +585,7 @@ static void on_push_descriptors(command_list *, shader_stage stages, pipeline_la
 
 	reshade::log::message(reshade::log::level::info, s.str().c_str());
 }
-static void on_bind_descriptor_tables(command_list *, shader_stage stages, pipeline_layout layout, uint32_t first, uint32_t count, const descriptor_table *tables)
+static void on_bind_descriptor_tables(command_list *, shader_stage stages, pipeline_layout layout, uint32_t first, uint32_t count, const descriptor_table *tables, uint32_t dynamic_offset_count, const uint32_t *dynamic_offsets)
 {
 	if (!s_do_capture)
 		return;

examples/09-depth/generic_depth_addon.cpp

@@ -1363,7 +1363,7 @@ static void draw_settings_overlay(effect_runtime *runtime)
 					clear_stats.clear_op == clear_op::fullscreen_draw ? " Fullscreen draw call" : "");
 			}
 
-			if (sorted_item_list.size() == 1 && !is_d3d12_or_vulkan)
+			if (!is_d3d12_or_vulkan)
 			{
 				if (bool value = (depth_stencil_backup->force_clear_index == std::numeric_limits<uint32_t>::max());
 					ImGui::Checkbox("    Choose last clear operation with high number of draw calls", &value))

examples/10-texture_overlay/texture_overlay_addon.cpp

@@ -200,7 +200,7 @@ static void on_push_descriptors(command_list *cmd_list, shader_stage stages, pip
 		}
 	}
 }
-static void on_bind_descriptor_tables(command_list *cmd_list, shader_stage stages, pipeline_layout layout, uint32_t first, uint32_t count, const descriptor_table *tables)
+static void on_bind_descriptor_tables(command_list *cmd_list, shader_stage stages, pipeline_layout layout, uint32_t first, uint32_t count, const descriptor_table *tables, uint32_t dynamic_offset_count, const uint32_t *dynamic_offsets)
 {
 	if ((stages & shader_stage::pixel) != shader_stage::pixel)
 		return;

examples/13-effects_during_frame/effects_during_frame_addon.cpp

@@ -82,7 +82,7 @@ static bool on_end_render_pass(command_list *cmd_list)
 		const resource_desc render_target_desc = device->get_resource_desc(device->get_resource_from_view(cmd_data.current_main_rtv));
 
 		if (render_target_desc.texture.width != width || render_target_desc.texture.height != height)
-			return;
+			return false;
 	}
 
 	// Render post-processing effects when a specific render pass is found (instead of at the end of the frame)

examples/utils/state_tracking.cpp

@@ -124,7 +124,7 @@ static void on_bind_scissor_rects(command_list *cmd_list, uint32_t first, uint32
 		state.scissor_rects[i + first] = rects[i];
 }
 
-static void on_bind_descriptor_tables(command_list *cmd_list, shader_stage stages, pipeline_layout layout, uint32_t first, uint32_t count, const descriptor_table *tables)
+static void on_bind_descriptor_tables(command_list *cmd_list, shader_stage stages, pipeline_layout layout, uint32_t first, uint32_t count, const descriptor_table *tables, uint32_t dynamic_offset_count, const uint32_t *dynamic_offsets)
 {
 	auto &state = cmd_list->get_private_data<state_tracking>()->descriptor_tables[stages];
 

include/reshade.hpp

@@ -370,7 +370,7 @@ namespace reshade
 	}
 
 	/// <summary>
-	/// Creates a new effect runtime for an existing swapchain, for when it was not already hooked by ReShade (e.g. because the RESHADE_DISABLE_GRAPHICS_HOOK environment variable is set).
+	/// Creates a new effect runtime for an existing swap chain, for when it was not already hooked by ReShade (e.g. because the RESHADE_DISABLE_GRAPHICS_HOOK environment variable is set).
 	/// </summary>
 	/// <param name="api">Underlying graphics API used.</param>
 	/// <param name="device">'IDirect3DDevice9', 'ID3D10Device', 'ID3D11Device', 'ID3D12Device', 'HGLRC' or 'VkDevice', depending on the graphics API.</param>

include/reshade_api_device.hpp

@@ -803,7 +803,7 @@ namespace reshade::api
 		/// <param name="first">Index of the first pipeline <paramref name="layout"/> parameter that describes the first descriptor table to bind (root parameter index in D3D12, descriptor set index in Vulkan).</param>
 		/// <param name="count">Number of descriptor tables to bind.</param>
 		/// <param name="tables">Pointer to the first element of an array of descriptor tables to bind.</param>
-		virtual void bind_descriptor_tables(shader_stage stages, pipeline_layout layout, uint32_t first, uint32_t count, const descriptor_table *tables) = 0;
+		virtual void bind_descriptor_tables(shader_stage stages, pipeline_layout layout, uint32_t first, uint32_t count, const descriptor_table *tables) { bind_descriptor_tables2(stages, layout, first, count, tables, 0, nullptr); }
 
 		/// <summary>
 		/// Binds an index buffer to the input-assembler stage.
@@ -1177,6 +1177,18 @@ namespace reshade::api
 		/// <param name="ds">Optional pointer to a depth-stencil description, or <see langword="nullptr"/> to bind none.</param>
 		/// <param name="flags">Additional parameters of the render pass.</param>
 		virtual void begin_render_pass2(uint32_t count, const render_pass_render_target_desc *rts, const render_pass_depth_stencil_desc *ds, render_pass_flags flags) = 0;
+
+		/// <summary>
+		/// Binds an array of descriptor tables.
+		/// </summary>
+		/// <param name="stages">Shader stages that will use the descriptors.</param>
+		/// <param name="layout">Pipeline layout that describes the descriptors.</param>
+		/// <param name="first">Index of the first pipeline <paramref name="layout"/> parameter that describes the first descriptor table to bind (root parameter index in D3D12, descriptor set index in Vulkan).</param>
+		/// <param name="count">Number of descriptor tables to bind.</param>
+		/// <param name="tables">Pointer to the first element of an array of descriptor tables to bind.</param>
+		/// <param name="dynamic_offset_count">Number of dynamic offsets.</param>
+		/// <param name="dynamic_offsets">Pointer to the first element of an array of dynamic offsets for any descriptors of type <see cref="descriptor_type::constant_buffer_with_dynamic_offset"/> or <see cref="descriptor_type::shader_storage_buffer_with_dynamic_offset"/>.</param>
+		virtual void bind_descriptor_tables2(shader_stage stages, pipeline_layout layout, uint32_t first, uint32_t count, const descriptor_table *tables, uint32_t dynamic_offset_count, const uint32_t *dynamic_offsets) = 0;
 	};
 
 	/// <summary>

include/reshade_api_pipeline.hpp

@@ -111,10 +111,12 @@ namespace reshade::api
 		/// Descriptors are an array of <see cref="buffer_range"/>.
 		/// </summary>
 		constant_buffer = 6,
+		constant_buffer_with_dynamic_offset = 8,
 		/// <summary>
 		/// Descriptors are an array of <see cref="buffer_range"/>.
 		/// </summary>
 		shader_storage_buffer = 7,
+		shader_storage_buffer_with_dynamic_offset = 9,
 		/// <summary>
 		/// Descriptors are an array of <see cref="resource_view"/>.
 		/// </summary>
@@ -147,8 +149,8 @@ namespace reshade::api
 		push_descriptors_with_ranges = 3,
 		push_descriptors_with_ranges_and_flags = 5,
 
-		descriptor_table_with_static_samplers [[deprecated]] = descriptor_table_with_flags,
-		push_descriptors_with_static_samplers [[deprecated]] = push_descriptors_with_ranges_and_flags,
+		descriptor_table_with_static_samplers [[deprecated("use 'pipeline_layout_param_type::descriptor_table_with_flags' instead")]] = descriptor_table_with_flags,
+		push_descriptors_with_static_samplers [[deprecated("use 'pipeline_layout_param_type::push_descriptors_with_ranges_and_flags' instead")]] = push_descriptors_with_ranges_and_flags,
 	};
 
 	/// <summary>
@@ -605,6 +607,7 @@ namespace reshade::api
 		/// Stride of the entire vertex (this has to be consistent for all elements per vertex buffer binding).
 		/// Set to zero in case this is unknown.
 		/// </summary>
+		/// <seealso cref="dynamic_state::input_element_stride"/>
 		uint32_t stride = 0;
 		/// <summary>
 		/// Number of instances to draw using the same per-instance data before advancing by one element.
@@ -1301,6 +1304,7 @@ namespace reshade::api
 		alpha_func = 25,
 		srgb_write_enable = 194,
 		primitive_topology = 1000,
+		input_element_stride = 1009,
 		sample_mask = 162,
 
 		// Blend state

include/reshade_api_resource.hpp

@@ -190,10 +190,10 @@ namespace reshade::api
 		/// </summary>
 		gpu_upload = 6,
 
-		gpu_only   [[deprecated]] = default_,
-		cpu_to_gpu [[deprecated]] = upload,
-		gpu_to_cpu [[deprecated]] = readback,
-		cpu_only   [[deprecated]] = scratch,
+		gpu_only [[deprecated("use 'memory_heap::default_' instead")]] = default_,
+		cpu_to_gpu [[deprecated("use 'memory_heap::upload' instead")]] = upload,
+		gpu_to_cpu [[deprecated("use 'memory_heap::readback' instead")]] = readback,
+		cpu_only [[deprecated("use 'memory_heap::scratch' instead")]] = scratch,
 	};
 
 	/// <summary>