ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3d9: Clamp vertex buffer upload range to buffer size. 

Signed-off-by: Józef Kucia <jkucia@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Józef Kucia 2019-01-15 15:27:59 +01:00 committed by Alexandre Julliard
parent 58868304dc
commit a382c7911c
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dlls/d3d9/device.c
View File

@ -2712,8 +2712,10 @@ static void d3d9_device_upload_sysmem_vertex_buffers(struct d3d9_device *device,
{ {
struct wined3d_box box = {0, 0, 0, 1, 0, 1}; struct wined3d_box box = {0, 0, 0, 1, 0, 1};
struct d3d9_vertexbuffer *d3d9_buffer; struct d3d9_vertexbuffer *d3d9_buffer;
struct wined3d_resource *dst_resource;
unsigned int i, offset, stride, map; unsigned int i, offset, stride, map;
struct wined3d_buffer *dst_buffer; struct wined3d_buffer *dst_buffer;
struct wined3d_resource_desc desc;
HRESULT hr; HRESULT hr;
if (!device->sysmem_vb) if (!device->sysmem_vb)
@ -2733,10 +2735,12 @@ static void d3d9_device_upload_sysmem_vertex_buffers(struct d3d9_device *device,
if (FAILED(hr = wined3d_device_get_stream_source(device->wined3d_device, i, &dst_buffer, &offset, &stride))) if (FAILED(hr = wined3d_device_get_stream_source(device->wined3d_device, i, &dst_buffer, &offset, &stride)))
ERR("Failed to get stream source.\n"); ERR("Failed to get stream source.\n");
d3d9_buffer = wined3d_buffer_get_parent(dst_buffer); d3d9_buffer = wined3d_buffer_get_parent(dst_buffer);
dst_resource = wined3d_buffer_get_resource(dst_buffer);
wined3d_resource_get_desc(dst_resource, &desc);
box.left = offset + start_vertex * stride; box.left = offset + start_vertex * stride;
box.right = box.left + vertex_count * stride; box.right = min(box.left + vertex_count * stride, desc.size);
if (FAILED(hr = wined3d_device_copy_sub_resource_region(device->wined3d_device, if (FAILED(hr = wined3d_device_copy_sub_resource_region(device->wined3d_device,
wined3d_buffer_get_resource(dst_buffer), 0, box.left, 0, 0, dst_resource, 0, box.left, 0, 0,
wined3d_buffer_get_resource(d3d9_buffer->wined3d_buffer), 0, &box, 0))) wined3d_buffer_get_resource(d3d9_buffer->wined3d_buffer), 0, &box, 0)))
ERR("Failed to update buffer.\n"); ERR("Failed to update buffer.\n");
} }

2
dlls/d3d9/tests/visual.c
View File

@ -24510,7 +24510,7 @@ static void test_sysmem_draw(void)
hr = IDirect3DDevice9_BeginScene(device); hr = IDirect3DDevice9_BeginScene(device);
ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 4, 0, 4, 0, 2); hr = IDirect3DDevice9_DrawIndexedPrimitive(device, D3DPT_TRIANGLESTRIP, 4, 0, 5, 0, 2);
ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);
hr = IDirect3DDevice9_EndScene(device); hr = IDirect3DDevice9_EndScene(device);
ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr);