[PATCH 1/5] wined3d: Remove stateblock handling from wined3d_device_set_shader_resource_view().
It cannot be called while recording a stateblock. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/device.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c90cbdbe10..a399d24065 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2291,15 +2291,14 @@ static void wined3d_device_set_shader_resource_view(struct wined3d_device *devic return; } - prev = device->update_state->shader_resource_view[type][idx]; + prev = device->state.shader_resource_view[type][idx]; if (view == prev) return; if (view) wined3d_shader_resource_view_incref(view); - device->update_state->shader_resource_view[type][idx] = view; - if (!device->recording) - wined3d_cs_emit_set_shader_resource_view(device->cs, type, idx, view); + device->state.shader_resource_view[type][idx] = view; + wined3d_cs_emit_set_shader_resource_view(device->cs, type, idx, view); if (prev) wined3d_shader_resource_view_decref(prev); } -- 2.17.1
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/device.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a399d24065..a44d15f0f8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2342,15 +2342,14 @@ static void wined3d_device_set_sampler(struct wined3d_device *device, return; } - prev = device->update_state->sampler[type][idx]; + prev = device->state.sampler[type][idx]; if (sampler == prev) return; if (sampler) wined3d_sampler_incref(sampler); - device->update_state->sampler[type][idx] = sampler; - if (!device->recording) - wined3d_cs_emit_set_sampler(device->cs, type, idx, sampler); + device->state.sampler[type][idx] = sampler; + wined3d_cs_emit_set_sampler(device->cs, type, idx, sampler); if (prev) wined3d_sampler_decref(prev); } -- 2.17.1
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/device.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a44d15f0f8..c72754353f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2955,15 +2955,14 @@ static void wined3d_device_set_pipeline_unordered_access_view(struct wined3d_dev return; } - prev = device->update_state->unordered_access_view[pipeline][idx]; + prev = device->state.unordered_access_view[pipeline][idx]; if (uav == prev && initial_count == ~0u) return; if (uav) wined3d_unordered_access_view_incref(uav); - device->update_state->unordered_access_view[pipeline][idx] = uav; - if (!device->recording) - wined3d_cs_emit_set_unordered_access_view(device->cs, pipeline, idx, uav, initial_count); + device->state.unordered_access_view[pipeline][idx] = uav; + wined3d_cs_emit_set_unordered_access_view(device->cs, pipeline, idx, uav, initial_count); if (prev) wined3d_unordered_access_view_decref(prev); } -- 2.17.1
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/device.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index c72754353f..4a94b1d6b1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1329,15 +1329,14 @@ void CDECL wined3d_device_set_stream_output(struct wined3d_device *device, UINT return; } - stream = &device->update_state->stream_output[idx]; + stream = &device->state.stream_output[idx]; prev_buffer = stream->buffer; if (buffer) wined3d_buffer_incref(buffer); stream->buffer = buffer; stream->offset = offset; - if (!device->recording) - wined3d_cs_emit_set_stream_output(device->cs, idx, buffer, offset); + wined3d_cs_emit_set_stream_output(device->cs, idx, buffer, offset); if (prev_buffer) wined3d_buffer_decref(prev_buffer); } -- 2.17.1
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/device.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4a94b1d6b1..1db6d77711 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2252,15 +2252,14 @@ void CDECL wined3d_device_set_constant_buffer(struct wined3d_device *device, return; } - prev = device->update_state->cb[type][idx]; + prev = device->state.cb[type][idx]; if (buffer == prev) return; if (buffer) wined3d_buffer_incref(buffer); - device->update_state->cb[type][idx] = buffer; - if (!device->recording) - wined3d_cs_emit_set_constant_buffer(device->cs, type, idx, buffer); + device->state.cb[type][idx] = buffer; + wined3d_cs_emit_set_constant_buffer(device->cs, type, idx, buffer); if (prev) wined3d_buffer_decref(prev); } -- 2.17.1
Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
On 1/24/19 9:40 AM, Henri Verbeet wrote:
On Thu, 24 Jan 2019 at 09:01, Zebediah Figura <z.figura12(a)gmail.com> wrote:
It cannot be called while recording a stateblock.
Well, it can be, but isn't. The reason we want this is because we'd like to move stateblock handling out of wined3d.
Right, I guess I should have said "is not" rather.
participants (3)
-
Henri Verbeet -
Henri Verbeet -
Zebediah Figura