[Bf-blender-cvs] [08f5219d1c6] master: Cleanup: use `int32_t[2]` for Wayland display size variables

[Campbell Barton]

Commit: 08f5219d1c6c5efe76b7b8fb9579eb52f600ad78
Author: Campbell Barton
Date:   Wed Jun 15 14:34:06 2022 +1000
Branches: master
https://developer.blender.org/rB08f5219d1c6c5efe76b7b8fb9579eb52f600ad78

Cleanup: use `int32_t[2]` for Wayland display size variables

===================================================================

M	intern/ghost/intern/GHOST_SystemWayland.cpp
M	intern/ghost/intern/GHOST_SystemWayland.h

===================================================================

diff --git a/intern/ghost/intern/GHOST_SystemWayland.cpp b/intern/ghost/intern/GHOST_SystemWayland.cpp
index caf65f477a1..de9c865f163 100644
--- a/intern/ghost/intern/GHOST_SystemWayland.cpp
+++ b/intern/ghost/intern/GHOST_SystemWayland.cpp
@@ -1833,8 +1833,8 @@ static void output_geometry(void *data,
   output->transform = transform;
   output->make = std::string(make);
   output->model = std::string(model);
-  output->width_mm = physical_width;
-  output->height_mm = physical_height;
+  output->size_mm[0] = physical_width;
+  output->size_mm[1] = physical_height;
 }
 
 static void output_mode(void *data,
@@ -1845,8 +1845,8 @@ static void output_mode(void *data,
                         int32_t /*refresh*/)
 {
   output_t *output = static_cast<output_t *>(data);
-  output->width_pxl = width;
-  output->height_pxl = height;
+  output->size_native[0] = width;
+  output->size_native[1] = height;
 }
 
 /**
@@ -2182,8 +2182,8 @@ void GHOST_SystemWayland::getMainDisplayDimensions(uint32_t &width, uint32_t &he
 {
   if (getNumDisplays() > 0) {
     /* We assume first output as main. */
-    width = uint32_t(d->outputs[0]->width_pxl) / d->outputs[0]->scale;
-    height = uint32_t(d->outputs[0]->height_pxl) / d->outputs[0]->scale;
+    width = uint32_t(d->outputs[0]->size_native[0]) / d->outputs[0]->scale;
+    height = uint32_t(d->outputs[0]->size_native[1]) / d->outputs[0]->scale;
   }
 }
 
diff --git a/intern/ghost/intern/GHOST_SystemWayland.h b/intern/ghost/intern/GHOST_SystemWayland.h
index 5b3e4f8ed75..dad7f38eb31 100644
--- a/intern/ghost/intern/GHOST_SystemWayland.h
+++ b/intern/ghost/intern/GHOST_SystemWayland.h
@@ -23,8 +23,10 @@ struct display_t;
 
 struct output_t {
   struct wl_output *output;
-  int32_t width_pxl, height_pxl; /* Dimensions in pixel. */
-  int32_t width_mm, height_mm;   /* Dimensions in millimeter. */
+  /** Dimensions in pixels. */
+  int32_t size_native[2];
+  /** Dimensions in millimeter. */
+  int32_t size_mm[2];
   int transform;
   int scale;
   std::string make;