wine-commits October 2012

wine-commits@winehq.org

2 participants
960 discussions

Christian Costa : d3drm: Fix child leak.
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: 5e1d854ee50a9ad885ebd9a15f7728afa2cb0447 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e1d854ee50a9ad885ebd9a15… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Oct 21 14:51:25 2012 +0200 d3drm: Fix child leak. --- dlls/d3drm/meshbuilder.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 79b5d74..180a8a9 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1260,6 +1260,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) if (FAILED(hr)) { hr = IDirectXFileObject_QueryInterface(child, &IID_IDirectXFileDataReference, (void **)&reference); + IDirectXFileObject_Release(child); if (FAILED(hr)) goto end; @@ -1268,6 +1269,10 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) if (FAILED(hr)) goto end; } + else + { + IDirectXFileObject_Release(child); + } hr = Direct3DRMMaterial_create(&material); if (FAILED(hr)) @@ -1357,9 +1362,14 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) i++; } if (hr == S_OK) + { + IDirectXFileObject_Release(child); WARN("Found more sub-objects than expected\n"); + } else if (hr != DXFILEERR_NOMOREOBJECTS) + { goto end; + } hr = S_OK; } else

1 0

Christian Costa : d3drm: Fix wrong condition.
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: ff0e82502f003c55b027b8fa9e009b2ecdeb8e8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff0e82502f003c55b027b8fa9… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Oct 21 14:51:17 2012 +0200 d3drm: Fix wrong condition. --- dlls/d3drm/meshbuilder.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 455bb32..79b5d74 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1243,7 +1243,7 @@ HRESULT load_mesh_data(IDirect3DRMMeshBuilder3* iface, LPDIRECTXFILEDATA pData) if (size != data_size) WARN("Returned size %u does not match expected one %u\n", size, data_size); - if (nb_materials > 2) + if (nb_materials > 1) { FIXME("Only one material per mesh supported, first one applies to all faces\n"); nb_materials = 1;

1 0

Christian Costa : d3dxof: Display new ref count in AddRef & Release.
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: 079cf1c24c8ce5f567f058277f476f6ad2fbff59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=079cf1c24c8ce5f567f058277… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun Oct 21 14:50:36 2012 +0200 d3dxof: Display new ref count in AddRef & Release. --- dlls/d3dxof/d3dxof.c | 44 ++++++++++++++++++++++---------------------- 1 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/d3dxof/d3dxof.c b/dlls/d3dxof/d3dxof.c index d8aaf62..bbdfe64 100644 --- a/dlls/d3dxof/d3dxof.c +++ b/dlls/d3dxof/d3dxof.c @@ -51,7 +51,7 @@ HRESULT IDirectXFileImpl_Create(IUnknown* pUnkOuter, LPVOID* ppObj) IDirectXFileImpl* object; TRACE("(%p,%p)\n", pUnkOuter, ppObj); - + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectXFileImpl)); if (!object) { @@ -96,7 +96,7 @@ static ULONG WINAPI IDirectXFileImpl_AddRef(IDirectXFile* iface) IDirectXFileImpl *This = impl_from_IDirectXFile(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p/%p): AddRef from %d\n", iface, This, ref - 1); + TRACE("(%p/%p)->(): new ref %d\n", iface, This, ref); return ref; } @@ -106,7 +106,7 @@ static ULONG WINAPI IDirectXFileImpl_Release(IDirectXFile* iface) IDirectXFileImpl *This = impl_from_IDirectXFile(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p/%p): ReleaseRef to %d\n", iface, This, ref); + TRACE("(%p/%p)->(): new ref %d\n", iface, This, ref); if (!ref) HeapFree(GetProcessHeap(), 0, This); @@ -403,7 +403,7 @@ static ULONG WINAPI IDirectXFileBinaryImpl_AddRef(IDirectXFileBinary* iface) IDirectXFileBinaryImpl *This = impl_from_IDirectXFileBinary(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p/%p): AddRef from %d\n", iface, This, ref - 1); + TRACE("(%p/%p)->(): new ref %d\n", iface, This, ref); return ref; } @@ -413,7 +413,7 @@ static ULONG WINAPI IDirectXFileBinaryImpl_Release(IDirectXFileBinary* iface) IDirectXFileBinaryImpl *This = impl_from_IDirectXFileBinary(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p/%p): ReleaseRef to %d\n", iface, This, ref); + TRACE("(%p/%p)->(): new ref %d\n", iface, This, ref); if (!ref) HeapFree(GetProcessHeap(), 0, This); @@ -427,7 +427,7 @@ static HRESULT WINAPI IDirectXFileBinaryImpl_GetName(IDirectXFileBinary* iface, { IDirectXFileBinaryImpl *This = impl_from_IDirectXFileBinary(iface); - FIXME("(%p/%p)->(%p,%p) stub!\n", This, iface, pstrNameBuf, pdwBufLen); + FIXME("(%p/%p)->(%p,%p) stub!\n", This, iface, pstrNameBuf, pdwBufLen); return DXFILEERR_BADVALUE; } @@ -486,7 +486,7 @@ static HRESULT IDirectXFileDataImpl_Create(IDirectXFileDataImpl** ppObj) IDirectXFileDataImpl* object; TRACE("(%p)\n", ppObj); - + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectXFileDataImpl)); if (!object) { @@ -498,7 +498,7 @@ static HRESULT IDirectXFileDataImpl_Create(IDirectXFileDataImpl** ppObj) object->ref = 1; *ppObj = object; - + return S_OK; } @@ -536,7 +536,7 @@ static ULONG WINAPI IDirectXFileDataImpl_AddRef(IDirectXFileData* iface) IDirectXFileDataImpl *This = impl_from_IDirectXFileData(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p/%p): AddRef from %d\n", iface, This, ref - 1); + TRACE("(%p/%p)->(): new ref %d\n", iface, This, ref); return ref; } @@ -546,7 +546,7 @@ static ULONG WINAPI IDirectXFileDataImpl_Release(IDirectXFileData* iface) IDirectXFileDataImpl *This = impl_from_IDirectXFileData(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p/%p): ReleaseRef to %d\n", iface, This, ref); + TRACE("(%p/%p)->(): new ref %d\n", iface, This, ref); if (!ref) { @@ -761,7 +761,7 @@ static HRESULT IDirectXFileDataReferenceImpl_Create(IDirectXFileDataReferenceImp IDirectXFileDataReferenceImpl* object; TRACE("(%p)\n", ppObj); - + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectXFileDataReferenceImpl)); if (!object) { @@ -773,7 +773,7 @@ static HRESULT IDirectXFileDataReferenceImpl_Create(IDirectXFileDataReferenceImp object->ref = 1; *ppObj = object; - + return S_OK; } @@ -811,7 +811,7 @@ static ULONG WINAPI IDirectXFileDataReferenceImpl_AddRef(IDirectXFileDataReferen IDirectXFileDataReferenceImpl *This = impl_from_IDirectXFileDataReference(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p/%p): AddRef from %d\n", iface, This, ref - 1); + TRACE("(%p/%p)->(): new ref %d\n", iface, This, ref); return ref; } @@ -821,7 +821,7 @@ static ULONG WINAPI IDirectXFileDataReferenceImpl_Release(IDirectXFileDataRefere IDirectXFileDataReferenceImpl *This = impl_from_IDirectXFileDataReference(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p/%p): ReleaseRef to %d\n", iface, This, ref); + TRACE("(%p/%p)->(): new ref %d\n", iface, This, ref); if (!ref) HeapFree(GetProcessHeap(), 0, This); @@ -909,7 +909,7 @@ static HRESULT IDirectXFileEnumObjectImpl_Create(IDirectXFileEnumObjectImpl** pp IDirectXFileEnumObjectImpl* object; TRACE("(%p)\n", ppObj); - + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectXFileEnumObjectImpl)); if (!object) { @@ -921,7 +921,7 @@ static HRESULT IDirectXFileEnumObjectImpl_Create(IDirectXFileEnumObjectImpl** pp object->ref = 1; *ppObj = object; - + return S_OK; } @@ -954,7 +954,7 @@ static ULONG WINAPI IDirectXFileEnumObjectImpl_AddRef(IDirectXFileEnumObject* if IDirectXFileEnumObjectImpl *This = impl_from_IDirectXFileEnumObject(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p/%p): AddRef from %d\n", iface, This, ref - 1); + TRACE("(%p/%p)->(): new ref %d\n", iface, This, ref); return ref; } @@ -964,7 +964,7 @@ static ULONG WINAPI IDirectXFileEnumObjectImpl_Release(IDirectXFileEnumObject* i IDirectXFileEnumObjectImpl *This = impl_from_IDirectXFileEnumObject(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p/%p): ReleaseRef to %d\n", iface, This, ref); + TRACE("(%p/%p)->(): new ref %d\n", iface, This, ref); if (!ref) { @@ -1070,7 +1070,7 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetDataObjectById(IDirectXFileE { IDirectXFileEnumObjectImpl *This = impl_from_IDirectXFileEnumObject(iface); - FIXME("(%p/%p)->(%p,%p) stub!\n", This, iface, rguid, ppDataObj); + FIXME("(%p/%p)->(%p,%p) stub!\n", This, iface, rguid, ppDataObj); return DXFILEERR_BADVALUE; } @@ -1079,7 +1079,7 @@ static HRESULT WINAPI IDirectXFileEnumObjectImpl_GetDataObjectByName(IDirectXFil { IDirectXFileEnumObjectImpl *This = impl_from_IDirectXFileEnumObject(iface); - FIXME("(%p/%p)->(%s,%p) stub!\n", This, iface, szName, ppDataObj); + FIXME("(%p/%p)->(%s,%p) stub!\n", This, iface, szName, ppDataObj); return DXFILEERR_BADVALUE; } @@ -1144,7 +1144,7 @@ static ULONG WINAPI IDirectXFileSaveObjectImpl_AddRef(IDirectXFileSaveObject* if IDirectXFileSaveObjectImpl *This = impl_from_IDirectXFileSaveObject(iface); ULONG ref = InterlockedIncrement(&This->ref); - TRACE("(%p/%p): AddRef from %d\n", iface, This, ref - 1); + TRACE("(%p/%p)->(): new ref %d\n", iface, This, ref); return ref; } @@ -1154,7 +1154,7 @@ static ULONG WINAPI IDirectXFileSaveObjectImpl_Release(IDirectXFileSaveObject* i IDirectXFileSaveObjectImpl *This = impl_from_IDirectXFileSaveObject(iface); ULONG ref = InterlockedDecrement(&This->ref); - TRACE("(%p/%p): ReleaseRef to %d\n", iface, This, ref); + TRACE("(%p/%p)->(): new ref %d\n", iface, This, ref); if (!ref) HeapFree(GetProcessHeap(), 0, This);

1 0

Dmitry Timoshkov : gdiplus: Fix a typo leading to incorrect character width calculation in GdipMeasureDriverString .
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: a45da55922388dbe04e90b8eb3b9978266a9911b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a45da55922388dbe04e90b8eb… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Oct 22 17:50:15 2012 +0900 gdiplus: Fix a typo leading to incorrect character width calculation in GdipMeasureDriverString. --- dlls/gdiplus/graphics.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index d975d3c..b2ebf40 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -6345,7 +6345,7 @@ GpStatus WINGDIPAPI GdipMeasureDriverString(GpGraphics *graphics, GDIPCONST UINT } GetCharABCWidthsW(hdc, glyph_indices[i], glyph_indices[i], &abc); - char_width = abc.abcA + abc.abcB + abc.abcB; + char_width = abc.abcA + abc.abcB + abc.abcC; if (min_y > y - ascent) min_y = y - ascent; if (max_y < y + descent) max_y = y + descent;

1 0

Hans Leidekker : winhttp: Respect the redirect policy setting.
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: d48808121490b61613ee9fa3c5914d4c3a1160c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d48808121490b61613ee9fa3c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 22 10:25:05 2012 +0200 winhttp: Respect the redirect policy setting. --- dlls/winhttp/request.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index 8109290..7c0d3ab 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1876,7 +1876,8 @@ static BOOL receive_response( request_t *request, BOOL async ) if (status == HTTP_STATUS_MOVED || status == HTTP_STATUS_REDIRECT || status == HTTP_STATUS_REDIRECT_KEEP_VERB) { - if (request->hdr.disable_flags & WINHTTP_DISABLE_REDIRECTS) break; + if (request->hdr.disable_flags & WINHTTP_DISABLE_REDIRECTS || + request->hdr.redirect_policy == WINHTTP_OPTION_REDIRECT_POLICY_NEVER) break; drain_content( request ); if (!(ret = handle_redirect( request, status ))) break;

1 0

Hans Leidekker : winhttp: Pass the redirect policy setting down to request objects.
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: b59efd66e86a45f3e27e1240623f6b469ba1f298 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b59efd66e86a45f3e27e12406… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Oct 22 10:24:50 2012 +0200 winhttp: Pass the redirect policy setting down to request objects. --- dlls/winhttp/session.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 0349ba7..8ffcda1 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -509,6 +509,7 @@ HINTERNET WINAPI WinHttpConnect( HINTERNET hsession, LPCWSTR server, INTERNET_PO connect->hdr.callback = session->hdr.callback; connect->hdr.notify_mask = session->hdr.notify_mask; connect->hdr.context = session->hdr.context; + connect->hdr.redirect_policy = session->hdr.redirect_policy; list_init( &connect->hdr.children ); addref_object( &session->hdr ); @@ -948,6 +949,7 @@ HINTERNET WINAPI WinHttpOpenRequest( HINTERNET hconnect, LPCWSTR verb, LPCWSTR o request->hdr.callback = connect->hdr.callback; request->hdr.notify_mask = connect->hdr.notify_mask; request->hdr.context = connect->hdr.context; + request->hdr.redirect_policy = connect->hdr.redirect_policy; list_init( &request->hdr.children ); addref_object( &connect->hdr );

1 0

Henri Verbeet : user32: Implement GetRawInputDeviceInfoA().
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: 690df8198deaf62bfc2441bf75c33970ea9b06b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=690df8198deaf62bfc2441bf7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 21 20:20:40 2012 +0200 user32: Implement GetRawInputDeviceInfoA(). --- dlls/user32/input.c | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 9fdc124..b21c674 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -606,11 +606,17 @@ UINT WINAPI DECLSPEC_HOTPATCH GetRawInputBuffer(PRAWINPUT pData, PUINT pcbSize, /****************************************************************** * GetRawInputDeviceInfoA (USER32.@) */ -UINT WINAPI GetRawInputDeviceInfoA(HANDLE hDevice, UINT uiCommand, LPVOID pData, PUINT pcbSize) +UINT WINAPI GetRawInputDeviceInfoA(HANDLE device, UINT command, void *data, UINT *data_size) { - FIXME("(hDevice=%p, uiCommand=%d, pData=%p, pcbSize=%p) stub!\n", hDevice, uiCommand, pData, pcbSize); + UINT ret; - return 0; + TRACE("device %p, command %u, data %p, data_size %p.\n", device, command, data, data_size); + + ret = GetRawInputDeviceInfoW(device, command, data, data_size); + if (command == RIDI_DEVICENAME && ret && ret != ~0U) + ret = WideCharToMultiByte(CP_ACP, 0, data, -1, data, *data_size, NULL, NULL); + + return ret; }

1 0

Henri Verbeet : wined3d: Implement WINED3DSIH_MOVC in the GLSL shader backend.
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: c490fb37cf380b236b7adeece3fc21ddf532388f URL: http://source.winehq.org/git/wine.git/?a=commit;h=c490fb37cf380b236b7adeece… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 21 20:20:39 2012 +0200 wined3d: Implement WINED3DSIH_MOVC in the GLSL shader backend. --- dlls/wined3d/glsl_shader.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0e34874..7b51dcd 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2756,12 +2756,12 @@ static void shader_glsl_compare(const struct wined3d_shader_instruction *ins) static void shader_glsl_conditional_move(const struct wined3d_shader_instruction *ins) { + const char *condition_prefix, *condition_suffix; struct wined3d_shader_dst_param dst; struct glsl_src_param src0_param; struct glsl_src_param src1_param; struct glsl_src_param src2_param; BOOL temp_destination = FALSE; - const char *condition_suffix; DWORD cmp_channel = 0; unsigned int i, j; char mask_char[6]; @@ -2770,15 +2770,23 @@ static void shader_glsl_conditional_move(const struct wined3d_shader_instruction switch (ins->handler_idx) { case WINED3DSIH_CMP: + condition_prefix = ""; condition_suffix = " >= 0.0"; break; case WINED3DSIH_CND: + condition_prefix = ""; condition_suffix = " > 0.5"; break; + case WINED3DSIH_MOVC: + condition_prefix = "bool("; + condition_suffix = ")"; + break; + default: FIXME("Unhandled instruction %#x.\n", ins->handler_idx); + condition_prefix = "<unhandled prefix>"; condition_suffix = "<unhandled suffix>"; break; } @@ -2790,8 +2798,8 @@ static void shader_glsl_conditional_move(const struct wined3d_shader_instruction shader_glsl_add_src_param(ins, &ins->src[1], write_mask, &src1_param); shader_glsl_add_src_param(ins, &ins->src[2], write_mask, &src2_param); - shader_addline(ins->ctx->buffer, "%s%s ? %s : %s);\n", - src0_param.param_str, condition_suffix, + shader_addline(ins->ctx->buffer, "%s%s%s ? %s : %s);\n", + condition_prefix, src0_param.param_str, condition_suffix, src1_param.param_str, src2_param.param_str); return; } @@ -2837,8 +2845,8 @@ static void shader_glsl_conditional_move(const struct wined3d_shader_instruction shader_glsl_add_src_param(ins, &ins->src[1], write_mask, &src1_param); shader_glsl_add_src_param(ins, &ins->src[2], write_mask, &src2_param); - shader_addline(ins->ctx->buffer, "%s%s ? %s : %s);\n", - src0_param.param_str, condition_suffix, + shader_addline(ins->ctx->buffer, "%s%s%s ? %s : %s);\n", + condition_prefix, src0_param.param_str, condition_suffix, src1_param.param_str, src2_param.param_str); } @@ -5415,7 +5423,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_MIN */ shader_glsl_map2gl, /* WINED3DSIH_MOV */ shader_glsl_mov, /* WINED3DSIH_MOVA */ shader_glsl_mov, - /* WINED3DSIH_MOVC */ NULL, + /* WINED3DSIH_MOVC */ shader_glsl_conditional_move, /* WINED3DSIH_MUL */ shader_glsl_binop, /* WINED3DSIH_NOP */ shader_glsl_nop, /* WINED3DSIH_NRM */ shader_glsl_nrm,

1 0

Henri Verbeet : wined3d: Merge a couple of shader type specific blocks in shader_generate_glsl_declarations ().
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: 7a437c29f3943b608eaaa81039437a38c37eb511 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a437c29f3943b608eaaa8103… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 21 20:20:38 2012 +0200 wined3d: Merge a couple of shader type specific blocks in shader_generate_glsl_declarations(). --- dlls/wined3d/glsl_shader.c | 144 ++++++++++++++++++++++---------------------- 1 files changed, 71 insertions(+), 73 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ef54f93..0e34874 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1000,58 +1000,6 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont shader_addline(buffer, "uniform vec4 %s_cb%u[%u];\n", prefix, i, reg_maps->cb_sizes[i]); } - if (!pshader) - { - shader_addline(buffer, "uniform vec4 posFixup;\n"); - shader_addline(buffer, "void order_ps_input(in vec4[%u]);\n", shader->limits.packed_output); - } - else - { - for (i = 0, map = reg_maps->bumpmat; map; map >>= 1, ++i) - { - if (!(map & 1)) continue; - - shader_addline(buffer, "uniform mat2 bumpenvmat%d;\n", i); - - if (reg_maps->luminanceparams & (1 << i)) - { - shader_addline(buffer, "uniform float luminancescale%d;\n", i); - shader_addline(buffer, "uniform float luminanceoffset%d;\n", i); - extra_constants_needed++; - } - - extra_constants_needed++; - } - - if (ps_args->srgb_correction) - { - shader_addline(buffer, "const vec4 srgb_const0 = vec4(%.8e, %.8e, %.8e, %.8e);\n", - srgb_pow, srgb_mul_high, srgb_sub_high, srgb_mul_low); - shader_addline(buffer, "const vec4 srgb_const1 = vec4(%.8e, 0.0, 0.0, 0.0);\n", - srgb_cmp); - } - if (reg_maps->vpos || reg_maps->usesdsy) - { - if (shader->limits.constant_float + extra_constants_needed - + 1 < gl_info->limits.glsl_ps_float_constants) - { - shader_addline(buffer, "uniform vec4 ycorrection;\n"); - extra_constants_needed++; - } - else - { - /* This happens because we do not have proper tracking of the constant registers that are - * actually used, only the max limit of the shader version - */ - FIXME("Cannot find a free uniform for vpos correction params\n"); - shader_addline(buffer, "const vec4 ycorrection = vec4(%f, %f, 0.0, 0.0);\n", - context->render_offscreen ? 0.0f : fb->render_targets[0]->resource.height, - context->render_offscreen ? 1.0f : -1.0f); - } - shader_addline(buffer, "vec4 vpos;\n"); - } - } - /* Declare texture samplers */ for (i = 0; i < shader->limits.sampler; ++i) { @@ -1145,20 +1093,79 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont if (map & 1) shader_addline(buffer, "vec4 T%u = gl_TexCoord[%u];\n", i, i); } - /* Declare input register varyings. Only pixel shader, vertex shaders have that declared in the - * helper function shader that is linked in at link time - */ - if (pshader && reg_maps->shader_version.major >= 3) + if (!pshader) { - UINT in_count = min(vec4_varyings(reg_maps->shader_version.major, gl_info), shader->limits.packed_input); + /* Declare attributes. */ + for (i = 0, map = reg_maps->input_registers; map; map >>= 1, ++i) + { + if (map & 1) + shader_addline(buffer, "attribute vec4 %s_in%u;\n", prefix, i); + } - if (use_vs(state)) - shader_addline(buffer, "varying vec4 %s_in[%u];\n", prefix, in_count); - else - /* TODO: Write a replacement shader for the fixed function vertex pipeline, so this isn't needed. - * For fixed function vertex processing + 3.0 pixel shader we need a separate function in the - * pixel shader that reads the fixed function color into the packed input registers. */ - shader_addline(buffer, "vec4 %s_in[%u];\n", prefix, in_count); + shader_addline(buffer, "uniform vec4 posFixup;\n"); + shader_addline(buffer, "void order_ps_input(in vec4[%u]);\n", shader->limits.packed_output); + } + else + { + if (reg_maps->shader_version.major >= 3) + { + UINT in_count = min(vec4_varyings(reg_maps->shader_version.major, gl_info), shader->limits.packed_input); + + if (use_vs(state)) + shader_addline(buffer, "varying vec4 %s_in[%u];\n", prefix, in_count); + else + /* TODO: Write a replacement shader for the fixed function + * vertex pipeline, so this isn't needed. For fixed function + * vertex processing + 3.0 pixel shader we need a separate + * function in the pixel shader that reads the fixed function + * color into the packed input registers. */ + shader_addline(buffer, "vec4 %s_in[%u];\n", prefix, in_count); + } + + for (i = 0, map = reg_maps->bumpmat; map; map >>= 1, ++i) + { + if (!(map & 1)) + continue; + + shader_addline(buffer, "uniform mat2 bumpenvmat%d;\n", i); + + if (reg_maps->luminanceparams & (1 << i)) + { + shader_addline(buffer, "uniform float luminancescale%d;\n", i); + shader_addline(buffer, "uniform float luminanceoffset%d;\n", i); + extra_constants_needed++; + } + + extra_constants_needed++; + } + + if (ps_args->srgb_correction) + { + shader_addline(buffer, "const vec4 srgb_const0 = vec4(%.8e, %.8e, %.8e, %.8e);\n", + srgb_pow, srgb_mul_high, srgb_sub_high, srgb_mul_low); + shader_addline(buffer, "const vec4 srgb_const1 = vec4(%.8e, 0.0, 0.0, 0.0);\n", + srgb_cmp); + } + if (reg_maps->vpos || reg_maps->usesdsy) + { + if (shader->limits.constant_float + extra_constants_needed + + 1 < gl_info->limits.glsl_ps_float_constants) + { + shader_addline(buffer, "uniform vec4 ycorrection;\n"); + extra_constants_needed++; + } + else + { + /* This happens because we do not have proper tracking of the constant registers that are + * actually used, only the max limit of the shader version + */ + FIXME("Cannot find a free uniform for vpos correction params\n"); + shader_addline(buffer, "const vec4 ycorrection = vec4(%f, %f, 0.0, 0.0);\n", + context->render_offscreen ? 0.0f : fb->render_targets[0]->resource.height, + context->render_offscreen ? 1.0f : -1.0f); + } + shader_addline(buffer, "vec4 vpos;\n"); + } } /* Declare output register temporaries */ @@ -1171,15 +1178,6 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont if (map & 1) shader_addline(buffer, "vec4 R%u;\n", i); } - /* Declare attributes */ - if (reg_maps->shader_version.type == WINED3D_SHADER_TYPE_VERTEX) - { - for (i = 0, map = reg_maps->input_registers; map; map >>= 1, ++i) - { - if (map & 1) shader_addline(buffer, "attribute vec4 %s_in%u;\n", prefix, i); - } - } - /* Declare loop registers aLx */ if (reg_maps->shader_version.major < 4) {

1 0

Henri Verbeet : wined3d: Use shader_glsl_get_prefix() in shader_glsl_gen_sample_code().
by Alexandre Julliard 22 Oct '12

22 Oct '12

Module: wine Branch: master Commit: b96b4c63ee06363c9fafbc4c0b060a408a462e1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=b96b4c63ee06363c9fafbc4c0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Oct 21 20:20:37 2012 +0200 wined3d: Use shader_glsl_get_prefix() in shader_glsl_gen_sample_code(). --- dlls/wined3d/glsl_shader.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9ce89b3..ef54f93 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2141,7 +2141,6 @@ static void PRINTF_ATTR(8, 9) shader_glsl_gen_sample_code(const struct wined3d_s const char *dx, const char *dy, const char *bias, const char *coord_reg_fmt, ...) { const struct wined3d_shader_version *version = &ins->ctx->reg_maps->shader_version; - const char *sampler_base; char dst_swizzle[6]; struct color_fixup_desc fixup; BOOL np2_fixup = FALSE; @@ -2153,7 +2152,6 @@ static void PRINTF_ATTR(8, 9) shader_glsl_gen_sample_code(const struct wined3d_s { const struct shader_glsl_ctx_priv *priv = ins->ctx->backend_data; fixup = priv->cur_ps_args->color_fixup[sampler]; - sampler_base = "ps_sampler"; if(priv->cur_ps_args->np2_fixup & (1 << sampler)) { if(bias) { @@ -2165,13 +2163,13 @@ static void PRINTF_ATTR(8, 9) shader_glsl_gen_sample_code(const struct wined3d_s } else { - sampler_base = "vs_sampler"; fixup = COLOR_FIXUP_IDENTITY; /* FIXME: Vshader color fixup */ } shader_glsl_append_dst(ins->ctx->buffer, ins); - shader_addline(ins->ctx->buffer, "%s(%s%u, ", sample_function->name, sampler_base, sampler); + shader_addline(ins->ctx->buffer, "%s(%s_sampler%u, ", + sample_function->name, shader_glsl_get_prefix(version->type), sampler); va_start(args, coord_reg_fmt); shader_vaddline(ins->ctx->buffer, coord_reg_fmt, args);

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2012