Changeset 103999 in vbox for trunk/src/VBox/Additions/3D/win/VBoxSVGA/winsys/vmw_screen.c

Timestamp:

Mar 22, 2024 12:38:39 PM (8 months ago)

Author:

vboxsync

Message:

Addition/3D,Additions/WINNT/Graphics: Updates for mesa-24.0.2 (not enabled yet). bugref:10606

File:

• trunk/src/VBox/Additions/3D/win/VBoxSVGA/winsys/vmw_screen.c (modified) (2 diffs)

trunk/src/VBox/Additions/3D/win/VBoxSVGA/winsys/vmw_screen.c

@@ -54 +54 @@
 #include "util/os_file.h"
 #include "util/u_memory.h"
+#if VBOX_MESA_V_MAJOR < 24
 #include "pipe/p_compiler.h"
+#else
+#include "util/compiler.h"
+#endif
 #include "util/u_hash_table.h"
 
@@ -86 +90 @@
    vws->open_count = 1;
    vws->ioctl.drm_fd = -1; /* not used */
-   vws->force_coherent = FALSE;
+   vws->force_coherent = false;
    if (!vmw_ioctl_init(vws))
       goto out_no_ioctl;
 
    vws->base.have_gb_dma = !vws->force_coherent;
-   vws->base.need_to_rebind_resources = FALSE;
+   vws->base.need_to_rebind_resources = false;
    vws->base.have_transfer_from_buffer_cmd = vws->base.have_vgpu10;
-   vws->base.have_constant_buffer_offset_cmd = FALSE;
-   vws->cache_maps = FALSE;
+#if VBOX_MESA_V_MAJOR < 24
+   vws->base.have_constant_buffer_offset_cmd = false;
+#else
+   vws->base.have_constant_buffer_offset_cmd =
+      vws->ioctl.have_drm_2_20 && vws->base.have_sm5;
+   vws->base.have_index_vertex_buffer_offset_cmd = false;
+   vws->base.have_rasterizer_state_v2_cmd =
+      vws->ioctl.have_drm_2_20 && vws->base.have_sm5;
+#endif
+
+   vws->cache_maps = false;
    vws->fence_ops = vmw_fence_ops_create(vws);
    if (!vws->fence_ops)