wine-commits January 2013

wine-commits@winehq.org

2 participants
736 discussions

Stefan Dösinger : ddraw: Implement DrawPrimitiveStrided with regular draws.
by Alexandre Julliard 25 Jan '13

25 Jan '13

Module: wine Branch: master Commit: 7e62acc62e3d5f0e6fd199caab34b26f35b2326d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e62acc62e3d5f0e6fd199caa… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 24 00:39:10 2013 +0100 ddraw: Implement DrawPrimitiveStrided with regular draws. --- dlls/ddraw/device.c | 142 ++++++++++++++++++++++++++++++--------------------- 1 files changed, 83 insertions(+), 59 deletions(-) diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 76bdcff..faf7146 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -3806,82 +3806,106 @@ static HRESULT WINAPI d3d_device2_GetClipStatus(IDirect3DDevice2 *iface, D3DCLIP * (For details, see IWineD3DDevice::DrawPrimitiveStrided) * *****************************************************************************/ -static HRESULT d3d_device7_DrawPrimitiveStrided(IDirect3DDevice7 *iface, D3DPRIMITIVETYPE PrimitiveType, - DWORD VertexType, D3DDRAWPRIMITIVESTRIDEDDATA *D3DDrawPrimStrideData, DWORD VertexCount, DWORD Flags) +static void pack_strided_data(BYTE *dst, DWORD count, const D3DDRAWPRIMITIVESTRIDEDDATA *src, DWORD fvf) { - struct d3d_device *device = impl_from_IDirect3DDevice7(iface); - struct wined3d_strided_data wined3d_strided; - DWORD i; - HRESULT hr; + DWORD i, tex, offset; - TRACE("iface %p, primitive_type %#x, FVF %#x, strided_data %p, vertex_count %u, flags %#x.\n", - iface, PrimitiveType, VertexType, D3DDrawPrimStrideData, VertexCount, Flags); - - memset(&wined3d_strided, 0, sizeof(wined3d_strided)); - /* Get the strided data right. the wined3d structure is a bit bigger - * Watch out: The contents of the strided data are determined by the fvf, - * not by the members set in D3DDrawPrimStrideData. So it's valid - * to have diffuse.lpvData set to 0xdeadbeef if the diffuse flag is - * not set in the fvf. - */ - if(VertexType & D3DFVF_POSITION_MASK) + for (i = 0; i < count; i++) { - wined3d_strided.position.format = WINED3DFMT_R32G32B32_FLOAT; - wined3d_strided.position.data = D3DDrawPrimStrideData->position.lpvData; - wined3d_strided.position.stride = D3DDrawPrimStrideData->position.dwStride; - if (VertexType & D3DFVF_XYZRHW) + /* The contents of the strided data are determined by the fvf, + * not by the members set in src. So it's valid + * to have diffuse.lpvData set to 0xdeadbeef if the diffuse flag is + * not set in the fvf. */ + if (fvf & D3DFVF_POSITION_MASK) { - wined3d_strided.position.format = WINED3DFMT_R32G32B32A32_FLOAT; - wined3d_strided.position_transformed = TRUE; + offset = i * src->position.dwStride; + if (fvf & D3DFVF_XYZRHW) + { + memcpy(dst, ((BYTE *)src->position.lpvData) + offset, 4 * sizeof(float)); + dst += 4 * sizeof(float); + } + else + { + memcpy(dst, ((BYTE *)src->position.lpvData) + offset, 3 * sizeof(float)); + dst += 3 * sizeof(float); + } } - else + + if (fvf & D3DFVF_NORMAL) { - wined3d_strided.position_transformed = FALSE; + offset = i * src->normal.dwStride; + memcpy(dst, ((BYTE *)src->normal.lpvData) + offset, 3 * sizeof(float)); + dst += 3 * sizeof(float); } - } - if (VertexType & D3DFVF_NORMAL) - { - wined3d_strided.normal.format = WINED3DFMT_R32G32B32_FLOAT; - wined3d_strided.normal.data = D3DDrawPrimStrideData->normal.lpvData; - wined3d_strided.normal.stride = D3DDrawPrimStrideData->normal.dwStride; - } - - if (VertexType & D3DFVF_DIFFUSE) - { - wined3d_strided.diffuse.format = WINED3DFMT_B8G8R8A8_UNORM; - wined3d_strided.diffuse.data = D3DDrawPrimStrideData->diffuse.lpvData; - wined3d_strided.diffuse.stride = D3DDrawPrimStrideData->diffuse.dwStride; - } + if (fvf & D3DFVF_DIFFUSE) + { + offset = i * src->diffuse.dwStride; + memcpy(dst, ((BYTE *)src->diffuse.lpvData) + offset, sizeof(DWORD)); + dst += sizeof(DWORD); + } - if (VertexType & D3DFVF_SPECULAR) - { - wined3d_strided.specular.format = WINED3DFMT_B8G8R8A8_UNORM; - wined3d_strided.specular.data = D3DDrawPrimStrideData->specular.lpvData; - wined3d_strided.specular.stride = D3DDrawPrimStrideData->specular.dwStride; - } + if (fvf & D3DFVF_SPECULAR) + { + offset = i * src->specular.dwStride; + memcpy(dst, ((BYTE *)src->specular.lpvData) + offset, sizeof(DWORD)); + dst += sizeof(DWORD); + } - for (i = 0; i < GET_TEXCOUNT_FROM_FVF(VertexType); ++i) - { - switch (GET_TEXCOORD_SIZE_FROM_FVF(VertexType, i)) + for (tex = 0; tex < GET_TEXCOUNT_FROM_FVF(fvf); ++tex) { - case 1: wined3d_strided.tex_coords[i].format = WINED3DFMT_R32_FLOAT; break; - case 2: wined3d_strided.tex_coords[i].format = WINED3DFMT_R32G32_FLOAT; break; - case 3: wined3d_strided.tex_coords[i].format = WINED3DFMT_R32G32B32_FLOAT; break; - case 4: wined3d_strided.tex_coords[i].format = WINED3DFMT_R32G32B32A32_FLOAT; break; - default: ERR("Unexpected texture coordinate size %d\n", - GET_TEXCOORD_SIZE_FROM_FVF(VertexType, i)); + DWORD attrib_count = GET_TEXCOORD_SIZE_FROM_FVF(fvf, tex); + offset = i * src->textureCoords[tex].dwStride; + memcpy(dst, ((BYTE *)src->textureCoords[tex].lpvData) + offset, attrib_count * sizeof(float)); + dst += attrib_count * sizeof(float); } - wined3d_strided.tex_coords[i].data = D3DDrawPrimStrideData->textureCoords[i].lpvData; - wined3d_strided.tex_coords[i].stride = D3DDrawPrimStrideData->textureCoords[i].dwStride; } +} + +static HRESULT d3d_device7_DrawPrimitiveStrided(IDirect3DDevice7 *iface, D3DPRIMITIVETYPE PrimitiveType, + DWORD VertexType, D3DDRAWPRIMITIVESTRIDEDDATA *D3DDrawPrimStrideData, DWORD VertexCount, DWORD Flags) +{ + struct d3d_device *device = impl_from_IDirect3DDevice7(iface); + HRESULT hr; + UINT dst_stride = get_flexible_vertex_size(VertexType); + UINT dst_size = dst_stride * VertexCount; + UINT vb_pos, align; + BYTE *dst_data; + + TRACE("iface %p, primitive_type %#x, FVF %#x, strided_data %p, vertex_count %u, flags %#x.\n", + iface, PrimitiveType, VertexType, D3DDrawPrimStrideData, VertexCount, Flags); - /* WineD3D doesn't need the FVF here */ wined3d_mutex_lock(); + hr = d3d_device_prepare_vertex_buffer(device, dst_size); + if (FAILED(hr)) + goto done; + + vb_pos = device->vertex_buffer_pos; + align = vb_pos % dst_stride; + if (align) align = dst_stride - align; + if (vb_pos + dst_size + align > device->vertex_buffer_size) + vb_pos = 0; + else + vb_pos += align; + + hr = wined3d_buffer_map(device->vertex_buffer, vb_pos, dst_size, &dst_data, + vb_pos ? WINED3D_MAP_NOOVERWRITE : WINED3D_MAP_DISCARD); + if (FAILED(hr)) + goto done; + pack_strided_data(dst_data, VertexCount, D3DDrawPrimStrideData, VertexType); + wined3d_buffer_unmap(device->vertex_buffer); + device->vertex_buffer_pos = vb_pos + dst_size; + + hr = wined3d_device_set_stream_source(device->wined3d_device, 0, device->vertex_buffer, 0, dst_stride); + if (FAILED(hr)) + goto done; + wined3d_device_set_vertex_declaration(device->wined3d_device, ddraw_find_decl(device->ddraw, VertexType)); + wined3d_device_set_primitive_type(device->wined3d_device, PrimitiveType); - hr = wined3d_device_draw_primitive_strided(device->wined3d_device, VertexCount, &wined3d_strided); - wined3d_mutex_unlock(); + hr = wined3d_device_draw_primitive(device->wined3d_device, vb_pos / dst_stride, VertexCount); +done: + wined3d_mutex_unlock(); return hr; }

1 0

Piotr Caban : msvcp: Sync implementations.
by Alexandre Julliard 25 Jan '13

25 Jan '13

Module: wine Branch: master Commit: c6f4152ddb8263f3edfe98c279aa7f4e88ae688a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6f4152ddb8263f3edfe98c27… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 25 10:38:07 2013 +0100 msvcp: Sync implementations. --- dlls/msvcp60/msvcp60.spec | 228 ++++++++++---------- dlls/msvcp71/math.c | 525 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp71/msvcp71.spec | 300 +++++++++++++------------- dlls/msvcp80/msvcp80.spec | 300 +++++++++++++------------- 4 files changed, 939 insertions(+), 414 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c6f4152ddb8263f3edfe9…

1 0

Piotr Caban : msvcp90: Added std::sqrt(complex) tests.
by Alexandre Julliard 25 Jan '13

25 Jan '13

Module: wine Branch: master Commit: 67a2fb01ce87a680c1c913efa46739fa1600074d URL: http://source.winehq.org/git/wine.git/?a=commit;h=67a2fb01ce87a680c1c913efa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 25 10:37:53 2013 +0100 msvcp90: Added std::sqrt(complex) tests. --- dlls/msvcp90/tests/misc.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index 9e456f8..dc099d3 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -115,6 +115,7 @@ static float (__cdecl *p_complex_float__Fabs)(const complex_float*, int*); static complex_float* (__cdecl *p_complex_float_tan)(complex_float*, const complex_float*); static complex_float* (__cdecl *p_complex_float_tanh)(complex_float*, const complex_float*); static complex_float* (__cdecl *p_complex_float_log10)(complex_float*, const complex_float*); +static complex_float* (__cdecl *p_complex_float_sqrt)(complex_float*, const complex_float*); static int invalid_parameter = 0; static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, @@ -261,6 +262,8 @@ static BOOL init(void) "??$tanh@M@std@@YA?AV?$complex@M@0@AEBV10@@Z"); SET(p_complex_float_log10, "??$log10@M@std@@YA?AV?$complex@M@0@AEBV10@@Z"); + SET(p_complex_float_sqrt, + "??$sqrt@M@std@@YA?AV?$complex@M@0@AEBV10@@Z"); } else { SET(p_char_assign, "?assign@?$char_traits@D@std@@SAXAADABD@Z"); SET(p_wchar_assign, "?assign@?$char_traits@_W@std@@SAXAA_WAB_W@Z"); @@ -313,6 +316,8 @@ static BOOL init(void) "??$tanh@M@std@@YA?AV?$complex@M@0@ABV10@@Z"); SET(p_complex_float_log10, "??$log10@M@std@@YA?AV?$complex@M@0@ABV10@@Z"); + SET(p_complex_float_sqrt, + "??$sqrt@M@std@@YA?AV?$complex@M@0@ABV10@@Z"); } init_thiscall_thunk(); @@ -732,6 +737,9 @@ static void test_complex(void) p_complex_float_log10(&c2, &c1); ok(c2.real < -FLT_MAX /* c2.real == -inf */, "c2.real = %f\n", c2.real); ok(c2.imag == 0, "c2.imag = %g\n", c2.imag); + p_complex_float_sqrt(&c2, &c1); + ok(c2.real == 0, "c2.real = %f\n", c2.real); + ok(c2.imag == 0, "c2.imag = %f\n", c2.imag); c1.real = 3.14159/2; c1.imag = 0; @@ -744,6 +752,9 @@ static void test_complex(void) p_complex_float_log10(&c2, &c1); ok(almost_eq(c2.real, 0.196120), "c2.real = %f\n", c2.real); ok(c2.imag == 0, "c2.imag = %g\n", c2.imag); + p_complex_float_sqrt(&c2, &c1); + ok(almost_eq(c2.real, 1.253314), "c2.real = %f\n", c2.real); + ok(c2.imag == 0, "c2.imag = %g\n", c2.imag); c1.real = 7.12; c1.imag = 0.17; @@ -756,6 +767,9 @@ static void test_complex(void) p_complex_float_log10(&c2, &c1); ok(almost_eq(c2.real, 0.852604), "c2.real = %f\n", c2.real); ok(almost_eq(c2.imag, 0.0103674), "c2.imag = %g\n", c2.imag); + p_complex_float_sqrt(&c2, &c1); + ok(almost_eq(c2.real, 2.668523), "c2.real = %f\n", c2.real); + ok(almost_eq(c2.imag, 0.0318528), "c2.imag = %g\n", c2.imag); c1.real = 0.14; c1.imag = 0.19; @@ -768,6 +782,9 @@ static void test_complex(void) p_complex_float_log10(&c2, &c1); ok(almost_eq(c2.real, -0.627072), "c2.real = %f\n", c2.real); ok(almost_eq(c2.imag, 0.4064), "c2.imag = %g\n", c2.imag); + p_complex_float_sqrt(&c2, &c1); + ok(almost_eq(c2.real, 0.433595), "c2.real = %f\n", c2.real); + ok(almost_eq(c2.imag, 0.219099), "c2.imag = %g\n", c2.imag); } START_TEST(misc)

1 0

Piotr Caban : msvcp90: Added std::pow(complex) and std::sqrt(complex) implementation.
by Alexandre Julliard 25 Jan '13

25 Jan '13

Module: wine Branch: master Commit: 68f538faaa7b276e2e0a6f285cbfad561bd4c13e URL: http://source.winehq.org/git/wine.git/?a=commit;h=68f538faaa7b276e2e0a6f285… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 25 10:37:39 2013 +0100 msvcp90: Added std::pow(complex) and std::sqrt(complex) implementation. --- dlls/msvcp90/math.c | 90 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 48 ++++++++++++------------ 2 files changed, 114 insertions(+), 24 deletions(-) diff --git a/dlls/msvcp90/math.c b/dlls/msvcp90/math.c index 7cd605a..e049d69 100644 --- a/dlls/msvcp90/math.c +++ b/dlls/msvcp90/math.c @@ -1427,6 +1427,47 @@ complex_float* __cdecl complex_float_polar(complex_float *ret, const float *mod) return ret; } +/* ??$pow@M@std@@YA?AV?$complex@M@0@ABV10@0@Z */ +/* ??$pow@M@std@@YA?AV?$complex@M@0@AEBV10@0@Z */ +complex_float* __cdecl complex_float_pow(complex_float *ret, const complex_float *l, const complex_float *r) +{ + float abs = complex_float_abs(l), arg = complex_float_arg(l); + float rad = pow(abs, r->real), theta = r->real*arg; + + if(r->imag) { + rad *= exp(-r->imag * arg); + theta += r->imag * log(abs); + } + + ret->real = rad * cos(theta); + ret->imag = rad * sin(theta); + return ret; +} + +/* ??$pow@M@std@@YA?AV?$complex@M@0@ABMABV10@@Z */ +/* ??$pow@M@std@@YA?AV?$complex@M@0@AEBMAEBV10@@Z */ +complex_float* __cdecl complex_float_pow_fc(complex_float *ret, const float *l, const complex_float *r) +{ + complex_float c = { *l, 0 }; + return complex_float_pow(ret, &c, r); +} + +/* ??$pow@M@std@@YA?AV?$complex@M@0@ABV10@ABM@Z */ +/* ??$pow@M@std@@YA?AV?$complex@M@0@AEBV10@AEBM@Z */ +complex_float* __cdecl complex_float_pow_cf(complex_float *ret, const complex_float *l, const float *r) +{ + complex_float c = { *r, 0 }; + return complex_float_pow(ret, l, &c); +} + +/* ??$sqrt@M@std@@YA?AV?$complex@M@0@ABV10@@Z */ +/* ??$sqrt@M@std@@YA?AV?$complex@M@0@AEBV10@@Z */ +complex_float* __cdecl complex_float_sqrt(complex_float *ret, const complex_float *l) +{ + complex_float c = { 0.5, 0 }; + return complex_float_pow(ret, l, &c); +} + /* ??0?$_Complex_base@NU_C_double_complex@@@std@@QAE@ABN0@Z */ /* ??0?$_Complex_base@NU_C_double_complex@@@std@@QEAA@AEBN0@Z */ /* ??0?$_Complex_base@OU_C_ldouble_complex@@@std@@QAE@ABO0@Z */ @@ -2073,3 +2114,52 @@ complex_double* __cdecl complex_double_polar(complex_double *ret, const double * ret->imag = 0; return ret; } + +/* ??$pow@N@std@@YA?AV?$complex@N@0@ABV10@0@Z */ +/* ??$pow@N@std@@YA?AV?$complex@N@0@AEBV10@0@Z */ +/* ??$pow@O@std@@YA?AV?$complex@O@0@ABV10@0@Z */ +/* ??$pow@O@std@@YA?AV?$complex@O@0@AEBV10@0@Z */ +complex_double* __cdecl complex_double_pow(complex_double *ret, const complex_double *l, const complex_double *r) +{ + double abs = complex_double_abs(l), arg = complex_double_arg(l); + double rad = pow(abs, r->real), theta = r->real*arg; + + if(r->imag) { + rad *= exp(-r->imag * arg); + theta += r->imag * log(abs); + } + + ret->real = rad * cos(theta); + ret->imag = rad * sin(theta); + return ret; +} + +/* ??$pow@N@std@@YA?AV?$complex@N@0@ABNABV10@@Z */ +/* ??$pow@N@std@@YA?AV?$complex@N@0@AEBNAEBV10@@Z */ +/* ??$pow@O@std@@YA?AV?$complex@O@0@ABOABV10@@Z */ +/* ??$pow@O@std@@YA?AV?$complex@O@0@AEBOAEBV10@@Z */ +complex_double* __cdecl complex_double_pow_dc(complex_double *ret, const double *l, const complex_double *r) +{ + complex_double c = { *l, 0 }; + return complex_double_pow(ret, &c, r); +} + +/* ??$pow@N@std@@YA?AV?$complex@N@0@ABV10@ABN@Z */ +/* ??$pow@N@std@@YA?AV?$complex@N@0@AEBV10@AEBN@Z */ +/* ??$pow@O@std@@YA?AV?$complex@O@0@ABV10@ABO@Z */ +/* ??$pow@O@std@@YA?AV?$complex@O@0@AEBV10@AEBO@Z */ +complex_double* __cdecl complex_double_pow_cd(complex_double *ret, const complex_double *l, const double *r) +{ + complex_double c = { *r, 0 }; + return complex_double_pow(ret, l, &c); +} + +/* ??$sqrt@N@std@@YA?AV?$complex@N@0@ABV10@@Z */ +/* ??$sqrt@N@std@@YA?AV?$complex@N@0@AEBV10@@Z */ +/* ??$sqrt@O@std@@YA?AV?$complex@O@0@ABV10@@Z */ +/* ??$sqrt@O@std@@YA?AV?$complex@O@0@AEBV10@@Z */ +complex_double* __cdecl complex_double_sqrt(complex_double *ret, const complex_double *l) +{ + complex_double c = { 0.5, 0 }; + return complex_double_pow(ret, l, &c); +} diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index c1351d5..e73f51a 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -434,28 +434,28 @@ @ cdecl -arch=win64 ??$polar@O@std@@YA?AV?$complex@O@0@AEBO0@Z(ptr ptr ptr) complex_double_polar_theta @ cdecl -arch=win32 ??$polar@O@std@@YA?AV?$complex@O@0@ABO@Z(ptr ptr) complex_double_polar @ cdecl -arch=win64 ??$polar@O@std@@YA?AV?$complex@O@0@AEBO@Z(ptr ptr) complex_double_polar -@ stub -arch=win32 ??$pow@M@std@@YA?AV?$complex@M@0@ABMABV10@@Z -@ stub -arch=win64 ??$pow@M@std@@YA?AV?$complex@M@0@AEBMAEBV10@@Z -@ stub -arch=win32 ??$pow@M@std@@YA?AV?$complex@M@0@ABV10@0@Z -@ stub -arch=win64 ??$pow@M@std@@YA?AV?$complex@M@0@AEBV10@0@Z -@ stub -arch=win32 ??$pow@M@std@@YA?AV?$complex@M@0@ABV10@ABM@Z -@ stub -arch=win64 ??$pow@M@std@@YA?AV?$complex@M@0@AEBV10@AEBM@Z +@ cdecl -arch=win32 ??$pow@M@std@@YA?AV?$complex@M@0@ABMABV10@@Z(ptr ptr ptr) complex_float_pow_fc +@ cdecl -arch=win64 ??$pow@M@std@@YA?AV?$complex@M@0@AEBMAEBV10@@Z(ptr ptr ptr) complex_float_pow_fc +@ cdecl -arch=win32 ??$pow@M@std@@YA?AV?$complex@M@0@ABV10@0@Z(ptr ptr ptr) complex_float_pow +@ cdecl -arch=win64 ??$pow@M@std@@YA?AV?$complex@M@0@AEBV10@0@Z(ptr ptr ptr) complex_float_pow +@ cdecl -arch=win32 ??$pow@M@std@@YA?AV?$complex@M@0@ABV10@ABM@Z(ptr ptr ptr) complex_float_pow_cf +@ cdecl -arch=win64 ??$pow@M@std@@YA?AV?$complex@M@0@AEBV10@AEBM@Z(ptr ptr ptr) complex_float_pow_cf @ stub -arch=win32 ??$pow@M@std@@YA?AV?$complex@M@0@ABV10@H@Z @ stub -arch=win64 ??$pow@M@std@@YA?AV?$complex@M@0@AEBV10@H@Z -@ stub -arch=win32 ??$pow@N@std@@YA?AV?$complex@N@0@ABNABV10@@Z -@ stub -arch=win64 ??$pow@N@std@@YA?AV?$complex@N@0@AEBNAEBV10@@Z -@ stub -arch=win32 ??$pow@N@std@@YA?AV?$complex@N@0@ABV10@0@Z -@ stub -arch=win64 ??$pow@N@std@@YA?AV?$complex@N@0@AEBV10@0@Z -@ stub -arch=win32 ??$pow@N@std@@YA?AV?$complex@N@0@ABV10@ABN@Z -@ stub -arch=win64 ??$pow@N@std@@YA?AV?$complex@N@0@AEBV10@AEBN@Z +@ cdecl -arch=win32 ??$pow@N@std@@YA?AV?$complex@N@0@ABNABV10@@Z(ptr ptr ptr) complex_double_pow_dc +@ cdecl -arch=win64 ??$pow@N@std@@YA?AV?$complex@N@0@AEBNAEBV10@@Z(ptr ptr ptr) complex_double_pow_dc +@ cdecl -arch=win32 ??$pow@N@std@@YA?AV?$complex@N@0@ABV10@0@Z(ptr ptr ptr) complex_double_pow +@ cdecl -arch=win64 ??$pow@N@std@@YA?AV?$complex@N@0@AEBV10@0@Z(ptr ptr ptr) complex_double_pow +@ cdecl -arch=win32 ??$pow@N@std@@YA?AV?$complex@N@0@ABV10@ABN@Z(ptr ptr ptr) complex_double_pow_cd +@ cdecl -arch=win64 ??$pow@N@std@@YA?AV?$complex@N@0@AEBV10@AEBN@Z(ptr ptr ptr) complex_double_pow_cd @ stub -arch=win32 ??$pow@N@std@@YA?AV?$complex@N@0@ABV10@H@Z @ stub -arch=win64 ??$pow@N@std@@YA?AV?$complex@N@0@AEBV10@H@Z -@ stub -arch=win32 ??$pow@O@std@@YA?AV?$complex@O@0@ABOABV10@@Z -@ stub -arch=win64 ??$pow@O@std@@YA?AV?$complex@O@0@AEBOAEBV10@@Z -@ stub -arch=win32 ??$pow@O@std@@YA?AV?$complex@O@0@ABV10@0@Z -@ stub -arch=win64 ??$pow@O@std@@YA?AV?$complex@O@0@AEBV10@0@Z -@ stub -arch=win32 ??$pow@O@std@@YA?AV?$complex@O@0@ABV10@ABO@Z -@ stub -arch=win64 ??$pow@O@std@@YA?AV?$complex@O@0@AEBV10@AEBO@Z +@ cdecl -arch=win32 ??$pow@O@std@@YA?AV?$complex@O@0@ABOABV10@@Z(ptr ptr ptr) complex_double_pow_dc +@ cdecl -arch=win64 ??$pow@O@std@@YA?AV?$complex@O@0@AEBOAEBV10@@Z(ptr ptr ptr) complex_double_pow_dc +@ cdecl -arch=win32 ??$pow@O@std@@YA?AV?$complex@O@0@ABV10@0@Z(ptr ptr ptr) complex_double_pow +@ cdecl -arch=win64 ??$pow@O@std@@YA?AV?$complex@O@0@AEBV10@0@Z(ptr ptr ptr) complex_double_pow +@ cdecl -arch=win32 ??$pow@O@std@@YA?AV?$complex@O@0@ABV10@ABO@Z(ptr ptr ptr) complex_double_pow_cd +@ cdecl -arch=win64 ??$pow@O@std@@YA?AV?$complex@O@0@AEBV10@AEBO@Z(ptr ptr ptr) complex_double_pow_cd @ stub -arch=win32 ??$pow@O@std@@YA?AV?$complex@O@0@ABV10@H@Z @ stub -arch=win64 ??$pow@O@std@@YA?AV?$complex@O@0@AEBV10@H@Z @ cdecl -arch=win32 ??$real@M@std@@YAMABV?$complex@M@0@@Z(ptr) complex_float_real @@ -476,12 +476,12 @@ @ cdecl -arch=win64 ??$sinh@N@std@@YA?AV?$complex@N@0@AEBV10@@Z(ptr ptr) complex_double_sinh @ cdecl -arch=win32 ??$sinh@O@std@@YA?AV?$complex@O@0@ABV10@@Z(ptr ptr) complex_double_sinh @ cdecl -arch=win64 ??$sinh@O@std@@YA?AV?$complex@O@0@AEBV10@@Z(ptr ptr) complex_double_sinh -@ stub -arch=win32 ??$sqrt@M@std@@YA?AV?$complex@M@0@ABV10@@Z -@ stub -arch=win64 ??$sqrt@M@std@@YA?AV?$complex@M@0@AEBV10@@Z -@ stub -arch=win32 ??$sqrt@N@std@@YA?AV?$complex@N@0@ABV10@@Z -@ stub -arch=win64 ??$sqrt@N@std@@YA?AV?$complex@N@0@AEBV10@@Z -@ stub -arch=win32 ??$sqrt@O@std@@YA?AV?$complex@O@0@ABV10@@Z -@ stub -arch=win64 ??$sqrt@O@std@@YA?AV?$complex@O@0@AEBV10@@Z +@ cdecl -arch=win32 ??$sqrt@M@std@@YA?AV?$complex@M@0@ABV10@@Z(ptr ptr) complex_float_sqrt +@ cdecl -arch=win64 ??$sqrt@M@std@@YA?AV?$complex@M@0@AEBV10@@Z(ptr ptr) complex_float_sqrt +@ cdecl -arch=win32 ??$sqrt@N@std@@YA?AV?$complex@N@0@ABV10@@Z(ptr ptr) complex_double_sqrt +@ cdecl -arch=win64 ??$sqrt@N@std@@YA?AV?$complex@N@0@AEBV10@@Z(ptr ptr) complex_double_sqrt +@ cdecl -arch=win32 ??$sqrt@O@std@@YA?AV?$complex@O@0@ABV10@@Z(ptr ptr) complex_double_sqrt +@ cdecl -arch=win64 ??$sqrt@O@std@@YA?AV?$complex@O@0@AEBV10@@Z(ptr ptr) complex_double_sqrt @ cdecl -arch=win32 ??$tan@M@std@@YA?AV?$complex@M@0@ABV10@@Z(ptr ptr) complex_float_tan @ cdecl -arch=win64 ??$tan@M@std@@YA?AV?$complex@M@0@AEBV10@@Z(ptr ptr) complex_float_tan @ cdecl -arch=win32 ??$tan@N@std@@YA?AV?$complex@N@0@ABV10@@Z(ptr ptr) complex_double_tan

1 0

Piotr Caban : msvcp90: Added std::norm(complex) and std::polar(complex) implementation.
by Alexandre Julliard 25 Jan '13

25 Jan '13

Module: wine Branch: master Commit: 2350e48f2029ab60fe60b2782005a0e34ac0a3f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2350e48f2029ab60fe60b2782… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 25 10:37:24 2013 +0100 msvcp90: Added std::norm(complex) and std::polar(complex) implementation. --- dlls/msvcp90/math.c | 56 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 36 ++++++++++++++-------------- 2 files changed, 74 insertions(+), 18 deletions(-) diff --git a/dlls/msvcp90/math.c b/dlls/msvcp90/math.c index aca11f1..7cd605a 100644 --- a/dlls/msvcp90/math.c +++ b/dlls/msvcp90/math.c @@ -1402,6 +1402,31 @@ complex_float* __cdecl complex_float_log10(complex_float *ret, const complex_flo return ret; } +/* ??$norm@M@std@@YAMABV?$complex@M@0@@Z */ +/* ??$norm@M@std@@YAMAEBV?$complex@M@0@@Z */ +float __cdecl complex_float_norm(const complex_float *c) +{ + return c->real*c->real + c->imag*c->imag; +} + +/* ??$polar@M@std@@YA?AV?$complex@M@0@ABM0@Z */ +/* ??$polar@M@std@@YA?AV?$complex@M@0@AEBM0@Z */ +complex_float* __cdecl complex_float_polar_theta(complex_float *ret, const float *mod, const float *theta) +{ + ret->real = *mod * cos(*theta); + ret->imag = *mod * sin(*theta); + return ret; +} + +/* ??$polar@M@std@@YA?AV?$complex@M@0@ABM@Z */ +/* ??$polar@M@std@@YA?AV?$complex@M@0@AEBM@Z */ +complex_float* __cdecl complex_float_polar(complex_float *ret, const float *mod) +{ + ret->real = *mod; + ret->imag = 0; + return ret; +} + /* ??0?$_Complex_base@NU_C_double_complex@@@std@@QAE@ABN0@Z */ /* ??0?$_Complex_base@NU_C_double_complex@@@std@@QEAA@AEBN0@Z */ /* ??0?$_Complex_base@OU_C_ldouble_complex@@@std@@QAE@ABO0@Z */ @@ -2017,3 +2042,34 @@ complex_double* __cdecl complex_double_log10(complex_double *ret, const complex_ ret->imag *= M_LOG10E; return ret; } + +/* ??$norm@N@std@@YANABV?$complex@N@0@@Z */ +/* ??$norm@N@std@@YANAEBV?$complex@N@0@@Z */ +/* ??$norm@O@std@@YAOABV?$complex@O@0@@Z */ +/* ??$norm@O@std@@YAOAEBV?$complex@O@0@@Z */ +double __cdecl complex_double_norm(const complex_double *c) +{ + return c->real*c->real + c->imag*c->imag; +} + +/* ??$polar@N@std@@YA?AV?$complex@N@0@ABN0@Z */ +/* ??$polar@N@std@@YA?AV?$complex@N@0@AEBN0@Z */ +/* ??$polar@O@std@@YA?AV?$complex@O@0@ABO0@Z */ +/* ??$polar@O@std@@YA?AV?$complex@O@0@AEBO0@Z */ +complex_double* __cdecl complex_double_polar_theta(complex_double *ret, const double *mod, const double *theta) +{ + ret->real = *mod * cos(*theta); + ret->imag = *mod * sin(*theta); + return ret; +} + +/* ??$polar@N@std@@YA?AV?$complex@N@0@ABN@Z */ +/* ??$polar@N@std@@YA?AV?$complex@N@0@AEBN@Z */ +/* ??$polar@O@std@@YA?AV?$complex@O@0@ABO@Z */ +/* ??$polar@O@std@@YA?AV?$complex@O@0@AEBO@Z */ +complex_double* __cdecl complex_double_polar(complex_double *ret, const double *mod) +{ + ret->real = *mod; + ret->imag = 0; + return ret; +} diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index 61a4651..c1351d5 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -416,24 +416,24 @@ @ cdecl -arch=win64 ??$log@N@std@@YA?AV?$complex@N@0@AEBV10@@Z(ptr ptr) complex_double_log @ cdecl -arch=win32 ??$log@O@std@@YA?AV?$complex@O@0@ABV10@@Z(ptr ptr) complex_double_log @ cdecl -arch=win64 ??$log@O@std@@YA?AV?$complex@O@0@AEBV10@@Z(ptr ptr) complex_double_log -@ stub -arch=win32 ??$norm@M@std@@YAMABV?$complex@M@0@@Z -@ stub -arch=win64 ??$norm@M@std@@YAMAEBV?$complex@M@0@@Z -@ stub -arch=win32 ??$norm@N@std@@YANABV?$complex@N@0@@Z -@ stub -arch=win64 ??$norm@N@std@@YANAEBV?$complex@N@0@@Z -@ stub -arch=win32 ??$norm@O@std@@YAOABV?$complex@O@0@@Z -@ stub -arch=win64 ??$norm@O@std@@YAOAEBV?$complex@O@0@@Z -@ stub -arch=win32 ??$polar@M@std@@YA?AV?$complex@M@0@ABM0@Z -@ stub -arch=win64 ??$polar@M@std@@YA?AV?$complex@M@0@AEBM0@Z -@ stub -arch=win32 ??$polar@M@std@@YA?AV?$complex@M@0@ABM@Z -@ stub -arch=win64 ??$polar@M@std@@YA?AV?$complex@M@0@AEBM@Z -@ stub -arch=win32 ??$polar@N@std@@YA?AV?$complex@N@0@ABN0@Z -@ stub -arch=win64 ??$polar@N@std@@YA?AV?$complex@N@0@AEBN0@Z -@ stub -arch=win32 ??$polar@N@std@@YA?AV?$complex@N@0@ABN@Z -@ stub -arch=win64 ??$polar@N@std@@YA?AV?$complex@N@0@AEBN@Z -@ stub -arch=win32 ??$polar@O@std@@YA?AV?$complex@O@0@ABO0@Z -@ stub -arch=win64 ??$polar@O@std@@YA?AV?$complex@O@0@AEBO0@Z -@ stub -arch=win32 ??$polar@O@std@@YA?AV?$complex@O@0@ABO@Z -@ stub -arch=win64 ??$polar@O@std@@YA?AV?$complex@O@0@AEBO@Z +@ cdecl -arch=win32 ??$norm@M@std@@YAMABV?$complex@M@0@@Z(ptr) complex_float_norm +@ cdecl -arch=win64 ??$norm@M@std@@YAMAEBV?$complex@M@0@@Z(ptr) complex_float_norm +@ cdecl -arch=win32 ??$norm@N@std@@YANABV?$complex@N@0@@Z(ptr) complex_double_norm +@ cdecl -arch=win64 ??$norm@N@std@@YANAEBV?$complex@N@0@@Z(ptr) complex_double_norm +@ cdecl -arch=win32 ??$norm@O@std@@YAOABV?$complex@O@0@@Z(ptr) complex_double_norm +@ cdecl -arch=win64 ??$norm@O@std@@YAOAEBV?$complex@O@0@@Z(ptr) complex_double_norm +@ cdecl -arch=win32 ??$polar@M@std@@YA?AV?$complex@M@0@ABM0@Z(ptr ptr ptr) complex_float_polar_theta +@ cdecl -arch=win64 ??$polar@M@std@@YA?AV?$complex@M@0@AEBM0@Z(ptr ptr ptr) complex_float_polar_theta +@ cdecl -arch=win32 ??$polar@M@std@@YA?AV?$complex@M@0@ABM@Z(ptr ptr) complex_float_polar +@ cdecl -arch=win64 ??$polar@M@std@@YA?AV?$complex@M@0@AEBM@Z(ptr ptr) complex_float_polar +@ cdecl -arch=win32 ??$polar@N@std@@YA?AV?$complex@N@0@ABN0@Z(ptr ptr ptr) complex_double_polar_theta +@ cdecl -arch=win64 ??$polar@N@std@@YA?AV?$complex@N@0@AEBN0@Z(ptr ptr ptr) complex_double_polar_theta +@ cdecl -arch=win32 ??$polar@N@std@@YA?AV?$complex@N@0@ABN@Z(ptr ptr) complex_double_polar +@ cdecl -arch=win64 ??$polar@N@std@@YA?AV?$complex@N@0@AEBN@Z(ptr ptr) complex_double_polar +@ cdecl -arch=win32 ??$polar@O@std@@YA?AV?$complex@O@0@ABO0@Z(ptr ptr ptr) complex_double_polar_theta +@ cdecl -arch=win64 ??$polar@O@std@@YA?AV?$complex@O@0@AEBO0@Z(ptr ptr ptr) complex_double_polar_theta +@ cdecl -arch=win32 ??$polar@O@std@@YA?AV?$complex@O@0@ABO@Z(ptr ptr) complex_double_polar +@ cdecl -arch=win64 ??$polar@O@std@@YA?AV?$complex@O@0@AEBO@Z(ptr ptr) complex_double_polar @ stub -arch=win32 ??$pow@M@std@@YA?AV?$complex@M@0@ABMABV10@@Z @ stub -arch=win64 ??$pow@M@std@@YA?AV?$complex@M@0@AEBMAEBV10@@Z @ stub -arch=win32 ??$pow@M@std@@YA?AV?$complex@M@0@ABV10@0@Z

1 0

Piotr Caban : msvcp90: Added std::log10(complex) tests.
by Alexandre Julliard 25 Jan '13

25 Jan '13

Module: wine Branch: master Commit: 690e32684d9a9a88bf72afff7b4f65eedbbf5024 URL: http://source.winehq.org/git/wine.git/?a=commit;h=690e32684d9a9a88bf72afff7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 25 10:37:10 2013 +0100 msvcp90: Added std::log10(complex) tests. --- dlls/msvcp90/tests/misc.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/msvcp90/tests/misc.c b/dlls/msvcp90/tests/misc.c index 9f0b14b..9e456f8 100644 --- a/dlls/msvcp90/tests/misc.c +++ b/dlls/msvcp90/tests/misc.c @@ -114,6 +114,7 @@ static complex_float* (__cdecl *p_complex_float_div)(complex_float*, const compl static float (__cdecl *p_complex_float__Fabs)(const complex_float*, int*); static complex_float* (__cdecl *p_complex_float_tan)(complex_float*, const complex_float*); static complex_float* (__cdecl *p_complex_float_tanh)(complex_float*, const complex_float*); +static complex_float* (__cdecl *p_complex_float_log10)(complex_float*, const complex_float*); static int invalid_parameter = 0; static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, @@ -258,6 +259,8 @@ static BOOL init(void) "??$tan@M@std@@YA?AV?$complex@M@0@AEBV10@@Z"); SET(p_complex_float_tanh, "??$tanh@M@std@@YA?AV?$complex@M@0@AEBV10@@Z"); + SET(p_complex_float_log10, + "??$log10@M@std@@YA?AV?$complex@M@0@AEBV10@@Z"); } else { SET(p_char_assign, "?assign@?$char_traits@D@std@@SAXAADABD@Z"); SET(p_wchar_assign, "?assign@?$char_traits@_W@std@@SAXAA_WAB_W@Z"); @@ -308,6 +311,8 @@ static BOOL init(void) "??$tan@M@std@@YA?AV?$complex@M@0@ABV10@@Z"); SET(p_complex_float_tanh, "??$tanh@M@std@@YA?AV?$complex@M@0@ABV10@@Z"); + SET(p_complex_float_log10, + "??$log10@M@std@@YA?AV?$complex@M@0@ABV10@@Z"); } init_thiscall_thunk(); @@ -724,6 +729,9 @@ static void test_complex(void) p_complex_float_tanh(&c2, &c1); ok(c2.real == 0, "c2.real = %f\n", c2.real); ok(c2.imag == 0, "c2.imag = %f\n", c2.imag); + p_complex_float_log10(&c2, &c1); + ok(c2.real < -FLT_MAX /* c2.real == -inf */, "c2.real = %f\n", c2.real); + ok(c2.imag == 0, "c2.imag = %g\n", c2.imag); c1.real = 3.14159/2; c1.imag = 0; @@ -733,6 +741,9 @@ static void test_complex(void) p_complex_float_tanh(&c2, &c1); ok(almost_eq(c2.real, 0.917152), "c2.real = %f\n", c2.real); ok(c2.imag == 0, "c2.imag = %f\n", c2.imag); + p_complex_float_log10(&c2, &c1); + ok(almost_eq(c2.real, 0.196120), "c2.real = %f\n", c2.real); + ok(c2.imag == 0, "c2.imag = %g\n", c2.imag); c1.real = 7.12; c1.imag = 0.17; @@ -742,6 +753,9 @@ static void test_complex(void) p_complex_float_tanh(&c2, &c1); ok(almost_eq(c2.real, 0.999999), "c2.real = %f\n", c2.real); ok(almost_eq(c2.imag, 4.3627e-7), "c2.imag = %g\n", c2.imag); + p_complex_float_log10(&c2, &c1); + ok(almost_eq(c2.real, 0.852604), "c2.real = %f\n", c2.real); + ok(almost_eq(c2.imag, 0.0103674), "c2.imag = %g\n", c2.imag); c1.real = 0.14; c1.imag = 0.19; @@ -751,6 +765,9 @@ static void test_complex(void) p_complex_float_tanh(&c2, &c1); ok(almost_eq(c2.real, 0.144134), "c2.real = %f\n", c2.real); ok(almost_eq(c2.imag, 0.188464), "c2.imag = %f\n", c2.imag); + p_complex_float_log10(&c2, &c1); + ok(almost_eq(c2.real, -0.627072), "c2.real = %f\n", c2.real); + ok(almost_eq(c2.imag, 0.4064), "c2.imag = %g\n", c2.imag); } START_TEST(misc)

1 0

Piotr Caban : msvcp90: Added std::log(complex) and std::exp(complex) implementation.
by Alexandre Julliard 25 Jan '13

25 Jan '13

Module: wine Branch: master Commit: 55aeaf3c7680146a5bf7df05b19a2427904bdfad URL: http://source.winehq.org/git/wine.git/?a=commit;h=55aeaf3c7680146a5bf7df05b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jan 25 10:36:51 2013 +0100 msvcp90: Added std::log(complex) and std::exp(complex) implementation. --- dlls/msvcp90/math.c | 65 +++++++++++++++++++++++++++++++++++++++++++++ dlls/msvcp90/msvcp90.spec | 36 ++++++++++++------------ include/msvcrt/math.h | 19 +++++++++++++ 3 files changed, 102 insertions(+), 18 deletions(-) diff --git a/dlls/msvcp90/math.c b/dlls/msvcp90/math.c index 72a8922..aca11f1 100644 --- a/dlls/msvcp90/math.c +++ b/dlls/msvcp90/math.c @@ -21,6 +21,7 @@ #include <stdarg.h> #include <limits.h> #include <float.h> +#define _USE_MATH_DEFINES #include <math.h> #include "msvcp90.h" @@ -1372,6 +1373,35 @@ complex_float* __cdecl complex_float_tanh(complex_float *ret, const complex_floa return ret; } +/* ??$exp@M@std@@YA?AV?$complex@M@0@ABV10@@Z */ +/* ??$exp@M@std@@YA?AV?$complex@M@0@AEBV10@@Z */ +complex_float* __cdecl complex_float_exp(complex_float *ret, const complex_float *c) +{ + ret->real = ret->imag = exp(c->real); + ret->real *= cos(c->imag); + ret->imag *= sin(c->imag); + return ret; +} + +/* ??$log@M@std@@YA?AV?$complex@M@0@ABV10@@Z */ +/* ??$log@M@std@@YA?AV?$complex@M@0@AEBV10@@Z */ +complex_float* __cdecl complex_float_log(complex_float *ret, const complex_float *c) +{ + ret->real = log(complex_float_abs(c)); + ret->imag = complex_float_arg(c); + return ret; +} + +/* ??$log10@M@std@@YA?AV?$complex@M@0@ABV10@@Z */ +/* ??$log10@M@std@@YA?AV?$complex@M@0@AEBV10@@Z */ +complex_float* __cdecl complex_float_log10(complex_float *ret, const complex_float *c) +{ + complex_float_log(ret, c); + ret->real *= M_LOG10E; + ret->imag *= M_LOG10E; + return ret; +} + /* ??0?$_Complex_base@NU_C_double_complex@@@std@@QAE@ABN0@Z */ /* ??0?$_Complex_base@NU_C_double_complex@@@std@@QEAA@AEBN0@Z */ /* ??0?$_Complex_base@OU_C_ldouble_complex@@@std@@QAE@ABO0@Z */ @@ -1952,3 +1982,38 @@ complex_double* __cdecl complex_double_tanh(complex_double *ret, const complex_d ret->imag = -tmp.real; return ret; } + +/* ??$exp@N@std@@YA?AV?$complex@N@0@ABV10@@Z */ +/* ??$exp@N@std@@YA?AV?$complex@N@0@AEBV10@@Z */ +/* ??$exp@O@std@@YA?AV?$complex@O@0@ABV10@@Z */ +/* ??$exp@O@std@@YA?AV?$complex@O@0@AEBV10@@Z */ +complex_double* __cdecl complex_double_exp(complex_double *ret, const complex_double *c) +{ + ret->real = ret->imag = exp(c->real); + ret->real *= cos(c->imag); + ret->imag *= sin(c->imag); + return ret; +} + +/* ??$log@N@std@@YA?AV?$complex@N@0@ABV10@@Z */ +/* ??$log@N@std@@YA?AV?$complex@N@0@AEBV10@@Z */ +/* ??$log@O@std@@YA?AV?$complex@O@0@ABV10@@Z */ +/* ??$log@O@std@@YA?AV?$complex@O@0@AEBV10@@Z */ +complex_double* __cdecl complex_double_log(complex_double *ret, const complex_double *c) +{ + ret->real = log(complex_double_abs(c)); + ret->imag = complex_double_arg(c); + return ret; +} + +/* ??$log10@N@std@@YA?AV?$complex@N@0@ABV10@@Z */ +/* ??$log10@N@std@@YA?AV?$complex@N@0@AEBV10@@Z */ +/* ??$log10@O@std@@YA?AV?$complex@O@0@ABV10@@Z */ +/* ??$log10@O@std@@YA?AV?$complex@O@0@AEBV10@@Z */ +complex_double* __cdecl complex_double_log10(complex_double *ret, const complex_double *c) +{ + complex_double_log(ret, c); + ret->real *= M_LOG10E; + ret->imag *= M_LOG10E; + return ret; +} diff --git a/dlls/msvcp90/msvcp90.spec b/dlls/msvcp90/msvcp90.spec index b77fcf5..61a4651 100644 --- a/dlls/msvcp90/msvcp90.spec +++ b/dlls/msvcp90/msvcp90.spec @@ -380,12 +380,12 @@ @ cdecl -arch=win64 ??$cosh@N@std@@YA?AV?$complex@N@0@AEBV10@@Z(ptr ptr) complex_double_cosh @ cdecl -arch=win32 ??$cosh@O@std@@YA?AV?$complex@O@0@ABV10@@Z(ptr ptr) complex_double_cosh @ cdecl -arch=win64 ??$cosh@O@std@@YA?AV?$complex@O@0@AEBV10@@Z(ptr ptr) complex_double_cosh -@ stub -arch=win32 ??$exp@M@std@@YA?AV?$complex@M@0@ABV10@@Z -@ stub -arch=win64 ??$exp@M@std@@YA?AV?$complex@M@0@AEBV10@@Z -@ stub -arch=win32 ??$exp@N@std@@YA?AV?$complex@N@0@ABV10@@Z -@ stub -arch=win64 ??$exp@N@std@@YA?AV?$complex@N@0@AEBV10@@Z -@ stub -arch=win32 ??$exp@O@std@@YA?AV?$complex@O@0@ABV10@@Z -@ stub -arch=win64 ??$exp@O@std@@YA?AV?$complex@O@0@AEBV10@@Z +@ cdecl -arch=win32 ??$exp@M@std@@YA?AV?$complex@M@0@ABV10@@Z(ptr ptr) complex_float_exp +@ cdecl -arch=win64 ??$exp@M@std@@YA?AV?$complex@M@0@AEBV10@@Z(ptr ptr) complex_float_exp +@ cdecl -arch=win32 ??$exp@N@std@@YA?AV?$complex@N@0@ABV10@@Z(ptr ptr) complex_double_exp +@ cdecl -arch=win64 ??$exp@N@std@@YA?AV?$complex@N@0@AEBV10@@Z(ptr ptr) complex_double_exp +@ cdecl -arch=win32 ??$exp@O@std@@YA?AV?$complex@O@0@ABV10@@Z(ptr ptr) complex_double_exp +@ cdecl -arch=win64 ??$exp@O@std@@YA?AV?$complex@O@0@AEBV10@@Z(ptr ptr) complex_double_exp @ cdecl -arch=win32 ??$getline@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@YAAAV?$basic_istream@DU?$char_traits@D@std@@@0@AAV10@AAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@@Z(ptr ptr) basic_istream_char_getline_bstr @ cdecl -arch=win64 ??$getline@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@YAAEAV?$basic_istream@DU?$char_traits@D@std@@@0@AEAV10@AEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@@Z(ptr ptr) basic_istream_char_getline_bstr @ cdecl -arch=win32 ??$getline@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@YAAAV?$basic_istream@DU?$char_traits@D@std@@@0@AAV10@AAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@0@D@Z(ptr ptr long) basic_istream_char_getline_bstr_delim @@ -404,18 +404,18 @@ @ cdecl -arch=win64 ??$imag@N@std@@YANAEBV?$complex@N@0@@Z(ptr) complex_double_imag @ cdecl -arch=win32 ??$imag@O@std@@YAOABV?$complex@O@0@@Z(ptr) complex_double_imag @ cdecl -arch=win64 ??$imag@O@std@@YAOAEBV?$complex@O@0@@Z(ptr) complex_double_imag -@ stub -arch=win32 ??$log10@M@std@@YA?AV?$complex@M@0@ABV10@@Z -@ stub -arch=win64 ??$log10@M@std@@YA?AV?$complex@M@0@AEBV10@@Z -@ stub -arch=win32 ??$log10@N@std@@YA?AV?$complex@N@0@ABV10@@Z -@ stub -arch=win64 ??$log10@N@std@@YA?AV?$complex@N@0@AEBV10@@Z -@ stub -arch=win32 ??$log10@O@std@@YA?AV?$complex@O@0@ABV10@@Z -@ stub -arch=win64 ??$log10@O@std@@YA?AV?$complex@O@0@AEBV10@@Z -@ stub -arch=win32 ??$log@M@std@@YA?AV?$complex@M@0@ABV10@@Z -@ stub -arch=win64 ??$log@M@std@@YA?AV?$complex@M@0@AEBV10@@Z -@ stub -arch=win32 ??$log@N@std@@YA?AV?$complex@N@0@ABV10@@Z -@ stub -arch=win64 ??$log@N@std@@YA?AV?$complex@N@0@AEBV10@@Z -@ stub -arch=win32 ??$log@O@std@@YA?AV?$complex@O@0@ABV10@@Z -@ stub -arch=win64 ??$log@O@std@@YA?AV?$complex@O@0@AEBV10@@Z +@ cdecl -arch=win32 ??$log10@M@std@@YA?AV?$complex@M@0@ABV10@@Z(ptr ptr) complex_float_log10 +@ cdecl -arch=win64 ??$log10@M@std@@YA?AV?$complex@M@0@AEBV10@@Z(ptr ptr) complex_float_log10 +@ cdecl -arch=win32 ??$log10@N@std@@YA?AV?$complex@N@0@ABV10@@Z(ptr ptr) complex_double_log10 +@ cdecl -arch=win64 ??$log10@N@std@@YA?AV?$complex@N@0@AEBV10@@Z(ptr ptr) complex_double_log10 +@ cdecl -arch=win32 ??$log10@O@std@@YA?AV?$complex@O@0@ABV10@@Z(ptr ptr) complex_double_log10 +@ cdecl -arch=win64 ??$log10@O@std@@YA?AV?$complex@O@0@AEBV10@@Z(ptr ptr) complex_double_log10 +@ cdecl -arch=win32 ??$log@M@std@@YA?AV?$complex@M@0@ABV10@@Z(ptr ptr) complex_float_log +@ cdecl -arch=win64 ??$log@M@std@@YA?AV?$complex@M@0@AEBV10@@Z(ptr ptr) complex_float_log +@ cdecl -arch=win32 ??$log@N@std@@YA?AV?$complex@N@0@ABV10@@Z(ptr ptr) complex_double_log +@ cdecl -arch=win64 ??$log@N@std@@YA?AV?$complex@N@0@AEBV10@@Z(ptr ptr) complex_double_log +@ cdecl -arch=win32 ??$log@O@std@@YA?AV?$complex@O@0@ABV10@@Z(ptr ptr) complex_double_log +@ cdecl -arch=win64 ??$log@O@std@@YA?AV?$complex@O@0@AEBV10@@Z(ptr ptr) complex_double_log @ stub -arch=win32 ??$norm@M@std@@YAMABV?$complex@M@0@@Z @ stub -arch=win64 ??$norm@M@std@@YAMAEBV?$complex@M@0@@Z @ stub -arch=win32 ??$norm@N@std@@YANABV?$complex@N@0@@Z diff --git a/include/msvcrt/math.h b/include/msvcrt/math.h index e99777d..4d0655e 100644 --- a/include/msvcrt/math.h +++ b/include/msvcrt/math.h @@ -152,4 +152,23 @@ static const union { #include <poppack.h> +#ifdef _USE_MATH_DEFINES +#ifndef _MATH_DEFINES_DEFINED +#define _MATH_DEFINES_DEFINED +#define M_E 2.71828182845904523536 +#define M_LOG2E 1.44269504088896340736 +#define M_LOG10E 0.434294481903251827651 +#define M_LN2 0.693147180559945309417 +#define M_LN10 2.30258509299404568402 +#define M_PI 3.14159265358979323846 +#define M_PI_2 1.57079632679489661923 +#define M_PI_4 0.785398163397448309616 +#define M_1_PI 0.318309886183790671538 +#define M_2_PI 0.636619772367581343076 +#define M_2_SQRTPI 1.12837916709551257390 +#define M_SQRT2 1.41421356237309504880 +#define M_SQRT1_2 0.707106781186547524401 +#endif /* !_MATH_DEFINES_DEFINED */ +#endif /* _USE_MATH_DEFINES */ + #endif /* __WINE_MATH_H */

1 0

Henri Verbeet : wined3d: Get rid of a superfluous texture copy in check_fbo_compat().
by Alexandre Julliard 25 Jan '13

25 Jan '13

Module: wine Branch: master Commit: 6c6565dea034327e325b0a03cbed908d37e88df6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6c6565dea034327e325b0a03c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 25 10:57:20 2013 +0100 wined3d: Get rid of a superfluous texture copy in check_fbo_compat(). --- dlls/wined3d/utils.c | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index c1f6125..985fc18 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1068,10 +1068,10 @@ static void check_fbo_compat(const struct wined3d_gl_info *gl_info, struct wined && format->glFormat != GL_LUMINANCE && format->glFormat != GL_LUMINANCE_ALPHA && (format->red_size || format->alpha_size)) { - GLuint rb, tex2; DWORD readback[16 * 16], color, r_range, a_range; BYTE r, a; BOOL match = TRUE; + GLuint rb; if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT] || gl_info->supported[EXT_PACKED_DEPTH_STENCIL]) @@ -1125,10 +1125,7 @@ static void check_fbo_compat(const struct wined3d_gl_info *gl_info, struct wined gl_info->gl_ops.gl.p_glEnd(); gl_info->gl_ops.gl.p_glDisable(GL_BLEND); - gl_info->gl_ops.gl.p_glGenTextures(1, &tex2); - gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D, tex2); - gl_info->gl_ops.gl.p_glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, 0, 0, 16, 16, 0); gl_info->gl_ops.gl.p_glGetTexImage(GL_TEXTURE_2D, 0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, readback); checkGLcall("Post-pixelshader blending check"); @@ -1154,9 +1151,6 @@ static void check_fbo_compat(const struct wined3d_gl_info *gl_info, struct wined TRACE("Color output: %#x\n", color); format->flags |= WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING; } - - gl_info->gl_ops.gl.p_glBindTexture(GL_TEXTURE_2D, tex); - gl_info->gl_ops.gl.p_glDeleteTextures(1, &tex2); } if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT]

1 0

Henri Verbeet : wined3d: Replace "VertexShaderMode" and "PixelShaderMode" with shader model limits.
by Alexandre Julliard 25 Jan '13

25 Jan '13

Module: wine Branch: master Commit: dc214603974132969c9f1bd13b8fe533bbb413dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc214603974132969c9f1bd13… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 25 10:57:19 2013 +0100 wined3d: Replace "VertexShaderMode" and "PixelShaderMode" with shader model limits. --- dlls/wined3d/arb_program_shader.c | 16 +++++++++----- dlls/wined3d/directx.c | 2 - dlls/wined3d/glsl_shader.c | 6 ++-- dlls/wined3d/wined3d_main.c | 38 ++++++++---------------------------- dlls/wined3d/wined3d_private.h | 18 ++-------------- 5 files changed, 25 insertions(+), 55 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2df18cd..31ee94a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4989,6 +4989,7 @@ static void shader_arb_get_caps(const struct wined3d_gl_info *gl_info, struct sh if (gl_info->supported[ARB_VERTEX_PROGRAM]) { DWORD vs_consts; + UINT vs_version; /* 96 is the minimum allowed value of MAX_PROGRAM_ENV_PARAMETERS_ARB * for vertex programs. If the native limit is less than that it's @@ -5001,20 +5002,21 @@ static void shader_arb_get_caps(const struct wined3d_gl_info *gl_info, struct sh if (gl_info->supported[NV_VERTEX_PROGRAM3]) { - caps->vs_version = 3; + vs_version = 3; TRACE("Hardware vertex shader version 3.0 enabled (NV_VERTEX_PROGRAM3)\n"); } else if (vs_consts >= 256) { /* Shader Model 2.0 requires at least 256 vertex shader constants */ - caps->vs_version = 2; + vs_version = 2; TRACE("Hardware vertex shader version 2.0 enabled (ARB_PROGRAM)\n"); } else { - caps->vs_version = 1; + vs_version = 1; TRACE("Hardware vertex shader version 1.1 enabled (ARB_PROGRAM)\n"); } + caps->vs_version = min(wined3d_settings.max_sm_vs, vs_version); caps->vs_uniform_count = vs_consts; } else @@ -5028,6 +5030,7 @@ static void shader_arb_get_caps(const struct wined3d_gl_info *gl_info, struct sh if (gl_info->supported[ARB_FRAGMENT_PROGRAM]) { DWORD ps_consts; + UINT ps_version; /* Similar as above for vertex programs, but the minimum for fragment * programs is 24. */ @@ -5038,20 +5041,21 @@ static void shader_arb_get_caps(const struct wined3d_gl_info *gl_info, struct sh if (gl_info->supported[NV_FRAGMENT_PROGRAM2]) { - caps->ps_version = 3; + ps_version = 3; TRACE("Hardware pixel shader version 3.0 enabled (NV_FRAGMENT_PROGRAM2)\n"); } else if (ps_consts >= 32) { /* Shader Model 2.0 requires at least 32 pixel shader constants */ - caps->ps_version = 2; + ps_version = 2; TRACE("Hardware pixel shader version 2.0 enabled (ARB_PROGRAM)\n"); } else { - caps->ps_version = 1; + ps_version = 1; TRACE("Hardware pixel shader version 1.4 enabled (ARB_PROGRAM)\n"); } + caps->ps_version = min(wined3d_settings.max_sm_ps, ps_version); caps->ps_uniform_count = ps_consts; caps->ps_1x_max_value = 8.0f; } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d5d1025..b70a44f 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2267,8 +2267,6 @@ static const struct wined3d_shader_backend_ops *select_shader_backend(const stru { BOOL glsl = wined3d_settings.glslRequested && gl_info->glsl_version >= MAKEDWORD_VERSION(1, 20); - if (wined3d_settings.vs_mode == VS_NONE && wined3d_settings.ps_mode == PS_NONE) - return &none_shader_backend; if (glsl && gl_info->supported[ARB_FRAGMENT_SHADER]) return &glsl_shader_backend; if (glsl && gl_info->supported[ARB_VERTEX_SHADER]) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9b000b6..16b8a83 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6184,9 +6184,9 @@ static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct s shader_model = 2; TRACE("Shader model %u.\n", shader_model); - caps->vs_version = shader_model; - caps->gs_version = shader_model; - caps->ps_version = shader_model; + caps->vs_version = min(wined3d_settings.max_sm_vs, shader_model); + caps->gs_version = min(wined3d_settings.max_sm_gs, shader_model); + caps->ps_version = min(wined3d_settings.max_sm_ps, shader_model); caps->vs_uniform_count = gl_info->limits.glsl_vs_float_constants; caps->ps_uniform_count = gl_info->limits.glsl_ps_float_constants; diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 2247e9c..f49e5bc 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -72,8 +72,6 @@ static CRITICAL_SECTION wined3d_wndproc_cs = {&wined3d_wndproc_cs_debug, -1, 0, * where appropriate. */ struct wined3d_settings wined3d_settings = { - VS_HW, /* Hardware by default */ - PS_HW, /* Hardware by default */ TRUE, /* Use of GLSL enabled by default */ ORM_FBO, /* Use FBOs to do offscreen rendering */ RTL_READTEX, /* Default render target locking method */ @@ -84,6 +82,9 @@ struct wined3d_settings wined3d_settings = TRUE, /* Multisampling enabled by default. */ FALSE, /* No strict draw ordering. */ TRUE, /* Don't try to render onscreen by default. */ + ~0U, /* No VS shader model limit by default. */ + ~0U, /* No GS shader model limit by default. */ + ~0U, /* No PS shader model limit by default. */ }; /* Do not call while under the GL lock. */ @@ -196,27 +197,6 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) if (hkey || appkey) { - if ( !get_config_key( hkey, appkey, "VertexShaderMode", buffer, size) ) - { - if (!strcmp(buffer,"none")) - { - TRACE("Disable vertex shaders\n"); - wined3d_settings.vs_mode = VS_NONE; - } - } - if ( !get_config_key( hkey, appkey, "PixelShaderMode", buffer, size) ) - { - if (!strcmp(buffer,"enabled")) - { - TRACE("Allow pixel shaders\n"); - wined3d_settings.ps_mode = PS_HW; - } - if (!strcmp(buffer,"disabled")) - { - TRACE("Disable pixel shaders\n"); - wined3d_settings.ps_mode = PS_NONE; - } - } if ( !get_config_key( hkey, appkey, "UseGLSL", buffer, size) ) { if (!strcmp(buffer,"disabled")) @@ -323,13 +303,13 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) TRACE("Not always rendering backbuffers offscreen.\n"); wined3d_settings.always_offscreen = FALSE; } + if (!get_config_key_dword(hkey, appkey, "MaxShaderModelVS", &wined3d_settings.max_sm_vs)) + TRACE("Limiting VS shader model to %u.\n", wined3d_settings.max_sm_vs); + if (!get_config_key_dword(hkey, appkey, "MaxShaderModelGS", &wined3d_settings.max_sm_gs)) + TRACE("Limiting GS shader model to %u.\n", wined3d_settings.max_sm_gs); + if (!get_config_key_dword(hkey, appkey, "MaxShaderModelPS", &wined3d_settings.max_sm_ps)) + TRACE("Limiting PS shader model to %u.\n", wined3d_settings.max_sm_ps); } - if (wined3d_settings.vs_mode == VS_HW) - TRACE("Allow HW vertex shaders\n"); - if (wined3d_settings.ps_mode == PS_NONE) - TRACE("Disable pixel shaders\n"); - if (wined3d_settings.glslRequested) - TRACE("If supported by your system, GL Shading Language will be used\n"); if (appkey) RegCloseKey( appkey ); if (hkey) RegCloseKey( hkey ); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index af24e69..819cb82 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -237,18 +237,6 @@ static inline float float_24_to_32(DWORD in) } } -/** - * Settings - */ -#define VS_NONE 0 -#define VS_HW 1 - -#define PS_NONE 0 -#define PS_HW 1 - -#define VBO_NONE 0 -#define VBO_HW 1 - #define ORM_BACKBUFFER 0 #define ORM_FBO 1 @@ -262,9 +250,6 @@ static inline float float_24_to_32(DWORD in) * values in wined3d_main.c as well. */ struct wined3d_settings { - /* vertex and pixel shader modes */ - int vs_mode; - int ps_mode; /* Ideally, we don't want the user to have to request GLSL. If the * hardware supports GLSL, we should use it. However, until it's fully * implemented, we'll leave it as a registry setting for developers. */ @@ -279,6 +264,9 @@ struct wined3d_settings int allow_multisampling; BOOL strict_draw_ordering; BOOL always_offscreen; + unsigned int max_sm_vs; + unsigned int max_sm_gs; + unsigned int max_sm_ps; }; extern struct wined3d_settings wined3d_settings DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Support all fixups in shader_none_color_fixup_supported().
by Alexandre Julliard 25 Jan '13

25 Jan '13

Module: wine Branch: master Commit: 6f04922de00228f209646f74016dfaa136d49714 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6f04922de00228f209646f740… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 25 10:57:18 2013 +0100 wined3d: Support all fixups in shader_none_color_fixup_supported(). --- dlls/wined3d/shader.c | 19 +++---------------- 1 files changed, 3 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 2bb5f21..44f67cc 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -32,7 +32,6 @@ #include "wined3d_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d_shader); -WINE_DECLARE_DEBUG_CHANNEL(d3d); static const char * const shader_opcode_names[] = { @@ -1554,21 +1553,9 @@ static void shader_none_get_caps(const struct wined3d_gl_info *gl_info, struct s static BOOL shader_none_color_fixup_supported(struct color_fixup_desc fixup) { - if (TRACE_ON(d3d_shader) && TRACE_ON(d3d)) - { - TRACE("Checking support for fixup:\n"); - dump_color_fixup_desc(fixup); - } - - /* Faked to make some apps happy. */ - if (!is_complex_fixup(fixup)) - { - TRACE("[OK]\n"); - return TRUE; - } - - TRACE("[FAILED]\n"); - return FALSE; + /* We "support" every possible fixup, since we don't support any shader + * model, and will never have to actually sample a texture. */ + return TRUE; } static BOOL shader_none_has_ffp_proj_control(void *shader_priv)

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
74
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 January 2013