September 2013 - Wine-commits

Stefan Dösinger : d3d9/tests: Use a plain depth stencil instead of a texture.
by Alexandre Julliard 10 Sep '13

10 Sep '13

Module: wine Branch: master Commit: ff14c24dd2e1fd7e697e7c3bd2a3a37088e419f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff14c24dd2e1fd7e697e7c3bd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Sep 10 12:14:03 2013 +0200 d3d9/tests: Use a plain depth stencil instead of a texture. r500 does not support anything but AMD's extension depth texture formats on Windows 7. Plain surfaces work OK with the builtin formats. --- dlls/d3d9/tests/d3d9ex.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 2deef76..470e8a4 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -861,12 +861,9 @@ static void test_reset_resources(void) hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); ok(SUCCEEDED(hr), "Failed to get device caps, hr %#x.\n", hr); - hr = IDirect3DDevice9_CreateTexture(device, 128, 128, 1, D3DUSAGE_DEPTHSTENCIL, - D3DFMT_D24S8, D3DPOOL_DEFAULT, &texture, NULL); - ok(SUCCEEDED(hr), "Failed to create depth/stencil texture, hr %#x.\n", hr); - hr = IDirect3DTexture9_GetSurfaceLevel(texture, 0, &surface); - ok(SUCCEEDED(hr), "Failed to get surface, hr %#x.\n", hr); - IDirect3DTexture9_Release(texture); + hr = IDirect3DDevice9_CreateDepthStencilSurface(device, 128, 128, D3DFMT_D24S8, + D3DMULTISAMPLE_NONE, 0, TRUE, &surface, NULL); + ok(SUCCEEDED(hr), "Failed to create depth/stencil surface, hr %#x.\n", hr); hr = IDirect3DDevice9_SetDepthStencilSurface(device, surface); ok(SUCCEEDED(hr), "Failed to set depth/stencil surface, hr %#x.\n", hr); IDirect3DSurface9_Release(surface);

1 0

Stefan Dösinger : d3d9/tests: Actually accept r500 results.
by Alexandre Julliard 10 Sep '13

10 Sep '13

Module: wine Branch: master Commit: c0a14564d33aad52c4500b90da8eea3f0810283d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c0a14564d33aad52c4500b90d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Sep 10 12:14:04 2013 +0200 d3d9/tests: Actually accept r500 results. --- dlls/d3d9/tests/visual.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index b856c93..cb04c01 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -12728,11 +12728,12 @@ static void fp_special_test(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); color = getPixelColor(device, 320, 240); - ok(color_match(color, vs_body[i].r600, 1) + ok(color_match(color, vs_body[i].r500, 1) + || color_match(color, vs_body[i].r600, 1) || color_match(color, vs_body[i].nv40, 1) || color_match(color, vs_body[i].nv50, 1), - "Expected color 0x%08x, 0x%08x or 0x%08x for instruction \"%s\", got 0x%08x.\n", - vs_body[i].r600, vs_body[i].nv40, vs_body[i].nv50, vs_body[i].name, color); + "Expected color 0x%08x, 0x%08x, 0x%08x or 0x%08x for instruction \"%s\", got 0x%08x.\n", + vs_body[i].r500, vs_body[i].r600, vs_body[i].nv40, vs_body[i].nv50, vs_body[i].name, color); hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed, hr %#x.\n", hr);

1 0

Huw Davies : iphlpapi: Don' t set the dns server list if there are no servers.
by Alexandre Julliard 10 Sep '13

10 Sep '13

Module: wine Branch: master Commit: 5bfabee8cdb23bb3b8b5e9e6f3e4fc14a93972ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=5bfabee8cdb23bb3b8b5e9e6f… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Sep 10 14:19:58 2013 +0100 iphlpapi: Don't set the dns server list if there are no servers. --- dlls/iphlpapi/iphlpapi_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/iphlpapi/iphlpapi_main.c b/dlls/iphlpapi/iphlpapi_main.c index 837eb3d..670713f 100644 --- a/dlls/iphlpapi/iphlpapi_main.c +++ b/dlls/iphlpapi/iphlpapi_main.c @@ -1083,7 +1083,7 @@ ULONG WINAPI DECLSPEC_HOTPATCH GetAdaptersAddresses(ULONG family, ULONG flags, P size = bytes_left -= size; } } - if (!(flags & GAA_FLAG_SKIP_DNS_SERVER)) + if (!(flags & GAA_FLAG_SKIP_DNS_SERVER) && dns_server_size) { firstDns = (PIP_ADAPTER_DNS_SERVER_ADDRESS)((BYTE *)first_aa + total_size - dns_server_size - dns_suffix_size); get_dns_server_addresses(firstDns, &dns_server_size);

1 0

Andrew Eikum : oleaut32: Don't crash on NULL string arguments.
by Alexandre Julliard 10 Sep '13

10 Sep '13

Module: wine Branch: master Commit: 6b4f43e8e6c904319033ff2c1748d7394d9d45a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b4f43e8e6c904319033ff2c1… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Tue Sep 10 08:45:41 2013 -0500 oleaut32: Don't crash on NULL string arguments. --- dlls/oleaut32/tests/typelib.c | 11 +++++++++++ dlls/oleaut32/typelib.c | 3 +++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/oleaut32/tests/typelib.c b/dlls/oleaut32/tests/typelib.c index 1c398f9..17a3b99 100644 --- a/dlls/oleaut32/tests/typelib.c +++ b/dlls/oleaut32/tests/typelib.c @@ -4243,6 +4243,8 @@ static void test_SetFuncAndParamNames(void) static OLECHAR nameW[] = {'n','a','m','e',0}; static OLECHAR prop[] = {'p','r','o','p',0}; static OLECHAR *propW[] = {prop}; + static OLECHAR func[] = {'f','u','n','c',0}; + static OLECHAR *funcW[] = {func, NULL}; CHAR filenameA[MAX_PATH]; WCHAR filenameW[MAX_PATH]; ICreateTypeLib2 *ctl; @@ -4309,6 +4311,15 @@ static void test_SetFuncAndParamNames(void) hr = ICreateTypeInfo_SetFuncAndParamNames(cti, 3, propW, 1); ok(hr == TYPE_E_AMBIGUOUSNAME, "got 0x%08x\n", hr); + /* regular function */ + funcdesc.invkind = INVOKE_FUNC; + funcdesc.cParams = 1; + hr = ICreateTypeInfo_AddFuncDesc(cti, 4, &funcdesc); + ok(hr == S_OK, "got 0x%08x\n", hr); + + hr = ICreateTypeInfo_SetFuncAndParamNames(cti, 4, funcW, 2); + ok(hr == S_OK, "got 0x%08x\n", hr); + ICreateTypeInfo_Release(cti); ICreateTypeLib2_Release(ctl); DeleteFileA(filenameA); diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 328e28a..afcdc5c 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -1889,6 +1889,9 @@ static TLBString *TLB_append_str(struct list *string_list, BSTR new_str) { TLBString *str; + if(!new_str) + return NULL; + LIST_FOR_EACH_ENTRY(str, string_list, TLBString, entry) { if (strcmpW(str->str, new_str) == 0) return str;

1 0

Andrew Eikum : oleaut32: Typelib strings of size -1 are NULL.
by Alexandre Julliard 09 Sep '13

09 Sep '13

Module: wine Branch: master Commit: 808c47cecba0fcd4a9a62b69183e88d20cabbe19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=808c47cecba0fcd4a9a62b691… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Sep 9 09:17:23 2013 -0500 oleaut32: Typelib strings of size -1 are NULL. --- dlls/oleaut32/typelib.c | 29 +++++++++++------------------ 1 files changed, 11 insertions(+), 18 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 18c1e19..476f089 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2258,24 +2258,17 @@ static void MSFT_ReadValue( VARIANT * pVar, int offset, TLBContext *pcx ) case VT_BSTR :{ char * ptr; MSFT_ReadLEDWords(&size, sizeof(INT), pcx, DO_NOT_SEEK ); - if(size < 0) { - char next; - DWORD origPos = MSFT_Tell(pcx), nullPos; - - do { - MSFT_Read(&next, 1, pcx, DO_NOT_SEEK); - } while (next); - nullPos = MSFT_Tell(pcx); - size = nullPos - origPos; - MSFT_Seek(pcx, origPos); - } - ptr = heap_alloc_zero(size);/* allocate temp buffer */ - MSFT_Read(ptr, size, pcx, DO_NOT_SEEK);/* read string (ANSI) */ - V_BSTR(pVar)=SysAllocStringLen(NULL,size); - /* FIXME: do we need a AtoW conversion here? */ - V_UNION(pVar, bstrVal[size])='\0'; - while(size--) V_UNION(pVar, bstrVal[size])=ptr[size]; - heap_free(ptr); + if(size == -1){ + V_BSTR(pVar) = NULL; + }else{ + ptr = heap_alloc_zero(size); + MSFT_Read(ptr, size, pcx, DO_NOT_SEEK); + V_BSTR(pVar)=SysAllocStringLen(NULL,size); + /* FIXME: do we need a AtoW conversion here? */ + V_UNION(pVar, bstrVal[size])='\0'; + while(size--) V_UNION(pVar, bstrVal[size])=ptr[size]; + heap_free(ptr); + } } size=-4; break; /* FIXME: this will not work AT ALL when the variant contains a pointer */

1 0

Andrew Eikum : oleaut32: Fix TRACE.
by Alexandre Julliard 09 Sep '13

09 Sep '13

Module: wine Branch: master Commit: c5be905bf7e5a13fa36d843e229e37808ae8f49a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5be905bf7e5a13fa36d843e2… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Sep 9 08:45:28 2013 -0500 oleaut32: Fix TRACE. --- dlls/oleaut32/typelib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 476f089..328e28a 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5357,7 +5357,7 @@ static HRESULT WINAPI ITypeLibComp_fnBind( ITypeLibImpl *This = impl_from_ITypeComp(iface); int typemismatch=0, i; - TRACE("(%s, 0x%x, 0x%x, %p, %p, %p)\n", debugstr_w(szName), lHash, wFlags, ppTInfo, pDescKind, pBindPtr); + TRACE("(%p)->(%s, 0x%x, 0x%x, %p, %p, %p)\n", This, debugstr_w(szName), lHash, wFlags, ppTInfo, pDescKind, pBindPtr); *pDescKind = DESCKIND_NONE; pBindPtr->lptcomp = NULL;

1 0

Stefan Dösinger : wined3d: Only invalidate STATE_INDEXBUFFER for the current context in buffer_create_buffer_object ().
by Alexandre Julliard 09 Sep '13

09 Sep '13

Module: wine Branch: master Commit: 1cf192172e4ea2533da99cde403686b584760234 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cf192172e4ea2533da99cde4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 9 15:15:35 2013 +0200 wined3d: Only invalidate STATE_INDEXBUFFER for the current context in buffer_create_buffer_object(). --- dlls/wined3d/buffer.c | 11 ++++++----- dlls/wined3d/context.c | 2 +- dlls/wined3d/device.c | 16 +++++++++------- dlls/wined3d/wined3d_private.h | 4 ++-- 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 00e4dae..6314ded 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -118,10 +118,11 @@ static void delete_gl_buffer(struct wined3d_buffer *This, const struct wined3d_g } /* Context activation is done by the caller. */ -static void buffer_create_buffer_object(struct wined3d_buffer *This, const struct wined3d_gl_info *gl_info) +static void buffer_create_buffer_object(struct wined3d_buffer *This, struct wined3d_context *context) { GLenum gl_usage = GL_STATIC_DRAW_ARB; GLenum error; + const struct wined3d_gl_info *gl_info = context->gl_info; TRACE("Creating an OpenGL vertex buffer object for wined3d_buffer %p with usage %s.\n", This, debug_d3dusage(This->resource.usage)); @@ -148,7 +149,7 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This, const struc } if (This->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) - device_invalidate_state(This->resource.device, STATE_INDEXBUFFER); + context_invalidate_state(context, STATE_INDEXBUFFER); GL_EXTCALL(glBindBufferARB(This->buffer_type_hint, This->buffer_object)); error = gl_info->gl_ops.gl.p_glGetError(); if (error != GL_NO_ERROR) @@ -460,7 +461,7 @@ static inline void fixup_transformed_pos(float *p) } /* Context activation is done by the caller. */ -void buffer_get_memory(struct wined3d_buffer *buffer, const struct wined3d_gl_info *gl_info, +void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *context, struct wined3d_bo_address *data) { data->buffer_object = buffer->buffer_object; @@ -468,7 +469,7 @@ void buffer_get_memory(struct wined3d_buffer *buffer, const struct wined3d_gl_in { if ((buffer->flags & WINED3D_BUFFER_CREATEBO) && !buffer->resource.map_count) { - buffer_create_buffer_object(buffer, gl_info); + buffer_create_buffer_object(buffer, context); buffer->flags &= ~WINED3D_BUFFER_CREATEBO; if (buffer->buffer_object) { @@ -754,7 +755,7 @@ void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) if (buffer->flags & WINED3D_BUFFER_CREATEBO) { context = context_acquire(device, NULL); - buffer_create_buffer_object(buffer, context->gl_info); + buffer_create_buffer_object(buffer, context); context_release(context); buffer->flags &= ~WINED3D_BUFFER_CREATEBO; } diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index bb3b06b..f05fdcc 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2368,7 +2368,7 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de device_update_tex_unit_map(device); device_preload_textures(device); if (isStateDirty(context, STATE_VDECL) || isStateDirty(context, STATE_STREAMSRC)) - device_update_stream_info(device, context->gl_info); + device_update_stream_info(device, context); if (state->index_buffer) { if (device->stream_info.all_vbo) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 65209e3..1ef2763 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -164,7 +164,8 @@ static BOOL fixed_get_input(BYTE usage, BYTE usage_idx, unsigned int *regnum) } /* Context activation is done by the caller. */ -static void device_stream_info_from_declaration(struct wined3d_device *device, struct wined3d_stream_info *stream_info) +static void device_stream_info_from_declaration(struct wined3d_device *device, struct wined3d_stream_info *stream_info, + struct wined3d_context *context) { const struct wined3d_state *state = &device->state; /* We need to deal with frequency data! */ @@ -200,7 +201,7 @@ static void device_stream_info_from_declaration(struct wined3d_device *device, s stride = stream->stride; TRACE("Stream %u, buffer %p.\n", element->input_slot, buffer); - buffer_get_memory(buffer, &device->adapter->gl_info, &data); + buffer_get_memory(buffer, context, &data); /* We can't use VBOs if the base vertex index is negative. OpenGL * doesn't accept negative offsets (or rather offsets bigger than the @@ -213,7 +214,7 @@ static void device_stream_info_from_declaration(struct wined3d_device *device, s { WARN_(d3d_perf)("load_base_vertex_index is < 0 (%d), not using VBOs.\n", state->load_base_vertex_index); data.buffer_object = 0; - data.addr = buffer_get_sysmem(buffer, &device->adapter->gl_info); + data.addr = buffer_get_sysmem(buffer, context->gl_info); if ((UINT_PTR)data.addr < -state->load_base_vertex_index * stride) FIXME("System memory vertex data load offset is negative!\n"); } @@ -266,7 +267,7 @@ static void device_stream_info_from_declaration(struct wined3d_device *device, s stream_info->elements[idx].stride = stride; stream_info->elements[idx].stream_idx = element->input_slot; - if (!device->adapter->gl_info.supported[ARB_VERTEX_ARRAY_BGRA] + if (!context->gl_info->supported[ARB_VERTEX_ARRAY_BGRA] && element->format->id == WINED3DFMT_B8G8R8A8_UNORM) { stream_info->swizzle_map |= 1 << idx; @@ -305,14 +306,15 @@ static void device_stream_info_from_declaration(struct wined3d_device *device, s } /* Context activation is done by the caller. */ -void device_update_stream_info(struct wined3d_device *device, const struct wined3d_gl_info *gl_info) +void device_update_stream_info(struct wined3d_device *device, struct wined3d_context *context) { + const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_stream_info *stream_info = &device->stream_info; const struct wined3d_state *state = &device->state; DWORD prev_all_vbo = stream_info->all_vbo; TRACE("============================= Vertex Declaration =============================\n"); - device_stream_info_from_declaration(device, stream_info); + device_stream_info_from_declaration(device, stream_info, context); if (state->vertex_shader && !stream_info->position_transformed) { @@ -3535,7 +3537,7 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, vs = state->vertex_shader; state->vertex_shader = NULL; - device_stream_info_from_declaration(device, &stream_info); + device_stream_info_from_declaration(device, &stream_info, context); state->vertex_shader = vs; /* We can't convert FROM a VBO, and vertex buffers used to source into diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 925b9ca..1d02bfa 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1957,7 +1957,7 @@ void device_resource_add(struct wined3d_device *device, struct wined3d_resource void device_resource_released(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void device_switch_onscreen_ds(struct wined3d_device *device, struct wined3d_context *context, struct wined3d_surface *depth_stencil) DECLSPEC_HIDDEN; -void device_update_stream_info(struct wined3d_device *device, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; +void device_update_stream_info(struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN; void device_update_tex_unit_map(struct wined3d_device *device) DECLSPEC_HIDDEN; void device_invalidate_state(const struct wined3d_device *device, DWORD state) DECLSPEC_HIDDEN; @@ -2520,7 +2520,7 @@ static inline struct wined3d_buffer *buffer_from_resource(struct wined3d_resourc return CONTAINING_RECORD(resource, struct wined3d_buffer, resource); } -void buffer_get_memory(struct wined3d_buffer *buffer, const struct wined3d_gl_info *gl_info, +void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *context, struct wined3d_bo_address *data) DECLSPEC_HIDDEN; BYTE *buffer_get_sysmem(struct wined3d_buffer *This, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN;

1 0

Stefan Dösinger : wined3d: Only invalidate STATE_INDEXBUFFER for the current context in buffer_get_sysmem ().
by Alexandre Julliard 09 Sep '13

09 Sep '13

Module: wine Branch: master Commit: 87f931dc64a598c427a07b1d094eaa427adab669 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87f931dc64a598c427a07b1d0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 9 15:15:36 2013 +0200 wined3d: Only invalidate STATE_INDEXBUFFER for the current context in buffer_get_sysmem(). --- dlls/wined3d/buffer.c | 12 +++++++----- dlls/wined3d/context.c | 2 +- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/drawprim.c | 24 +++++++++++++----------- dlls/wined3d/state.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 6 files changed, 26 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=87f931dc64a598c427a07…

1 0

Stefan Dösinger : wined3d: Pass the context to the main buffer preload function.
by Alexandre Julliard 09 Sep '13

09 Sep '13

Module: wine Branch: master Commit: cd203b38a6d720e6f83b2e098f9882d1b4015f21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd203b38a6d720e6f83b2e098… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 9 15:15:37 2013 +0200 wined3d: Pass the context to the main buffer preload function. --- dlls/wined3d/buffer.c | 16 +++++++++------- dlls/wined3d/context.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 2 ++ 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index d198ac4..f811a61 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -730,13 +730,13 @@ static void buffer_direct_upload(struct wined3d_buffer *This, const struct wined checkGLcall("glUnmapBufferARB"); } -void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) +/* Context activation is done by the caller. */ +void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_context *context) { DWORD flags = buffer->flags & (WINED3D_BUFFER_NOSYNC | WINED3D_BUFFER_DISCARD); struct wined3d_device *device = buffer->resource.device; UINT start = 0, end = 0, len = 0, vertices; const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; BOOL decl_changed = FALSE; unsigned int i, j; BYTE *data; @@ -756,9 +756,7 @@ void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) /* TODO: Make converting independent from VBOs */ if (buffer->flags & WINED3D_BUFFER_CREATEBO) { - context = context_acquire(device, NULL); buffer_create_buffer_object(buffer, context); - context_release(context); buffer->flags &= ~WINED3D_BUFFER_CREATEBO; } else @@ -867,14 +865,11 @@ void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) return; } - context = context_acquire(device, NULL); buffer_direct_upload(buffer, context->gl_info, flags); - context_release(context); return; } - context = context_acquire(device, NULL); gl_info = context->gl_info; if(!(buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER)) @@ -927,6 +922,13 @@ void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) } HeapFree(GetProcessHeap(), 0, data); +} + +void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) +{ + struct wined3d_context *context; + context = context_acquire(buffer->resource.device, NULL); + buffer_internal_preload(buffer, context); context_release(context); } diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index da255e8..4a079cf 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2372,7 +2372,7 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de if (state->index_buffer) { if (device->stream_info.all_vbo) - wined3d_buffer_preload(state->index_buffer); + buffer_internal_preload(state->index_buffer, context); else buffer_get_sysmem(state->index_buffer, context); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3564149..2457771 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -288,7 +288,7 @@ static void device_stream_info_from_declaration(struct wined3d_device *device, s element = &stream_info->elements[i]; buffer = state->streams[element->stream_idx].buffer; - wined3d_buffer_preload(buffer); + buffer_internal_preload(buffer, context); /* If the preload dropped the buffer object, update the stream info. */ if (buffer->buffer_object != element->data.buffer_object) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a7fa852..3fbad8b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2523,6 +2523,8 @@ static inline struct wined3d_buffer *buffer_from_resource(struct wined3d_resourc void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *context, struct wined3d_bo_address *data) DECLSPEC_HIDDEN; BYTE *buffer_get_sysmem(struct wined3d_buffer *This, struct wined3d_context *context) DECLSPEC_HIDDEN; +void buffer_internal_preload(struct wined3d_buffer *buffer, + struct wined3d_context *context) DECLSPEC_HIDDEN; struct wined3d_rendertarget_view {

1 0

Stefan Dösinger : ddraw/tests: Don' t test transformed vertices with normals.
by Alexandre Julliard 09 Sep '13

09 Sep '13

Module: wine Branch: master Commit: 20ce6bd102baa407ca5c6960e4416ab429ae7c1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=20ce6bd102baa407ca5c6960e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 9 15:15:38 2013 +0200 ddraw/tests: Don't test transformed vertices with normals. They crash the GPU driver of my r200 WinXP laptop, causing anything from a BSOD to a frozen or black screen and sometimes incorrectly set resolutions. --- dlls/ddraw/tests/ddraw4.c | 25 ------------------------- dlls/ddraw/tests/ddraw7.c | 26 -------------------------- 2 files changed, 0 insertions(+), 51 deletions(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 485633f..21a2d40 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -3516,21 +3516,6 @@ static void test_lighting_interface_versions(void) {{ 640.0f}, { 0.0f}, {0.0f}, {1.0f}, {0xff0000ff}, {0xff808080}}, }; -#define FVF_TLVERTEX2 (D3DFVF_XYZRHW | D3DFVF_NORMAL | D3DFVF_DIFFUSE | D3DFVF_SPECULAR) - static struct - { - struct vec4 position; - struct vec3 normal; - DWORD diffuse, specular; - } - tlquad2[] = - { - {{ 0.0f, 480.0f, 0.0f, 1.0f}, {1.0f, 0.0f, 0.0f}, 0xff0000ff, 0xff808080}, - {{ 0.0f, 0.0f, 0.0f, 1.0f}, {1.0f, 0.0f, 0.0f}, 0xff0000ff, 0xff808080}, - {{ 640.0f, 480.0f, 0.0f, 1.0f}, {1.0f, 0.0f, 0.0f}, 0xff0000ff, 0xff808080}, - {{ 640.0f, 0.0f, 0.0f, 1.0f}, {1.0f, 0.0f, 0.0f}, 0xff0000ff, 0xff808080}, - }; - static const struct { DWORD vertextype; @@ -3600,16 +3585,6 @@ static void test_lighting_interface_versions(void) { D3DFVF_TLVERTEX, tlquad, TRUE, TRUE, 0, 0x008080ff}, { D3DFVF_TLVERTEX, tlquad, FALSE, TRUE, D3DDP_DONOTLIGHT, 0x008080ff}, { D3DFVF_TLVERTEX, tlquad, TRUE, TRUE, D3DDP_DONOTLIGHT, 0x008080ff}, - - /* 40 */ - { FVF_TLVERTEX2, tlquad2, FALSE, FALSE, 0, 0x000000ff}, - { FVF_TLVERTEX2, tlquad2, TRUE, FALSE, 0, 0x000000ff}, - { FVF_TLVERTEX2, tlquad2, FALSE, FALSE, D3DDP_DONOTLIGHT, 0x000000ff}, - { FVF_TLVERTEX2, tlquad2, TRUE, FALSE, D3DDP_DONOTLIGHT, 0x000000ff}, - { FVF_TLVERTEX2, tlquad2, FALSE, TRUE, 0, 0x008080ff}, - { FVF_TLVERTEX2, tlquad2, TRUE, TRUE, 0, 0x008080ff}, - { FVF_TLVERTEX2, tlquad2, FALSE, TRUE, D3DDP_DONOTLIGHT, 0x008080ff}, - { FVF_TLVERTEX2, tlquad2, TRUE, TRUE, D3DDP_DONOTLIGHT, 0x008080ff}, }; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 7c97432..ebfb16f 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -3339,22 +3339,6 @@ static void test_lighting_interface_versions(void) {{ 640.0f}, { 0.0f}, {0.0f}, {1.0f}, {0xff0000ff}, {0xff808080}}, }; -#define FVF_TLVERTEX2 (D3DFVF_XYZRHW | D3DFVF_NORMAL | D3DFVF_DIFFUSE | D3DFVF_SPECULAR) - static struct - { - struct vec4 position; - struct vec3 normal; - DWORD diffuse, specular; - } - tlquad2[] = - { - {{ 0.0f, 480.0f, 0.0f, 1.0f}, {1.0f, 0.0f, 0.0f}, 0xff0000ff, 0xff808080}, - {{ 0.0f, 0.0f, 0.0f, 1.0f}, {1.0f, 0.0f, 0.0f}, 0xff0000ff, 0xff808080}, - {{ 640.0f, 480.0f, 0.0f, 1.0f}, {1.0f, 0.0f, 0.0f}, 0xff0000ff, 0xff808080}, - {{ 640.0f, 0.0f, 0.0f, 1.0f}, {1.0f, 0.0f, 0.0f}, 0xff0000ff, 0xff808080}, - }; - - static const struct { DWORD vertextype; @@ -3422,16 +3406,6 @@ static void test_lighting_interface_versions(void) { D3DFVF_TLVERTEX, tlquad, TRUE, TRUE, 0, 0x008080ff}, { D3DFVF_TLVERTEX, tlquad, FALSE, TRUE, D3DDP_DONOTLIGHT, 0x008080ff}, { D3DFVF_TLVERTEX, tlquad, TRUE, TRUE, D3DDP_DONOTLIGHT, 0x008080ff}, - - /* 40 */ - { FVF_TLVERTEX2, tlquad2, FALSE, FALSE, 0, 0x000000ff}, - { FVF_TLVERTEX2, tlquad2, TRUE, FALSE, 0, 0x000000ff}, - { FVF_TLVERTEX2, tlquad2, FALSE, FALSE, D3DDP_DONOTLIGHT, 0x000000ff}, - { FVF_TLVERTEX2, tlquad2, TRUE, FALSE, D3DDP_DONOTLIGHT, 0x000000ff}, - { FVF_TLVERTEX2, tlquad2, FALSE, TRUE, 0, 0x008080ff}, - { FVF_TLVERTEX2, tlquad2, TRUE, TRUE, 0, 0x008080ff}, - { FVF_TLVERTEX2, tlquad2, FALSE, TRUE, D3DDP_DONOTLIGHT, 0x008080ff}, - { FVF_TLVERTEX2, tlquad2, TRUE, TRUE, D3DDP_DONOTLIGHT, 0x008080ff}, }; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,

1 0