Zebediah Figura : wined3d: Introduce wined3d_device_context_set_stream_source().

Alexandre Julliard julliard at winehq.org
Wed Mar 24 16:20:42 CDT 2021


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

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Tue Mar 23 10:39:14 2021 -0500

wined3d: Introduce wined3d_device_context_set_stream_source().

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     | 79 ++++++++++++++++++++++++++---------------------
 dlls/wined3d/wined3d.spec |  1 +
 include/wine/wined3d.h    |  2 ++
 3 files changed, 47 insertions(+), 35 deletions(-)

diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index d02845737dc..12dae835cec 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -1266,44 +1266,10 @@ struct wined3d_buffer * CDECL wined3d_device_get_stream_output(struct wined3d_de
 HRESULT CDECL wined3d_device_set_stream_source(struct wined3d_device *device, UINT stream_idx,
         struct wined3d_buffer *buffer, UINT offset, UINT stride)
 {
-    struct wined3d_stream_state *stream;
-    struct wined3d_buffer *prev_buffer;
-
     TRACE("device %p, stream_idx %u, buffer %p, offset %u, stride %u.\n",
             device, stream_idx, buffer, offset, stride);
 
-    if (stream_idx >= WINED3D_MAX_STREAMS)
-    {
-        WARN("Stream index %u out of range.\n", stream_idx);
-        return WINED3DERR_INVALIDCALL;
-    }
-    else if (offset & 0x3)
-    {
-        WARN("Offset %u is not 4 byte aligned.\n", offset);
-        return WINED3DERR_INVALIDCALL;
-    }
-
-    stream = &device->cs->c.state->streams[stream_idx];
-    prev_buffer = stream->buffer;
-
-    if (prev_buffer == buffer
-            && stream->stride == stride
-            && stream->offset == offset)
-    {
-       TRACE("Application is setting the old values over, nothing to do.\n");
-       return WINED3D_OK;
-    }
-
-    stream->buffer = buffer;
-    stream->stride = stride;
-    stream->offset = offset;
-    if (buffer)
-        wined3d_buffer_incref(buffer);
-    wined3d_device_context_emit_set_stream_source(&device->cs->c, stream_idx, buffer, offset, stride);
-    if (prev_buffer)
-        wined3d_buffer_decref(prev_buffer);
-
-    return WINED3D_OK;
+    return wined3d_device_context_set_stream_source(&device->cs->c, stream_idx, buffer, offset, stride);
 }
 
 HRESULT CDECL wined3d_device_get_stream_source(const struct wined3d_device *device,
@@ -2362,6 +2328,49 @@ void CDECL wined3d_device_context_set_predication(struct wined3d_device_context
         wined3d_query_decref(prev);
 }
 
+HRESULT CDECL wined3d_device_context_set_stream_source(struct wined3d_device_context *context,
+        unsigned int stream_idx, struct wined3d_buffer *buffer, unsigned int offset, unsigned int stride)
+{
+    struct wined3d_stream_state *stream;
+    struct wined3d_buffer *prev_buffer;
+
+    TRACE("context %p, stream_idx %u, buffer %p, offset %u, stride %u.\n",
+            context, stream_idx, buffer, offset, stride);
+
+    if (stream_idx >= WINED3D_MAX_STREAMS)
+    {
+        WARN("Stream index %u out of range.\n", stream_idx);
+        return WINED3DERR_INVALIDCALL;
+    }
+    else if (offset & 0x3)
+    {
+        WARN("Offset %u is not 4 byte aligned.\n", offset);
+        return WINED3DERR_INVALIDCALL;
+    }
+
+    stream = &context->state->streams[stream_idx];
+    prev_buffer = stream->buffer;
+
+    if (prev_buffer == buffer
+            && stream->stride == stride
+            && stream->offset == offset)
+    {
+       TRACE("Application is setting the old values over, nothing to do.\n");
+       return WINED3D_OK;
+    }
+
+    stream->buffer = buffer;
+    stream->stride = stride;
+    stream->offset = offset;
+    if (buffer)
+        wined3d_buffer_incref(buffer);
+    wined3d_device_context_emit_set_stream_source(context, stream_idx, buffer, offset, stride);
+    if (prev_buffer)
+        wined3d_buffer_decref(prev_buffer);
+
+    return WINED3D_OK;
+}
+
 void CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struct wined3d_shader *shader)
 {
     TRACE("device %p, shader %p.\n", device, shader);
diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec
index 762cbd97f7c..cac0c19bab4 100644
--- a/dlls/wined3d/wined3d.spec
+++ b/dlls/wined3d/wined3d.spec
@@ -177,6 +177,7 @@
 @ cdecl wined3d_device_context_set_scissor_rects(ptr long ptr)
 @ cdecl wined3d_device_context_set_shader(ptr long ptr)
 @ cdecl wined3d_device_context_set_shader_resource_view(ptr long long ptr)
+@ cdecl wined3d_device_context_set_stream_source(ptr long ptr long long)
 @ cdecl wined3d_device_context_set_unordered_access_view(ptr long long ptr long)
 @ cdecl wined3d_device_context_set_viewports(ptr long ptr)
 
diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h
index 82cce3d0251..3f29b78044e 100644
--- a/include/wine/wined3d.h
+++ b/include/wine/wined3d.h
@@ -2577,6 +2577,8 @@ void __cdecl wined3d_device_context_set_shader(struct wined3d_device_context *co
         enum wined3d_shader_type type, struct wined3d_shader *shader);
 void __cdecl wined3d_device_context_set_shader_resource_view(struct wined3d_device_context *context,
         enum wined3d_shader_type type, unsigned int idx, struct wined3d_shader_resource_view *view);
+HRESULT __cdecl wined3d_device_context_set_stream_source(struct wined3d_device_context *context,
+        unsigned int stream_idx, struct wined3d_buffer *buffer, unsigned int offset, unsigned int stride);
 void __cdecl wined3d_device_context_set_unordered_access_view(struct wined3d_device_context *context,
         enum wined3d_pipeline pipeline, unsigned int idx, struct wined3d_unordered_access_view *uav,
         unsigned int initial_count);




More information about the wine-cvs mailing list