Remove "malloc.h" includes as they are no longer used

crosire · Jan 29, 2022 · 792dd45 · 792dd45
1 parent 44fb2f2
commit 792dd45
Show file tree

Hide file tree

Showing 10 changed files with 2 additions and 10 deletions.
diff --git a/source/d3d12/d3d12_command_list.cpp b/source/d3d12/d3d12_command_list.cpp
@@ -8,7 +8,6 @@
 #include "d3d12_descriptor_heap.hpp"
 #include "d3d12_impl_type_convert.hpp"
 #include "dll_log.hpp"
-#include <malloc.h>
 
 using reshade::d3d12::to_handle;
 

diff --git a/source/d3d12/d3d12_command_queue.cpp b/source/d3d12/d3d12_command_queue.cpp
@@ -8,7 +8,6 @@
 #include "d3d12_command_queue.hpp"
 #include "d3d12_command_queue_downlevel.hpp"
 #include "dll_log.hpp"
-#include <malloc.h>
 
 D3D12CommandQueue::D3D12CommandQueue(D3D12Device *device, ID3D12CommandQueue *original) :
 	command_queue_impl(device, original),

diff --git a/source/d3d12/d3d12_device.cpp b/source/d3d12/d3d12_device.cpp
@@ -11,7 +11,6 @@
 #include "d3d12_impl_type_convert.hpp"
 #include "dll_log.hpp" // Include late to get HRESULT log overloads
 #include "com_utils.hpp"
-#include <malloc.h>
 
 using reshade::d3d12::to_handle;
 

diff --git a/source/d3d12/d3d12_impl_command_list.cpp b/source/d3d12/d3d12_impl_command_list.cpp
@@ -6,7 +6,6 @@
 #include "d3d12_impl_device.hpp"
 #include "d3d12_impl_command_list.hpp"
 #include "d3d12_impl_type_convert.hpp"
-#include <malloc.h>
 #include <algorithm>
 
 void encode_pix3blob(UINT64(&pix3blob)[64], const char *label, const float color[4])

diff --git a/source/d3d12/d3d12_impl_device.cpp b/source/d3d12/d3d12_impl_device.cpp
@@ -9,7 +9,6 @@
 #include "d3d12_descriptor_heap.hpp"
 #include "dll_log.hpp"
 #include "dll_resources.hpp"
-#include <malloc.h>
 #include <algorithm>
 
 extern bool is_windows7();

diff --git a/source/opengl/opengl_hooks.cpp b/source/opengl/opengl_hooks.cpp
@@ -7,7 +7,6 @@
 #include "opengl_impl_swapchain.hpp"
 #include "opengl_impl_type_convert.hpp"
 #include "opengl_hooks.hpp" // Fix name clashes with gl3w
-#include <malloc.h>
 
 struct DrawArraysIndirectCommand
 {
@@ -228,6 +227,7 @@ static reshade::api::subresource_data convert_mapped_subresource(GLenum format,
 	return result;
 }
 
+#if RESHADE_ADDON && !RESHADE_ADDON_LITE
 static bool copy_buffer_region(GLenum src_target, GLuint src_object, GLintptr src_offset, GLenum dst_target, GLuint dst_object, GLintptr dst_offset, GLsizeiptr size)
 {
 	if (!g_current_context || !reshade::has_addon_event<reshade::addon_event::copy_buffer_region>())
@@ -355,6 +355,7 @@ static bool update_texture_region(GLenum target, GLuint object, GLint level, GLi
 	std::vector<uint8_t> temp_data;
 	return reshade::invoke_addon_event<reshade::addon_event::update_texture_region>(g_current_context, convert_mapped_subresource(format, type, pixels, &temp_data, width, height, depth), dst, subresource, &dst_box);
 }
+#endif
 
 static __forceinline auto get_index_buffer_offset(const GLvoid *indices) -> GLuint
 {

diff --git a/source/vulkan/vulkan_hooks_cmd.cpp b/source/vulkan/vulkan_hooks_cmd.cpp
@@ -8,7 +8,6 @@
 #include "vulkan_impl_device.hpp"
 #include "vulkan_impl_command_list.hpp"
 #include "vulkan_impl_type_convert.hpp"
-#include <malloc.h>
 #include <algorithm>
 
 extern lockfree_linear_map<void *, reshade::vulkan::device_impl *, 8> g_vulkan_devices;

diff --git a/source/vulkan/vulkan_hooks_device.cpp b/source/vulkan/vulkan_hooks_device.cpp
@@ -11,7 +11,6 @@
 #include "vulkan_impl_command_queue.hpp"
 #include "vulkan_impl_swapchain.hpp"
 #include "vulkan_impl_type_convert.hpp"
-#include <malloc.h>
 
 // Set during Vulkan device creation and presentation, to avoid hooking internal D3D devices created e.g. by NVIDIA Ansel and Optimus
 extern thread_local bool g_in_dxgi_runtime;

diff --git a/source/vulkan/vulkan_impl_command_list.cpp b/source/vulkan/vulkan_impl_command_list.cpp
@@ -6,7 +6,6 @@
 #include "vulkan_impl_device.hpp"
 #include "vulkan_impl_command_list.hpp"
 #include "vulkan_impl_type_convert.hpp"
-#include <malloc.h>
 #include <algorithm>
 
 #define vk _device_impl->_dispatch_table

diff --git a/source/vulkan/vulkan_impl_device.cpp b/source/vulkan/vulkan_impl_device.cpp
@@ -7,7 +7,6 @@
 #include "vulkan_impl_device.hpp"
 #include "vulkan_impl_command_queue.hpp"
 #include "vulkan_impl_type_convert.hpp"
-#include <malloc.h>
 #include <algorithm>
 
 #define vk _dispatch_table