Changeset 54572 in vbox for trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp

Timestamp:

Mar 1, 2015 4:03:52 PM (10 years ago)

Author:

vboxsync

Message:

Added 3D capability usage xrefs against current linux sources.

File:

• trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp (modified) (12 diffs)

trunk/src/VBox/Devices/Graphics/DevVGA-SVGA3d-ogl.cpp

@@ -1722 +1722 @@
 #include "DevVGA-SVGA3d-shared.h"
 
+/**
+ * Worker for vmsvga3dQueryCaps that figures out supported operations for a
+ * given surface format capability.
+ *
+ * @returns Supported/indented operations (SVGA3DFORMAT_OP_XXX).
+ * @param   pState3D        The 3D state.
+ * @param   idx3dCaps       The SVGA3D_CAPS_XXX value of the surface format.
+ *
+ * @remarks See fromat_cap_table in svga_format.c (mesa/gallium) for a reference
+ *          of implicit guest expectations:
+ *              http://cgit.freedesktop.org/mesa/mesa/tree/src/gallium/drivers/svga/svga_format.c
+ */
 static uint32_t vmsvga3dGetSurfaceFormatSupport(PVMSVGA3DSTATE pState3D, uint32_t idx3dCaps)
 {
@@ -1846 +1858 @@
     *pu32Val = 0;
 
+    /*
+     * The capabilities access by current (2015-03-01) linux sources (gallium,
+     * vmwgfx, xorg-video-vmware) are annotated, caps without xref annotations
+     * aren't access.
+     */
+
     switch (idx3dCaps)
     {
+    /* Linux: vmwgfx_fifo.c in kmod; only used with SVGA_CAP_GBOBJECTS. */
     case SVGA3D_DEVCAP_3D:
         *pu32Val = 1; /* boolean? */
@@ -1864 +1883 @@
         break;
 
+    /* Linux: svga_screen.c in gallium; 3.0 or later required. */
     case SVGA3D_DEVCAP_VERTEX_SHADER_VERSION:
         *pu32Val = pState->caps.vertexShaderVersion;
@@ -1873 +1893 @@
         break;
 
+    /* Linux: svga_screen.c in gallium; 3.0 or later required. */
     case SVGA3D_DEVCAP_FRAGMENT_SHADER_VERSION:
         *pu32Val = pState->caps.fragmentShaderVersion;
@@ -1909 +1930 @@
         break;
 
+    /* Linux: svga_screen.c in gallium; capped at 80.0, default 1.0. */
     case SVGA3D_DEVCAP_MAX_POINT_SIZE:
         AssertCompile(sizeof(uint32_t) == sizeof(float));
@@ -1919 +1941 @@
         break;
 
+    /* Linux: svga_screen.c in gallium (for PIPE_CAP_MAX_TEXTURE_2D_LEVELS); have default if missing. */
     case SVGA3D_DEVCAP_MAX_TEXTURE_WIDTH:
     case SVGA3D_DEVCAP_MAX_TEXTURE_HEIGHT:
@@ -1924 +1947 @@
         break;
 
+    /* Linux: svga_screen.c in gallium (for PIPE_CAP_MAX_TEXTURE_3D_LEVELS); have default if missing. */
     case SVGA3D_DEVCAP_MAX_VOLUME_EXTENT:
         //*pu32Val = pCaps->MaxVolumeExtent;
@@ -1936 +1960 @@
         break;
 
+    /* Linux: svga_screen.c in gallium (for PIPE_CAPF_MAX_TEXTURE_ANISOTROPY); defaults to 4.0. */
     case SVGA3D_DEVCAP_MAX_TEXTURE_ANISOTROPY:
         *pu32Val = pState->caps.maxTextureAnisotropy;
@@ -1945 +1970 @@
         break;
 
+    /* Linux: svga_screen.c in gallium (for PIPE_SHADER_VERTEX/PIPE_SHADER_CAP_MAX_INSTRUCTIONS); defaults to 512. */
     case SVGA3D_DEVCAP_MAX_VERTEX_SHADER_INSTRUCTIONS:
         *pu32Val = pState->caps.maxVertexShaderInstructions;
@@ -1953 +1979 @@
         break;
 
+    /* Linux: svga_screen.c in gallium (for PIPE_SHADER_VERTEX/PIPE_SHADER_CAP_MAX_TEMPS); defaults to 32. */
     case SVGA3D_DEVCAP_MAX_VERTEX_SHADER_TEMPS:
         *pu32Val = pState->caps.maxVertexShaderTemps;
         break;
 
+    /* Linux: svga_screen.c in gallium (for PIPE_SHADER_FRAGMENT/PIPE_SHADER_CAP_MAX_TEMPS); defaults to 32. */
     case SVGA3D_DEVCAP_MAX_FRAGMENT_SHADER_TEMPS:
         *pu32Val = pState->caps.maxFragmentShaderTemps;
@@ -2004 +2032 @@
         break;
 
-    /* Supported surface formats. */
+#if 0 /* Appeared more recently, not yet implemented. */
+   /* Linux: svga_screen.c in gallium; defaults to FALSE. */
+   case SVGA3D_DEVCAP_LINE_AA:
+       break;
+   /* Linux: svga_screen.c in gallium; defaults to FALSE. */
+   case SVGA3D_DEVCAP_LINE_STIPPLE:
+       break;
+   /* Linux: svga_screen.c in gallium; defaults to 1.0. */
+   case SVGA3D_DEVCAP_MAX_LINE_WIDTH:
+       break;
+   /* Linux: svga_screen.c in gallium; defaults to 1.0. */
+   case SVGA3D_DEVCAP_MAX_AA_LINE_WIDTH:
+       break;
+#endif
+
+    /*
+     * Supported surface formats.
+     * Linux: svga_format.c in gallium, format_cap_table defines implicit expectations.
+     */
     case SVGA3D_DEVCAP_SURFACEFMT_X8R8G8B8:
     case SVGA3D_DEVCAP_SURFACEFMT_A8R8G8B8:
@@ -2054 +2100 @@
         break;
 
+    /* Linux: Not referenced in current sources. */
     case SVGA3D_DEVCAP_SURFACEFMT_BC4_UNORM:
     case SVGA3D_DEVCAP_SURFACEFMT_BC5_UNORM: