d3d11: Fail IASetVertexBuffers() if any of the offsets are unaligned.

dlls/d3d11/device.c

@@ -841,26 +841,32 @@ static void STDMETHODCALLTYPE d3d11_device_context_IASetInputLayout(ID3D11Device
 static void STDMETHODCALLTYPE d3d11_device_context_IASetVertexBuffers(ID3D11DeviceContext1 *iface,
         UINT start_slot, UINT buffer_count, ID3D11Buffer *const *buffers, const UINT *strides, const UINT *offsets)
 {
+    struct wined3d_stream_state streams[D3D11_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT];
     struct d3d11_device_context *context = impl_from_ID3D11DeviceContext1(iface);
     unsigned int i;
 
     TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p, strides %p, offsets %p.\n",
             iface, start_slot, buffer_count, buffers, strides, offsets);
 
-    wined3d_mutex_lock();
+    if (buffer_count > ARRAY_SIZE(streams))
+    {
+        WARN("Buffer count %u exceeds limit.\n", buffer_count);
+        buffer_count = ARRAY_SIZE(streams);
+    }
+
     for (i = 0; i < buffer_count; ++i)
     {
         struct d3d_buffer *buffer = unsafe_impl_from_ID3D11Buffer(buffers[i]);
-        struct wined3d_stream_state stream;
 
-        stream.buffer = buffer ? buffer->wined3d_buffer : NULL;
-        stream.offset = offsets[i];
-        stream.stride = strides[i];
-        stream.frequency = 1;
-        stream.flags = 0;
-
-        wined3d_device_context_set_stream_source(context->wined3d_context, start_slot + i, &stream);
+        streams[i].buffer = buffer ? buffer->wined3d_buffer : NULL;
+        streams[i].offset = offsets[i];
+        streams[i].stride = strides[i];
+        streams[i].frequency = 1;
+        streams[i].flags = 0;
     }
+
+    wined3d_mutex_lock();
+    wined3d_device_context_set_stream_sources(context->wined3d_context, start_slot, buffer_count, streams);
     wined3d_mutex_unlock();
 }
 
@@ -4701,26 +4707,33 @@ static void STDMETHODCALLTYPE d3d10_device_IASetInputLayout(ID3D10Device1 *iface
 static void STDMETHODCALLTYPE d3d10_device_IASetVertexBuffers(ID3D10Device1 *iface, UINT start_slot,
         UINT buffer_count, ID3D10Buffer *const *buffers, const UINT *strides, const UINT *offsets)
 {
+    struct wined3d_stream_state streams[D3D10_IA_VERTEX_INPUT_RESOURCE_SLOT_COUNT];
     struct d3d_device *device = impl_from_ID3D10Device(iface);
     unsigned int i;
 
     TRACE("iface %p, start_slot %u, buffer_count %u, buffers %p, strides %p, offsets %p\n",
             iface, start_slot, buffer_count, buffers, strides, offsets);
 
-    wined3d_mutex_lock();
+    if (buffer_count > ARRAY_SIZE(streams))
+    {
+        WARN("Buffer count %u exceeds limit.\n", buffer_count);
+        buffer_count = ARRAY_SIZE(streams);
+    }
+
     for (i = 0; i < buffer_count; ++i)
     {
         struct d3d_buffer *buffer = unsafe_impl_from_ID3D10Buffer(buffers[i]);
-        struct wined3d_stream_state stream;
 
-        stream.buffer = buffer ? buffer->wined3d_buffer : NULL;
-        stream.offset = offsets[i];
-        stream.stride = strides[i];
-        stream.frequency = 1;
-        stream.flags = 0;
-
-        wined3d_device_context_set_stream_source(device->immediate_context.wined3d_context, start_slot + i, &stream);
+        streams[i].buffer = buffer ? buffer->wined3d_buffer : NULL;
+        streams[i].offset = offsets[i];
+        streams[i].stride = strides[i];
+        streams[i].frequency = 1;
+        streams[i].flags = 0;
     }
+
+    wined3d_mutex_lock();
+    wined3d_device_context_set_stream_sources(device->immediate_context.wined3d_context,
+            start_slot, buffer_count, streams);
     wined3d_mutex_unlock();
 }
 

dlls/wined3d/device.c

@@ -2219,41 +2219,47 @@ 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, const struct wined3d_stream_state *src_stream)
+HRESULT CDECL wined3d_device_context_set_stream_sources(struct wined3d_device_context *context,
+        unsigned int start_idx, unsigned int count, const struct wined3d_stream_state *streams)
 {
-    struct wined3d_buffer *buffer = src_stream->buffer;
-    struct wined3d_stream_state *dst_stream;
-    struct wined3d_buffer *prev_buffer;
+    struct wined3d_state *state = context->state;
+    unsigned int i;
 
-    TRACE("context %p, stream_idx %u, src_stream %p.\n", context, stream_idx, src_stream);
+    TRACE("context %p, start_idx %u, count %u, streams %p.\n", context, start_idx, count, streams);
 
-    if (stream_idx >= WINED3D_MAX_STREAMS)
+    if (start_idx >= WINED3D_MAX_STREAMS)
     {
-        WARN("Stream index %u out of range.\n", stream_idx);
+        WARN("Start index %u is out of range.\n", start_idx);
         return WINED3DERR_INVALIDCALL;
     }
-    else if (src_stream->offset & 0x3)
+
+    count = min(count, WINED3D_MAX_STREAMS - start_idx);
+
+    for (i = 0; i < count; ++i)
     {
-        WARN("Offset %u is not 4 byte aligned.\n", src_stream->offset);
-        return WINED3DERR_INVALIDCALL;
+        if (streams[i].offset & 0x3)
+        {
+            WARN("Offset %u is not 4 byte aligned.\n", streams[i].offset);
+            return WINED3DERR_INVALIDCALL;
+        }
     }
 
-    dst_stream = &context->state->streams[stream_idx];
-    prev_buffer = dst_stream->buffer;
+    if (!memcmp(streams, &state->streams[start_idx], count * sizeof(*streams)))
+        return WINED3D_OK;
 
-    if (!memcmp(src_stream, dst_stream, sizeof(*src_stream)))
+    for (i = 0; i < count; ++i)
     {
-        TRACE("Application is setting the old values over, nothing to do.\n");
-        return WINED3D_OK;
-    }
+        struct wined3d_buffer *prev = state->streams[start_idx + i].buffer;
+        struct wined3d_buffer *buffer = streams[i].buffer;
 
-    *dst_stream = *src_stream;
-    if (buffer)
-        wined3d_buffer_incref(buffer);
-    wined3d_device_context_emit_set_stream_source(context, stream_idx, src_stream);
-    if (prev_buffer)
-        wined3d_buffer_decref(prev_buffer);
+        state->streams[start_idx + i] = streams[i];
+
+        if (buffer)
+            wined3d_buffer_incref(buffer);
+        wined3d_device_context_emit_set_stream_source(context, start_idx + i, &streams[i]);
+        if (prev)
+            wined3d_buffer_decref(prev);
+    }
 
     return WINED3D_OK;
 }
@@ -3912,7 +3918,7 @@ void CDECL wined3d_device_apply_stateblock(struct wined3d_device *device,
     while (map)
     {
         i = wined3d_bit_scan(&map);
-        wined3d_device_context_set_stream_source(context, i, &state->streams[i]);
+        wined3d_device_context_set_stream_sources(context, i, 1, &state->streams[i]);
     }
 
     map = changed->textures;

dlls/wined3d/wined3d.spec

@@ -137,7 +137,7 @@
 @ cdecl wined3d_device_context_set_shader_resource_views(ptr long long long ptr)
 @ cdecl wined3d_device_context_set_state(ptr ptr)
 @ cdecl wined3d_device_context_set_stream_outputs(ptr ptr)
-@ cdecl wined3d_device_context_set_stream_source(ptr long ptr)
+@ cdecl wined3d_device_context_set_stream_sources(ptr long long ptr)
 @ cdecl wined3d_device_context_set_unordered_access_views(ptr long long long ptr ptr)
 @ cdecl wined3d_device_context_set_vertex_declaration(ptr ptr)
 @ cdecl wined3d_device_context_set_viewports(ptr long ptr)

include/wine/wined3d.h

@@ -2531,8 +2531,8 @@ void __cdecl wined3d_device_context_set_shader_resource_views(struct wined3d_dev
 void __cdecl wined3d_device_context_set_state(struct wined3d_device_context *context, struct wined3d_state *state);
 void __cdecl wined3d_device_context_set_stream_outputs(struct wined3d_device_context *context,
         const struct wined3d_stream_output outputs[WINED3D_MAX_STREAM_OUTPUT_BUFFERS]);
-HRESULT __cdecl wined3d_device_context_set_stream_source(struct wined3d_device_context *context,
-        unsigned int stream_idx, const struct wined3d_stream_state *stream);
+HRESULT __cdecl wined3d_device_context_set_stream_sources(struct wined3d_device_context *context,
+        unsigned int start_idx, unsigned int count, const struct wined3d_stream_state *streams);
 void __cdecl wined3d_device_context_set_unordered_access_views(struct wined3d_device_context *context,
         enum wined3d_pipeline pipeline, unsigned int start_idx, unsigned int count,
         struct wined3d_unordered_access_view *const *uavs, const unsigned int *initial_counts);