Changeset 76266 in vbox for trunk

Timestamp:

Dec 17, 2018 3:36:45 PM (6 years ago)

Author:

vboxsync

Message:

DevVGA-SVGA3d-ogl: a better check for shader version

File:

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

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

@@ -941 +941 @@
 #endif
     float v = pszShadingLanguageVersion ? atof(pszShadingLanguageVersion) : 0.0f;
-    if (v >= 3.30f)
-    {
-        pState->caps.vertexShaderVersion   = SVGA3DVSVERSION_40;
-        pState->caps.fragmentShaderVersion = SVGA3DPSVERSION_40;
-    }
-    else
-    if (v >= 1.20f)
-    {
-        pState->caps.vertexShaderVersion   = SVGA3DVSVERSION_20;
-        pState->caps.fragmentShaderVersion = SVGA3DPSVERSION_20;
-    }
-    else
     if (   vmsvga3dCheckGLExtension(pState, 0.0f, " GL_NV_gpu_program4 ")
         || strstr(pState->pszOtherExtensions, " GL_NV_gpu_program4 "))
@@ -981 +969 @@
         pState->caps.vertexShaderVersion   = SVGA3DVSVERSION_11;
         pState->caps.fragmentShaderVersion = SVGA3DPSVERSION_11;
+    }
+
+    /* Now check the shading language version, in case it indicates a higher supported version. */
+    if (v >= 3.30f)
+    {
+        pState->caps.vertexShaderVersion   = RT_MAX(pState->caps.vertexShaderVersion,   SVGA3DVSVERSION_40);
+        pState->caps.fragmentShaderVersion = RT_MAX(pState->caps.fragmentShaderVersion, SVGA3DPSVERSION_40);
+    }
+    else
+    if (v >= 1.20f)
+    {
+        pState->caps.vertexShaderVersion   = RT_MAX(pState->caps.vertexShaderVersion,   SVGA3DVSVERSION_20);
+        pState->caps.fragmentShaderVersion = RT_MAX(pState->caps.fragmentShaderVersion, SVGA3DPSVERSION_20);
     }