MythComboBufferVulkan: Rename Buffer

MythTV · Sep 9, 2020 · 79b9188 · 79b9188
1 parent 2d6ba11
commit 79b9188
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/mythtv/libs/libmythui/vulkan/mythcombobuffervulkan.cpp b/mythtv/libs/libmythui/vulkan/mythcombobuffervulkan.cpp
@@ -21,7 +21,7 @@ void MythComboBufferVulkan::PushData(const QMatrix4x4 &Transform, const QRect& S
                                      const QRect& Destination, int Alpha)
 {
     m_data.push_back({});
-    Buffer* data = &m_data.back();
+    VulkanComboBuffer* data = &m_data.back();
     data->color[0] = data->color[1] = data->color[2] = 1.0F;
 
     float width  = std::min(static_cast<float>(Source.width()), m_width);

diff --git a/mythtv/libs/libmythui/vulkan/mythcombobuffervulkan.h b/mythtv/libs/libmythui/vulkan/mythcombobuffervulkan.h
@@ -8,13 +8,11 @@
 // MythTV
 #include "mythuiexp.h"
 
-#define MYTH_PUSHBUFFER_SIZE 112
-
 // Total Buffer size of 112bytes.
 // Vulkan spec guarantees 128 bytes for push constants
 // Prevent clang-tidy modernize-avoid-c-arrays warnings.
 extern "C" {
-struct alignas(16) Buffer
+struct alignas(16) VulkanComboBuffer
 {
     float transform [16];
     float position  [4];
@@ -23,6 +21,8 @@ struct alignas(16) Buffer
 };
 }
 
+#define MYTH_PUSHBUFFER_SIZE (sizeof(VulkanComboBuffer))
+
 class MUI_PUBLIC MythComboBufferVulkan
 {
   public:
@@ -33,7 +33,7 @@ class MUI_PUBLIC MythComboBufferVulkan
                          const QRect& Destination, int Alpha);
     void        PopData(void);
 
-    std::vector<Buffer> m_data;
+    std::vector<VulkanComboBuffer> m_data;
     float  m_width  { 0.0F };
     float  m_height { 0.0F };
 };