- removed templates.h includes.

2025-05-30 08:51:08 +00:00 · 2021-10-30 10:51:03 +02:00 · 2021-10-30 10:51:03 +02:00 · 6e0fbb2043
commit 6e0fbb2043
parent b02a6a3ec9
84 changed files with 99 additions and 99 deletions
--- a/source/common/rendering/gl/gl_debug.cpp
+++ b/source/common/rendering/gl/gl_debug.cpp
@ -19,7 +19,7 @@
 **  3. This notice may not be removed or altered from any source distribution.
 */

-#include "templates.h"
+
 #include "gl_system.h"
 #include "gl_debug.h"
 #include "stats.h"
--- a/source/common/rendering/gl/gl_framebuffer.cpp
+++ b/source/common/rendering/gl/gl_framebuffer.cpp
@ -36,7 +36,7 @@
 #include "gl_system.h"
 #include "v_video.h"
 #include "m_png.h"
-#include "templates.h"
+
 #include "i_time.h"

 #include "gl_interface.h"
--- a/source/common/rendering/gl/gl_hwtexture.cpp
+++ b/source/common/rendering/gl/gl_hwtexture.cpp
@ -34,7 +34,7 @@
 */

 #include "gl_system.h"
-#include "templates.h"
+
 #include "c_cvars.h"
 #include "hw_material.h"

--- a/source/common/rendering/gl/gl_postprocess.cpp
+++ b/source/common/rendering/gl/gl_postprocess.cpp
@ -33,7 +33,7 @@
 #include "flatvertices.h"
 #include "r_videoscale.h"
 #include "v_video.h"
-#include "templates.h"
+
 #include "hw_vrmodes.h"
 #include "v_draw.h"

--- a/source/common/rendering/gl/gl_postprocessstate.cpp
+++ b/source/common/rendering/gl/gl_postprocessstate.cpp
@ -19,7 +19,7 @@
 **  3. This notice may not be removed or altered from any source distribution.
 */

-#include "templates.h"
+
 #include "gl_system.h"
 #include "gl_interface.h"
 #include "gl_postprocessstate.h"
--- a/source/common/rendering/gl/gl_renderbuffers.cpp
+++ b/source/common/rendering/gl/gl_renderbuffers.cpp
@ -30,7 +30,7 @@
 #include "gl_postprocessstate.h"
 #include "gl_shaderprogram.h"
 #include "gl_buffers.h"
-#include "templates.h"
+
 #include <random>

 EXTERN_CVAR(Int, gl_debug_level)
--- a/source/common/rendering/gl/gl_renderstate.cpp
+++ b/source/common/rendering/gl/gl_renderstate.cpp
@ -25,7 +25,7 @@
 **
 */

-#include "templates.h"
+
 #include "gl_system.h"
 #include "gl_interface.h"
 #include "hw_cvars.h"
--- a/source/common/rendering/gl/gl_stereo3d.cpp
+++ b/source/common/rendering/gl/gl_stereo3d.cpp
@ -34,7 +34,7 @@
 #include "gl_framebuffer.h"
 #include "gl_shaderprogram.h"
 #include "gl_buffers.h"
-#include "templates.h"
+

 EXTERN_CVAR(Int, vr_mode)
 EXTERN_CVAR(Float, vid_saturation)
--- a/source/common/rendering/gles/gles_framebuffer.cpp
+++ b/source/common/rendering/gles/gles_framebuffer.cpp
@ -36,7 +36,7 @@
 #include "gles_system.h"
 #include "v_video.h"
 #include "m_png.h"
-#include "templates.h"
+
 #include "i_time.h"

 #include "gles_framebuffer.h"
--- a/source/common/rendering/gles/gles_hwtexture.cpp
+++ b/source/common/rendering/gles/gles_hwtexture.cpp
@ -34,7 +34,7 @@
 */

 #include "gles_system.h"
-#include "templates.h"
+
 #include "c_cvars.h"
 #include "hw_material.h"

--- a/source/common/rendering/gles/gles_postprocess.cpp
+++ b/source/common/rendering/gles/gles_postprocess.cpp
@ -32,7 +32,7 @@
 #include "flatvertices.h"
 #include "r_videoscale.h"
 #include "v_video.h"
-#include "templates.h"
+
 #include "hw_vrmodes.h"
 #include "v_draw.h"

--- a/source/common/rendering/gles/gles_postprocessstate.cpp
+++ b/source/common/rendering/gles/gles_postprocessstate.cpp
@ -19,7 +19,7 @@
 **  3. This notice may not be removed or altered from any source distribution.
 */

-#include "templates.h"
+
 #include "gles_system.h"
 #include "gles_postprocessstate.h"

--- a/source/common/rendering/gles/gles_renderbuffers.cpp
+++ b/source/common/rendering/gles/gles_renderbuffers.cpp
@ -28,7 +28,7 @@
 #include "gles_postprocessstate.h"
 #include "gles_shaderprogram.h"
 #include "gles_buffers.h"
-#include "templates.h"
+
 #include <random>

 EXTERN_CVAR(Int, gl_debug_level)
--- a/source/common/rendering/gles/gles_renderstate.cpp
+++ b/source/common/rendering/gles/gles_renderstate.cpp
@ -25,7 +25,7 @@
 **
 */

-#include "templates.h"
+
 #include "gles_system.h"
 #include "hw_cvars.h"
 #include "flatvertices.h"
--- a/source/common/rendering/hwrenderer/postprocessing/hw_postprocess.cpp
+++ b/source/common/rendering/hwrenderer/postprocessing/hw_postprocess.cpp
@ -26,7 +26,7 @@
 #include "hwrenderer/postprocessing/hw_postprocessshader.h"
 #include <random>
 #include "texturemanager.h"
-#include "templates.h"
+
 #include "stats.h"

 Postprocess hw_postprocess;
--- a/source/common/rendering/i_modelvertexbuffer.h
+++ b/source/common/rendering/i_modelvertexbuffer.h
@ -1,6 +1,6 @@
 #pragma once

-#include "templates.h"
+

 struct FModelVertex
 {
--- a/source/common/rendering/r_thread.cpp
+++ b/source/common/rendering/r_thread.cpp
@ -21,7 +21,7 @@
 */

 #include <stddef.h>
-#include "templates.h"
+
 #include "i_system.h"
 #include "filesystem.h"
 #include "v_video.h"
--- a/source/common/rendering/r_thread.h
+++ b/source/common/rendering/r_thread.h
@ -27,7 +27,7 @@
 #include <thread>
 #include <mutex>
 #include <condition_variable>
-#include "templates.h"
+
 #include "c_cvars.h"
 #include "basics.h"

--- a/source/common/rendering/r_videoscale.cpp
+++ b/source/common/rendering/r_videoscale.cpp
@ -34,7 +34,7 @@
 #include "c_dispatch.h"
 #include "c_cvars.h"
 #include "v_video.h"
-#include "templates.h"
+
 #include "r_videoscale.h"
 #include "cmdlib.h"
 #include "v_draw.h"
--- a/source/common/rendering/v_video.cpp
+++ b/source/common/rendering/v_video.cpp
@ -61,7 +61,7 @@
 #include "texturemanager.h"
 #include "i_interface.h"
 #include "v_draw.h"
-#include "templates.h"
+

 EXTERN_CVAR(Int, menu_resolution_custom_width)
 EXTERN_CVAR(Int, menu_resolution_custom_height)
--- a/source/common/rendering/vulkan/renderer/vk_postprocess.cpp
+++ b/source/common/rendering/vulkan/renderer/vk_postprocess.cpp
@ -36,7 +36,7 @@
 #include "flatvertices.h"
 #include "r_videoscale.h"
 #include "filesystem.h"
-#include "templates.h"
+

 EXTERN_CVAR(Int, gl_dither_bpc)

--- a/source/common/rendering/vulkan/renderer/vk_renderbuffers.cpp
+++ b/source/common/rendering/vulkan/renderer/vk_renderbuffers.cpp
@ -27,7 +27,7 @@
 #include "vulkan/system/vk_builders.h"
 #include "vulkan/system/vk_framebuffer.h"
 #include "hw_cvars.h"
-#include "templates.h"
+

 VkRenderBuffers::VkRenderBuffers()
 {
--- a/source/common/rendering/vulkan/renderer/vk_renderstate.cpp
+++ b/source/common/rendering/vulkan/renderer/vk_renderstate.cpp
@ -26,7 +26,7 @@
 #include "vulkan/renderer/vk_renderpass.h"
 #include "vulkan/renderer/vk_renderbuffers.h"
 #include "vulkan/textures/vk_hwtexture.h"
-#include "templates.h"
+
 #include "hw_skydome.h"
 #include "hw_viewpointuniforms.h"
 #include "hw_lightbuffer.h"
--- a/source/common/rendering/vulkan/system/vk_framebuffer.cpp
+++ b/source/common/rendering/vulkan/system/vk_framebuffer.cpp
@ -26,7 +26,7 @@

 #include "v_video.h"
 #include "m_png.h"
-#include "templates.h"
+
 #include "r_videoscale.h"
 #include "i_time.h"
 #include "v_text.h"
--- a/source/common/rendering/vulkan/textures/vk_hwtexture.cpp
+++ b/source/common/rendering/vulkan/textures/vk_hwtexture.cpp
@ -20,7 +20,7 @@
 **
 */

-#include "templates.h"
+
 #include "c_cvars.h"
 #include "hw_material.h"
 #include "hw_cvars.h"
--- a/source/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h
+++ b/source/common/rendering/vulkan/thirdparty/vk_mem_alloc/vk_mem_alloc.h
@ -18473,8 +18473,8 @@ VkMemoryRequirements img2MemReq;
 vkGetImageMemoryRequirements(device, img2, &img2MemReq);

 VkMemoryRequirements finalMemReq = {};
-finalMemReq.size = max(img1MemReq.size, img2MemReq.size);
-finalMemReq.alignment = max(img1MemReq.alignment, img2MemReq.alignment);
+finalMemReq.size = std::max(img1MemReq.size, img2MemReq.size);
+finalMemReq.alignment = std::max(img1MemReq.alignment, img2MemReq.alignment);
 finalMemReq.memoryTypeBits = img1MemReq.memoryTypeBits & img2MemReq.memoryTypeBits;
 // Validate if(finalMemReq.memoryTypeBits != 0)