seedlingattempt/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #111347 from Ivorforce/no-algorithm

Browse Source 
Add `max()` to `Span`, replacing `<algorithm>` include from `rendering_device_commons.h`
This commit is contained in:
Thaddeus Crews
2025-10-07 17:15:09 -05:00
parent 0f7bf2913f 1fa332cad4
commit ef853bbc06
4 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
servers/rendering/rendering_device_commons.h
View File

@ -33,8 +33,6 @@
#include "core/object/object.h"
#include "core/variant/type_info.h"
#include <algorithm>
#define STEPIFY(m_number, m_alignment) ((((m_number) + ((m_alignment) - 1)) / (m_alignment)) * (m_alignment))
// This may one day be used in Godot for interoperability between C arrays, Vector and LocalVector.

2
servers/rendering/rendering_device_driver.h
View File

@ -70,7 +70,7 @@ class RenderingShaderContainerFormat;
template <typename... RESOURCE_TYPES>
struct VersatileResourceTemplate {
static constexpr size_t RESOURCE_SIZES[] = { sizeof(RESOURCE_TYPES)... };
static constexpr size_t MAX_RESOURCE_SIZE = std::max_element(RESOURCE_SIZES, RESOURCE_SIZES + sizeof...(RESOURCE_TYPES))[0];
static constexpr size_t MAX_RESOURCE_SIZE = Span(RESOURCE_SIZES).max();
uint8_t data[MAX_RESOURCE_SIZE];
template <typename T>