mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-22 13:49:53 -06:00
Common: Add alignment header
Gets rid of duplicated alignment code.
This commit is contained in:
@ -6,6 +6,7 @@
|
||||
|
||||
#include <cstring>
|
||||
|
||||
#include "Common/Align.h"
|
||||
#include "Common/Assert.h"
|
||||
|
||||
#include "VideoBackends/Vulkan/CommandBufferManager.h"
|
||||
@ -101,11 +102,11 @@ bool StateTracker::Initialize()
|
||||
// To work around this we reserve the maximum buffer size at all times, but only commit
|
||||
// as many bytes as we use.
|
||||
m_uniform_buffer_reserve_size = sizeof(PixelShaderConstants);
|
||||
m_uniform_buffer_reserve_size = Util::AlignValue(m_uniform_buffer_reserve_size,
|
||||
g_vulkan_context->GetUniformBufferAlignment()) +
|
||||
m_uniform_buffer_reserve_size = Common::AlignUp(m_uniform_buffer_reserve_size,
|
||||
g_vulkan_context->GetUniformBufferAlignment()) +
|
||||
sizeof(VertexShaderConstants);
|
||||
m_uniform_buffer_reserve_size = Util::AlignValue(m_uniform_buffer_reserve_size,
|
||||
g_vulkan_context->GetUniformBufferAlignment()) +
|
||||
m_uniform_buffer_reserve_size = Common::AlignUp(m_uniform_buffer_reserve_size,
|
||||
g_vulkan_context->GetUniformBufferAlignment()) +
|
||||
sizeof(GeometryShaderConstants);
|
||||
|
||||
// Default dirty flags include all descriptors
|
||||
@ -461,9 +462,9 @@ void StateTracker::UploadAllConstants()
|
||||
size_t ub_alignment = g_vulkan_context->GetUniformBufferAlignment();
|
||||
size_t pixel_constants_offset = 0;
|
||||
size_t vertex_constants_offset =
|
||||
Util::AlignValue(pixel_constants_offset + sizeof(PixelShaderConstants), ub_alignment);
|
||||
Common::AlignUp(pixel_constants_offset + sizeof(PixelShaderConstants), ub_alignment);
|
||||
size_t geometry_constants_offset =
|
||||
Util::AlignValue(vertex_constants_offset + sizeof(VertexShaderConstants), ub_alignment);
|
||||
Common::AlignUp(vertex_constants_offset + sizeof(VertexShaderConstants), ub_alignment);
|
||||
size_t allocation_size = geometry_constants_offset + sizeof(GeometryShaderConstants);
|
||||
|
||||
// Allocate everything at once.
|
||||
|
Reference in New Issue
Block a user