Changeset 99941 in vbox
- Timestamp:
- May 23, 2023 5:06:41 PM (17 months ago)
- Location:
- trunk
- Files:
-
- 2 deleted
- 5 edited
-
include/Makefile.kmk (modified) (1 diff)
-
include/VBox/VBoxGL2D.h (deleted)
-
include/VBox/VBoxOGL.h (modified) (2 diffs)
-
src/VBox/Frontends/VirtualBox/Makefile.kmk (modified) (3 diffs)
-
src/VBox/Main/Makefile.kmk (modified) (2 diffs)
-
src/VBox/Main/src-helper-apps/OpenGLTest (deleted)
-
src/VBox/Main/src-server/HostImpl.cpp (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/include/Makefile.kmk
r99040 r99941 121 121 VBox/HostServices/glxext.h \ 122 122 VBox/HostServices/wglext.h \ 123 VBox/VBoxGL2D.h \124 123 $(if-expr "$(KBUILD_TARGET)" != "linux", \ 125 124 VBox/GuestHost/SharedClipboard-x11.h \ -
trunk/include/VBox/VBoxOGL.h
r98103 r99941 40 40 #endif 41 41 42 #include <iprt/cdefs.h>43 #include <iprt/types.h>44 45 RT_C_DECLS_BEGIN46 47 42 /* GUI and VBox OpenGL code require scaling factor value to be stored in container 48 43 * of type of 'double'. Communication between them is done via Main. In the same time, … … 55 50 * This constant can be increased (multiplied by 10^n) in order to get better precision 56 51 * for scaling factor manipulations. */ 57 #define VBOX_OGL_SCALE_FACTOR_MULTIPLIER 10000.0 58 59 /* 3D content scale factor range bounds. */ 60 #define VBOX_OGL_SCALE_FACTOR_MIN 0.01 61 #define VBOX_OGL_SCALE_FACTOR_MAX 10.0 62 63 bool RTCALL VBoxOglIsOfflineRenderingAppropriate(void); 64 bool RTCALL VBoxOglIs3DAccelerationSupported(void); 65 66 DECLEXPORT(int) VBoxOglSetScaleFactor(uint32_t idScreen, double dScaleFactorW, double dScaleFactorH); 67 68 RT_C_DECLS_END 52 #define VBOX_OGL_SCALE_FACTOR_MULTIPLIER 10000.0 69 53 70 54 #endif /* !VBOX_INCLUDED_VBoxOGL_h */ -
trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk
r99936 r99941 518 518 endif 519 519 520 # These are 2D Video Acceleration and 3D Acceleration related libs:521 ifdef VBOX_WITH_3D_ACCELERATION522 VirtualBox_LIBS += $(PATH_STAGE_LIB)/VBoxOGLTest$(VBOX_SUFF_LIB)523 endif524 525 520 # This one is global shared GUI library: 526 521 ifeq ($(KBUILD_TARGET),win) … … 572 567 endif 573 568 574 # These are 2D Video Acceleration and 3D Acceleration related libs:575 ifdef VBOX_WITH_3D_ACCELERATION576 VirtualBoxVM_LIBS += $(PATH_STAGE_LIB)/VBoxOGLTest$(VBOX_SUFF_LIB)577 endif578 579 569 ifeq ($(KBUILD_TARGET),win) 580 570 VirtualBoxVM_LIBS += $(PATH_STAGE_LIB)/UICommon$(VBOX_SUFF_LIB) … … 601 591 if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris) 602 592 UICommon_LIBS += $(PATH_STAGE_DLL)/VBoxKeyboard$(VBOX_SUFF_DLL) 603 endif604 605 # These are 2D Video Acceleration and 3D Acceleration related libs:606 ifdef VBOX_WITH_3D_ACCELERATION607 UICommon_LIBS += $(PATH_STAGE_LIB)/VBoxOGLTest$(VBOX_SUFF_LIB)608 593 endif 609 594 -
trunk/src/VBox/Main/Makefile.kmk
r99915 r99941 47 47 ifndef VBOX_ONLY_SDK 48 48 include $(PATH_SUB_CURRENT)/UnattendedTemplates/Makefile.kmk 49 include $(PATH_SUB_CURRENT)/src-helper-apps/OpenGLTest/Makefile.kmk50 49 if defined(VBOX_WITH_OPEN_WATCOM) && defined(VBOX_WITH_UNATTENDED) 51 50 include $(PATH_SUB_CURRENT)/src-helper-apps/os2/Makefile.kmk … … 804 803 805 804 ifdef VBOX_WITH_3D_ACCELERATION 806 VBoxSVC_DEFS += VBOX_WITH_3D_ACCELERATION 807 VBoxSVC_LIBS += $(PATH_STAGE_LIB)/VBoxOGLTest$(VBOX_SUFF_LIB) 808 VBoxSVC_LDFLAGS.darwin += -framework OpenGL 805 VBoxSVC_DEFS += VBOX_WITH_3D_ACCELERATION 809 806 endif 810 807 -
trunk/src/VBox/Main/src-server/HostImpl.cpp
r98294 r99941 182 182 #include <VBox/settings.h> 183 183 #include <VBox/sup.h> 184 #ifdef VBOX_WITH_3D_ACCELERATION185 # include <VBox/VBoxOGL.h>186 #endif187 184 #include <iprt/x86.h> 188 185 … … 1476 1473 1477 1474 #ifdef VBOX_WITH_3D_ACCELERATION 1478 bool fSupported = VBoxOglIs3DAccelerationSupported();1475 bool fSupported = true; // Test if Vulkan or DirectX is appropriately supported on the host 1479 1476 #else 1480 1477 bool fSupported = false; /* shouldn't get here, but just in case. */
Note:
See TracChangeset
for help on using the changeset viewer.

