Changeset 53854 in vbox

Timestamp:

Jan 16, 2015 12:28:22 PM (10 years ago)

Author:

vboxsync

Message:

Host 3D: content scaling: define scale factor range bounds.

Location:

trunk

Files:

• include/VBox/VBoxOGL.h (modified) (1 diff)
• src/VBox/HostServices/SharedOpenGL/crserverlib/presenter/window.cpp (modified) (2 diffs)

trunk/include/VBox/VBoxOGL.h

@@ -43 +43 @@
 #define VBOX_OGL_SCALE_FACTOR_MULTIPLIER    100.0
 
+/* 3D content scale factor range bounds. */
+#define VBOX_OGL_SCALE_FACTOR_MIN           0.5
+#define VBOX_OGL_SCALE_FACTOR_MAX           2.0
+
 bool RTCALL VBoxOglIsOfflineRenderingAppropriate(void);
 bool RTCALL VBoxOglIs3DAccelerationSupported(void);

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/presenter/window.cpp

@@ -18 +18 @@
 
 #include "server_presenter.h"
-
+#include <VBox/VBoxOGL.h>
 
 CrFbWindow::CrFbWindow(uint64_t parentId) :
@@ -213 +213 @@
 
     /* Simple check for input values. */
-    if ( !(scaleFactorW > 0 && scaleFactorW > 0) )
+    if ( !(  (scaleFactorW >= VBOX_OGL_SCALE_FACTOR_MIN && scaleFactorW <= VBOX_OGL_SCALE_FACTOR_MAX)
+          && (scaleFactorH >= VBOX_OGL_SCALE_FACTOR_MIN && scaleFactorH <= VBOX_OGL_SCALE_FACTOR_MAX)))
         return false;