Changeset 83176 in vbox for trunk/src/VBox/Devices

Timestamp:

Feb 27, 2020 7:07:43 PM (5 years ago)

Author:

vboxsync

Message:

Devices/Graphics/shaderlib: workaround for NVidia GLSL compiler quirk.

File:

• trunk/src/VBox/Devices/Graphics/shaderlib/glsl_shader.c (modified) (3 diffs)

trunk/src/VBox/Devices/Graphics/shaderlib/glsl_shader.c

@@ -1055 +1055 @@
         if (map & 1) shader_addline(buffer, "void subroutine%u();\n", i);
     }
+
+#ifdef VBOX_WITH_VMSVGA
+    /* Declare texture samplers before the constants in order to workaround a NVidia driver quirk. */
+    for (i = 0; i < This->baseShader.limits.sampler; i++) {
+        if (reg_maps->sampler_type[i])
+        {
+            switch (reg_maps->sampler_type[i])
+            {
+                case WINED3DSTT_1D:
+                    shader_addline(buffer, "uniform sampler1D %csampler%u;\n", prefix, i);
+                    break;
+                case WINED3DSTT_2D:
+                    if(device->stateBlock->textures[i] &&
+                       IWineD3DBaseTexture_GetTextureDimensions(device->stateBlock->textures[i]) == GL_TEXTURE_RECTANGLE_ARB) {
+                        shader_addline(buffer, "uniform sampler2DRect %csampler%u;\n", prefix, i);
+                    } else {
+                        shader_addline(buffer, "uniform sampler2D %csampler%u;\n", prefix, i);
+                    }
+                    break;
+                case WINED3DSTT_CUBE:
+                    shader_addline(buffer, "uniform samplerCube %csampler%u;\n", prefix, i);
+                    break;
+                case WINED3DSTT_VOLUME:
+                    shader_addline(buffer, "uniform sampler3D %csampler%u;\n", prefix, i);
+                    break;
+                default:
+                    shader_addline(buffer, "uniform unsupported_sampler %csampler%u;\n", prefix, i);
+                    FIXME("Unrecognized sampler type: %#x\n", reg_maps->sampler_type[i]);
+                    break;
+            }
+        }
+    }
+#endif
 
     /* Declare the constants (aka uniforms) */
@@ -1216 +1249 @@
     }
 
+#ifdef VBOX_WITH_VMSVGA
+    /* Declare texture samplers before the constants in order to workaround a NVidia driver quirk. */
+#else
     /* Declare texture samplers */
     for (i = 0; i < This->baseShader.limits.sampler; i++) {
@@ -1246 +1282 @@
         }
     }
+#endif
 
     /* Declare uniforms for NP2 texcoord fixup: