[PATCH 3/6] d3d11: Remove old blend_factor storage inside d3d_device

Daniel Ansorregui mailszeros at gmail.com
Mon Oct 15 14:17:17 CDT 2018


Signed-off-by: Daniel Ansorregui <mailszeros at gmail.com>
---
 dlls/d3d11/d3d11_private.h | 1 -
 dlls/d3d11/device.c        | 7 -------
 2 files changed, 8 deletions(-)

diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h
index e26554afab..771e923a5c 100644
--- a/dlls/d3d11/d3d11_private.h
+++ b/dlls/d3d11/d3d11_private.h
@@ -539,7 +539,6 @@ struct d3d_device
     struct wine_rb_tree rasterizer_states;
     struct wine_rb_tree sampler_states;
 
-    float blend_factor[4];
     struct d3d_depthstencil_state *depth_stencil_state;
     UINT stencil_ref;
 };
diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c
index 527a2f97b6..fd8389f8e0 100644
--- a/dlls/d3d11/device.c
+++ b/dlls/d3d11/device.c
@@ -710,7 +710,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMSetBlendState(ID3D11Devi
         blend_factor = default_blend_factor;
 
     wined3d_mutex_lock();
-    memcpy(device->blend_factor, blend_factor, 4 * sizeof(*blend_factor));
     wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEMASK, sample_mask);
     if (!(blend_state_impl = unsafe_impl_from_ID3D11BlendState(blend_state)))
     {
@@ -1946,7 +1945,6 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetBlendState(ID3D11Devi
     {
         *blend_state = NULL;
     }
-    memcpy(blend_factor, device->blend_factor, 4 * sizeof(*blend_factor));
     wined3d_device_get_blend_factor(device->wined3d_device, (struct wined3d_color *)blend_factor);
     *sample_mask = wined3d_device_get_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEMASK);
     wined3d_mutex_unlock();
@@ -6186,11 +6184,6 @@ void d3d_device_init(struct d3d_device *device, void *outer_unknown)
     d3d11_immediate_context_init(&device->immediate_context, device);
     ID3D11DeviceContext1_Release(&device->immediate_context.ID3D11DeviceContext1_iface);
 
-    device->blend_factor[0] = 1.0f;
-    device->blend_factor[1] = 1.0f;
-    device->blend_factor[2] = 1.0f;
-    device->blend_factor[3] = 1.0f;
-
     wine_rb_init(&device->blend_states, d3d_blend_state_compare);
     wine_rb_init(&device->depthstencil_states, d3d_depthstencil_state_compare);
     wine_rb_init(&device->rasterizer_states, d3d_rasterizer_state_compare);
-- 
2.17.1




More information about the wine-devel mailing list