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

Timestamp:

Jan 10, 2020 11:21:23 AM (5 years ago)

Author:

vboxsync

Message:

3D: Fix regression caused by r135612 and 135630, bugref:9613

File:

• trunk/src/VBox/Devices/Graphics/shaderlib/shader.c (modified) (5 diffs)

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

@@ -438 +438 @@
         default:
             TRACE("Not recording register of type %#x and idx %u\n", reg->type, reg->idx);
-            return E_INVALIDARG;
+            break;
     }
 
@@ -685 +685 @@
 
                 hr = shader_record_register_usage(shader, reg_maps, &dst_param.reg, shader_version.type);
-                AssertReturn(FAILED(hr), hr);
+                AssertReturn(SUCCEEDED(hr), hr);
 
                 /* WINED3DSPR_TEXCRDOUT is the same as WINED3DSPR_OUTPUT. _OUTPUT can be > MAX_REG_TEXCRD and
@@ -743 +743 @@
                 {
                     unsigned int sampler_idx;
-                    AssertReturn(shader_version.major == 1, E_INVALIDARG);
 
                     /* Fake sampler usage, only set reserved bit and type. */
@@ -793 +792 @@
 
                 hr = shader_record_register_usage(shader, reg_maps, &src_param.reg, shader_version.type);
-                AssertReturn(FAILED(hr), hr);
+                AssertReturn(SUCCEEDED(hr), hr);
 
                 while (count)
@@ -799 +798 @@
                     ++src_param.reg.idx;
                     hr = shader_record_register_usage(shader, reg_maps, &src_param.reg, shader_version.type);
-                    AssertReturn(FAILED(hr), hr);
+                    AssertReturn(SUCCEEDED(hr), hr);
                     --count;
                 }