Zebediah Figura : wined3d: Remove now redundant error handling from wined3d_device_set_sampler_state().

Alexandre Julliard julliard at winehq.org
Thu Mar 5 16:35:26 CST 2020


Module: wine
Branch: master
Commit: 218060940a1a6284b60b13e54240d4f78478d28a
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=218060940a1a6284b60b13e54240d4f78478d28a

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Wed Mar  4 22:46:51 2020 -0600

wined3d: Remove now redundant error handling from wined3d_device_set_sampler_state().

Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/wined3d/device.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 4224472df5..768f4bfed5 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1749,12 +1749,6 @@ static void wined3d_device_set_sampler_state(struct wined3d_device *device,
     if (sampler_idx >= WINED3DVERTEXTEXTURESAMPLER0 && sampler_idx <= WINED3DVERTEXTEXTURESAMPLER3)
         sampler_idx -= (WINED3DVERTEXTEXTURESAMPLER0 - WINED3D_MAX_FRAGMENT_SAMPLERS);
 
-    if (sampler_idx >= ARRAY_SIZE(device->state.sampler_states))
-    {
-        WARN("Invalid sampler %u.\n", sampler_idx);
-        return; /* Windows accepts overflowing this array ... we do not. */
-    }
-
     if (value == device->state.sampler_states[sampler_idx][state])
     {
         TRACE("Application is setting the old value over, nothing to do.\n");




More information about the wine-cvs mailing list