From e9c7d345df14822130689b6674bdb3beac372773 Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Mon, 28 Dec 2020 16:31:23 +0100
Subject: [PATCH] display: Move GraphicsPipe::_detected_display_zoom to class
 member

---
 panda/src/display/graphicsPipe.I   |  8 ++++++++
 panda/src/display/graphicsPipe.cxx | 14 ++------------
 panda/src/display/graphicsPipe.h   |  3 ++-
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/panda/src/display/graphicsPipe.I b/panda/src/display/graphicsPipe.I
index 891c52e2c9..d585bed5c9 100644
--- a/panda/src/display/graphicsPipe.I
+++ b/panda/src/display/graphicsPipe.I
@@ -81,3 +81,11 @@ INLINE GraphicsDevice *GraphicsPipe::
 get_device() const {
   return _device;
 }
+
+/**
+ * Called by derived class to set the display zoom factor.
+ */
+INLINE void GraphicsPipe::
+set_detected_display_zoom(PN_stdfloat zoom) {
+  _detected_display_zoom = zoom;
+}
diff --git a/panda/src/display/graphicsPipe.cxx b/panda/src/display/graphicsPipe.cxx
index 39c09b76e8..811c0a79ec 100644
--- a/panda/src/display/graphicsPipe.cxx
+++ b/panda/src/display/graphicsPipe.cxx
@@ -97,9 +97,6 @@ static void update_memory_info(DisplayInformation *info) {
 }
 #endif
 
-// Temporarily declared as global float.
-static PN_stdfloat detected_display_zoom = 1.0;
-
 TypeHandle GraphicsPipe::_type_handle;
 
 /**
@@ -119,6 +116,7 @@ GraphicsPipe() :
 
   _display_width = 0;
   _display_height = 0;
+  _detected_display_zoom = 1.0;
 
   _display_information = new DisplayInformation();
 
@@ -287,15 +285,7 @@ get_display_zoom() const {
       return override;
     }
   }
-  return detected_display_zoom;
-}
-
-/**
- * Called by derived class to set the display zoom factor.
- */
-void GraphicsPipe::
-set_detected_display_zoom(PN_stdfloat zoom) {
-  detected_display_zoom = zoom;
+  return _detected_display_zoom;
 }
 
 /**
diff --git a/panda/src/display/graphicsPipe.h b/panda/src/display/graphicsPipe.h
index 156467f66a..aabd315c9e 100644
--- a/panda/src/display/graphicsPipe.h
+++ b/panda/src/display/graphicsPipe.h
@@ -117,7 +117,7 @@ public:
   virtual PT(GraphicsStateGuardian) make_callback_gsg(GraphicsEngine *engine);
 
 protected:
-  void set_detected_display_zoom(PN_stdfloat zoom);
+  INLINE void set_detected_display_zoom(PN_stdfloat zoom);
 
   virtual void close_gsg(GraphicsStateGuardian *gsg);
 
@@ -137,6 +137,7 @@ protected:
   int _supported_types;
   int _display_width;
   int _display_height;
+  PN_stdfloat _detected_display_zoom;
   PT(GraphicsDevice) _device;
 
   DisplayInformation *_display_information;