[Bf-blender-cvs] [f2018ba492c] soc-2019-openxr: Cleanup: Remove unused Ghost window function

Julian Eisel noreply at git.blender.org
Wed Mar 11 20:28:24 CET 2020


Commit: f2018ba492c2748dbad960c8e4d3cb689375d65f
Author: Julian Eisel
Date:   Wed Mar 11 11:23:38 2020 +0100
Branches: soc-2019-openxr
https://developer.blender.org/rBf2018ba492c2748dbad960c8e4d3cb689375d65f

Cleanup: Remove unused Ghost window function

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

M	intern/ghost/GHOST_C-api.h
M	intern/ghost/GHOST_IWindow.h
M	intern/ghost/intern/GHOST_C-api.cpp
M	intern/ghost/intern/GHOST_Window.cpp
M	intern/ghost/intern/GHOST_Window.h

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

diff --git a/intern/ghost/GHOST_C-api.h b/intern/ghost/GHOST_C-api.h
index 9b5a549f489..aefb4403d54 100644
--- a/intern/ghost/GHOST_C-api.h
+++ b/intern/ghost/GHOST_C-api.h
@@ -249,11 +249,6 @@ extern void GHOST_SetWindowUserData(GHOST_WindowHandle windowhandle, GHOST_TUser
 
 extern int GHOST_IsDialogWindow(GHOST_WindowHandle windowhandle);
 
-/**
- * Returns whether a window is rendered upside down compared to OpenGL.
- */
-extern int GHOST_isUpsideDownWindow(GHOST_WindowHandle windowhandle);
-
 /**
  * Dispose a window.
  * \param systemhandle The handle to the system
diff --git a/intern/ghost/GHOST_IWindow.h b/intern/ghost/GHOST_IWindow.h
index beba336f7c3..07133d86ce4 100644
--- a/intern/ghost/GHOST_IWindow.h
+++ b/intern/ghost/GHOST_IWindow.h
@@ -243,11 +243,6 @@ class GHOST_IWindow {
 
   virtual bool isDialog() const = 0;
 
-  /**
-   * Returns if the window is rendered upside down compared to OpenGL.
-   */
-  virtual bool isUpsideDown() const = 0;
-
   /**
    * Returns the tablet data (pressure etc).
    * \return The tablet data (pressure etc).
diff --git a/intern/ghost/intern/GHOST_C-api.cpp b/intern/ghost/intern/GHOST_C-api.cpp
index 0dd32f3a1a8..d43a2637ad3 100644
--- a/intern/ghost/intern/GHOST_C-api.cpp
+++ b/intern/ghost/intern/GHOST_C-api.cpp
@@ -231,13 +231,6 @@ int GHOST_IsDialogWindow(GHOST_WindowHandle windowhandle)
   return (int)window->isDialog();
 }
 
-int GHOST_isUpsideDownWindow(GHOST_WindowHandle windowhandle)
-{
-  GHOST_IWindow *window = (GHOST_IWindow *)windowhandle;
-
-  return window->isUpsideDown();
-}
-
 GHOST_TSuccess GHOST_DisposeWindow(GHOST_SystemHandle systemhandle,
                                    GHOST_WindowHandle windowhandle)
 {
diff --git a/intern/ghost/intern/GHOST_Window.cpp b/intern/ghost/intern/GHOST_Window.cpp
index cc4f871ea26..ca19e251279 100644
--- a/intern/ghost/intern/GHOST_Window.cpp
+++ b/intern/ghost/intern/GHOST_Window.cpp
@@ -114,11 +114,6 @@ unsigned int GHOST_Window::getDefaultFramebuffer()
   return (m_context) ? m_context->getDefaultFramebuffer() : 0;
 }
 
-bool GHOST_Window::isUpsideDown() const
-{
-  return m_context->isUpsideDown();
-}
-
 GHOST_TSuccess GHOST_Window::activateDrawingContext()
 {
   return m_context->activateDrawingContext();
diff --git a/intern/ghost/intern/GHOST_Window.h b/intern/ghost/intern/GHOST_Window.h
index b94b6caed6c..553a7d89df4 100644
--- a/intern/ghost/intern/GHOST_Window.h
+++ b/intern/ghost/intern/GHOST_Window.h
@@ -284,11 +284,6 @@ class GHOST_Window : public GHOST_IWindow {
     m_userData = userData;
   }
 
-  /**
-   * Returns if the window is rendered upside down compared to OpenGL.
-   */
-  bool isUpsideDown() const;
-
   float getNativePixelSize(void)
   {
     if (m_nativePixelSize > 0.0f)



More information about the Bf-blender-cvs mailing list