January 2014 - Wine-commits

Jacek Caban : dxdiagn: Don' t fail the whole initialization for invalid filter data in build_directshowfilters_tree.
by Alexandre Julliard 09 Jan '14

09 Jan '14

Module: wine Branch: master Commit: bcf78a227f145ccb177fcdcf766a5ab09762c46e URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcf78a227f145ccb177fcdcf7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 9 11:11:25 2014 +0100 dxdiagn: Don't fail the whole initialization for invalid filter data in build_directshowfilters_tree. --- dlls/dxdiagn/provider.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 145e5a3..76bbcf0 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -1632,16 +1632,17 @@ static HRESULT build_directshowfilters_tree(IDxDiagContainerImpl_Container *node } hr = fill_filter_container(subcont, pMoniker); + IMoniker_Release(pMoniker); if (FAILED(hr)) { + WARN("Skipping invalid filter\n"); free_information_tree(subcont); - IMoniker_Release(pMoniker); - break; + hr = S_OK; + continue; } add_subcontainer(node, subcont); i++; - IMoniker_Release(pMoniker); } IEnumMoniker_Release(pEnum);

1 0

Jacek Caban : devenum: Make CLSID_VideoCompressorCategory a special category.
by Alexandre Julliard 09 Jan '14

09 Jan '14

Module: wine Branch: master Commit: e303f1162887e5e0782d8ae908de15fc53f60b92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e303f1162887e5e0782d8ae90… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 9 11:11:35 2014 +0100 devenum: Make CLSID_VideoCompressorCategory a special category. --- dlls/devenum/createdevenum.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 11990d6..e9f9606 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -113,6 +113,7 @@ static BOOL IsSpecialCategory(const CLSID *clsid) return IsEqualGUID(clsid, &CLSID_AudioRendererCategory) || IsEqualGUID(clsid, &CLSID_AudioInputDeviceCategory) || IsEqualGUID(clsid, &CLSID_VideoInputDeviceCategory) || + IsEqualGUID(clsid, &CLSID_VideoCompressorCategory) || IsEqualGUID(clsid, &CLSID_MidiRendererCategory); }

1 0

Jacek Caban : devenum: Added more strict CLSID_VideoCompressorCategory test.
by Alexandre Julliard 09 Jan '14

09 Jan '14

Module: wine Branch: master Commit: 51e3c2397ca752f5f095a61344a52886a10187c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=51e3c2397ca752f5f095a6134… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 9 11:11:45 2014 +0100 devenum: Added more strict CLSID_VideoCompressorCategory test. --- dlls/devenum/tests/devenum.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index c7f765b..b6158d6 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -29,6 +29,8 @@ #include "uuids.h" static const WCHAR friendly_name[] = {'F','r','i','e','n','d','l','y','N','a','m','e',0}; +static const WCHAR fcc_handlerW[] = {'F','c','c','H','a','n','d','l','e','r',0}; +static const WCHAR mrleW[] = {'m','r','l','e',0}; struct category { @@ -52,6 +54,7 @@ static void test_devenum(IBindCtx *bind_ctx) HRESULT res; ICreateDevEnum* create_devenum; IEnumMoniker* enum_moniker = NULL; + BOOL have_mrle = FALSE; int i; res = CoCreateInstance(&CLSID_SystemDeviceEnum, NULL, CLSCTX_INPROC, @@ -96,6 +99,17 @@ static void test_devenum(IBindCtx *bind_ctx) { trace(" ???\n"); } + + if (IsEqualGUID(&CLSID_VideoCompressorCategory, am_categories[i].clsid)) { + /* Test well known compressor to ensure that we really enumerate codecs */ + hr = IPropertyBag_Read(prop_bag, fcc_handlerW, &var, NULL); + if (SUCCEEDED(hr)) { + ok(V_VT(&var) == VT_BSTR, "V_VT(var) = %d\n", V_VT(&var)); + if(!lstrcmpW(V_BSTR(&var), mrleW)) + have_mrle = TRUE; + VariantClear(&var); + } + } } if (prop_bag) @@ -107,6 +121,10 @@ static void test_devenum(IBindCtx *bind_ctx) } ICreateDevEnum_Release(create_devenum); + + /* 64-bit windows are missing mrle codec */ + if(sizeof(void*) == 4) + ok(have_mrle, "mrle codec not found\n"); } /* CLSID_CDeviceMoniker */

1 0

Frédéric Delanoy : crypt32: Use BOOL type where appropriate.
by Alexandre Julliard 09 Jan '14

09 Jan '14

Module: wine Branch: master Commit: 4cece0dd43c2fb0e44fafd6e85dfcbae31bccbd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cece0dd43c2fb0e44fafd6e8… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jan 8 03:37:51 2014 +0100 crypt32: Use BOOL type where appropriate. --- dlls/crypt32/encode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/encode.c b/dlls/crypt32/encode.c index 7590012..29b3a66 100644 --- a/dlls/crypt32/encode.c +++ b/dlls/crypt32/encode.c @@ -2077,7 +2077,7 @@ static BOOL CRYPT_AsnEncodeNumericString(const CERT_NAME_VALUE *value, return ret; } -static inline int isprintableW(WCHAR wc) +static inline BOOL isprintableW(WCHAR wc) { return isalnumW(wc) || isspaceW(wc) || wc == '\'' || wc == '(' || wc == ')' || wc == '+' || wc == ',' || wc == '-' || wc == '.' ||

1 0

Frédéric Delanoy : mountmgr.sys: Use BOOL type where appropriate.
by Alexandre Julliard 09 Jan '14

09 Jan '14

Module: wine Branch: master Commit: 290cd163580a3c43f1b775200e69bea22234593c URL: http://source.winehq.org/git/wine.git/?a=commit;h=290cd163580a3c43f1b775200… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Jan 8 03:37:52 2014 +0100 mountmgr.sys: Use BOOL type where appropriate. --- dlls/mountmgr.sys/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c index 005ec5e..028c17f 100644 --- a/dlls/mountmgr.sys/device.c +++ b/dlls/mountmgr.sys/device.c @@ -534,7 +534,7 @@ static void set_drive_info( struct dos_drive *drive, int letter, struct volume * } } -static inline int is_valid_device( struct stat *st ) +static inline BOOL is_valid_device( struct stat *st ) { #if defined(linux) || defined(__sun__) return S_ISBLK( st->st_mode );

1 0

Bruno Jesus : ws2_32/tests: Add broken for a WSALookupServiceBegin test in NT.
by Alexandre Julliard 09 Jan '14

09 Jan '14

Module: wine Branch: master Commit: 0d965c14e9932226aa9446c01707790c73284bd4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d965c14e9932226aa9446c01… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Jan 9 00:32:12 2014 -0200 ws2_32/tests: Add broken for a WSALookupServiceBegin test in NT. --- dlls/ws2_32/tests/sock.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 86a829e..f8dc5a5 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7381,7 +7381,8 @@ todo_wine ok(ret == SOCKET_ERROR, "WSALookupServiceBeginW should have failed\n"); todo_wine ok(error == WSAEINVAL - || broken(error == ERROR_INVALID_PARAMETER) /* <= XP */ + || broken(error == ERROR_INVALID_PARAMETER) /* == XP */ + || broken(error == WSAEFAULT) /* == NT */ || broken(error == WSASERVICE_NOT_FOUND) /* == 2000 */, "expected 10022, got %d\n", error); @@ -7399,7 +7400,7 @@ todo_wine error = WSAGetLastError(); if(ret && error == ERROR_INVALID_PARAMETER) { - win_skip("the current WSALookupServiceBeginW test is not supported in win 2000\n"); + win_skip("the current WSALookupServiceBeginW test is not supported in win <= 2000\n"); return; }

1 0

Jacek Caban : widl: Make identifiers file more compatible with midl.
by Alexandre Julliard 09 Jan '14

09 Jan '14

Module: wine Branch: master Commit: 0df819eecff79533bd5cc3b71bc81b063d3901e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0df819eecff79533bd5cc3b71… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 9 12:15:02 2014 +0100 widl: Make identifiers file more compatible with midl. --- tools/widl/header.c | 2 +- tools/widl/header.h | 2 -- tools/widl/widl.c | 38 ++++++++++++++++++++++++++++++++++---- 3 files changed, 35 insertions(+), 7 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index bd9f21c..4ca6ed5 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -119,7 +119,7 @@ int is_conformant_array(const type_t *t) return is_array(t) && type_array_has_conformance(t); } -void write_guid(FILE *f, const char *guid_prefix, const char *name, const UUID *uuid) +static void write_guid(FILE *f, const char *guid_prefix, const char *name, const UUID *uuid) { if (!uuid) return; fprintf(f, "DEFINE_GUID(%s_%s, 0x%08x, 0x%04x, 0x%04x, 0x%02x,0x%02x, 0x%02x," diff --git a/tools/widl/header.h b/tools/widl/header.h index bf5f426..3af57d6 100644 --- a/tools/widl/header.h +++ b/tools/widl/header.h @@ -56,8 +56,6 @@ extern const type_t* get_explicit_generic_handle_type(const var_t* var); extern const var_t *get_func_handle_var( const type_t *iface, const var_t *func, unsigned char *explicit_fc, unsigned char *implicit_fc ); extern int has_out_arg_or_return(const var_t *func); -extern void write_guid(FILE *f, const char *guid_prefix, const char *name, - const UUID *uuid); extern int is_const_decl(const var_t *var); static inline int last_ptr(const type_t *type) diff --git a/tools/widl/widl.c b/tools/widl/widl.c index 902bc92..5fa67f4 100644 --- a/tools/widl/widl.c +++ b/tools/widl/widl.c @@ -446,6 +446,16 @@ void write_dlldata(const statement_list_t *stmts) free_filename_nodes(&filenames); } +static void write_id_guid(FILE *f, const char *type, const char *guid_prefix, const char *name, const UUID *uuid) +{ + if (!uuid) return; + fprintf(f, "MIDL_DEFINE_GUID(%s, %s_%s, 0x%08x, 0x%04x, 0x%04x, 0x%02x,0x%02x, 0x%02x," + "0x%02x,0x%02x,0x%02x,0x%02x,0x%02x);\n", + type, guid_prefix, name, uuid->Data1, uuid->Data2, uuid->Data3, uuid->Data4[0], + uuid->Data4[1], uuid->Data4[2], uuid->Data4[3], uuid->Data4[4], uuid->Data4[5], + uuid->Data4[6], uuid->Data4[7]); +} + static void write_id_data_stmts(const statement_list_t *stmts) { const statement_t *stmt; @@ -460,19 +470,19 @@ static void write_id_data_stmts(const statement_list_t *stmts) if (!is_object(type) && !is_attr(type->attrs, ATTR_DISPINTERFACE)) continue; uuid = get_attrp(type->attrs, ATTR_UUID); - write_guid(idfile, is_attr(type->attrs, ATTR_DISPINTERFACE) ? "DIID" : "IID", + write_id_guid(idfile, "IID", is_attr(type->attrs, ATTR_DISPINTERFACE) ? "DIID" : "IID", type->name, uuid); } else if (type_get_type(type) == TYPE_COCLASS) { const UUID *uuid = get_attrp(type->attrs, ATTR_UUID); - write_guid(idfile, "CLSID", type->name, uuid); + write_id_guid(idfile, "CLSID", "CLSID", type->name, uuid); } } else if (stmt->type == STMT_LIBRARY) { const UUID *uuid = get_attrp(stmt->u.lib->attrs, ATTR_UUID); - write_guid(idfile, "LIBID", stmt->u.lib->name, uuid); + write_id_guid(idfile, "IID", "LIBID", stmt->u.lib->name, uuid); write_id_data_stmts(stmt->u.lib->stmts); } } @@ -492,13 +502,33 @@ void write_id_data(const statement_list_t *stmts) fprintf(idfile, "from %s - Do not edit ***/\n\n", input_idl_name); fprintf(idfile, "#include <rpc.h>\n"); fprintf(idfile, "#include <rpcndr.h>\n\n"); - fprintf(idfile, "#include <initguid.h>\n\n"); + + fprintf(idfile, "#ifdef _MIDL_USE_GUIDDEF_\n\n"); + + fprintf(idfile, "#ifndef INITGUID\n"); + fprintf(idfile, "#define INITGUID\n"); + fprintf(idfile, "#include <guiddef.h>\n"); + fprintf(idfile, "#undef INITGUID\n"); + fprintf(idfile, "#else\n"); + fprintf(idfile, "#include <guiddef.h>\n"); + fprintf(idfile, "#endif\n\n"); + + fprintf(idfile, "#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \\\n"); + fprintf(idfile, " DEFINE_GUID(name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8)\n\n"); + + fprintf(idfile, "#else\n\n"); + + fprintf(idfile, "#define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \\\n"); + fprintf(idfile, " const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}\n\n"); + + fprintf(idfile, "#endif\n\n"); start_cplusplus_guard(idfile); write_id_data_stmts(stmts); fprintf(idfile, "\n"); end_cplusplus_guard(idfile); + fprintf(idfile, "#undef MIDL_DEFINE_GUID\n" ); fclose(idfile); }

1 0

Dmitry Timoshkov : msxml3: Remove unused IUnknown *outer parameter from object constructors.
by Alexandre Julliard 09 Jan '14

09 Jan '14

Module: wine Branch: master Commit: cdc9eff5d2cb46a0a50bdde1f5822a00b7317c58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cdc9eff5d2cb46a0a50bdde1f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 9 20:57:58 2014 +0900 msxml3: Remove unused IUnknown *outer parameter from object constructors. --- dlls/msxml3/domdoc.c | 8 ++++---- dlls/msxml3/factory.c | 8 ++++---- dlls/msxml3/httprequest.c | 14 +++++++------- dlls/msxml3/msxml_private.h | 26 +++++++++++++------------- dlls/msxml3/mxnamespace.c | 4 ++-- dlls/msxml3/mxwriter.c | 10 ++++------ dlls/msxml3/saxreader.c | 6 +++--- dlls/msxml3/schema.c | 8 ++++---- dlls/msxml3/stylesheet.c | 8 +++----- dlls/msxml3/xmldoc.c | 10 +++++----- dlls/msxml3/xmlelem.c | 18 +++++++++--------- dlls/msxml3/xmlparser.c | 7 ++----- dlls/msxml3/xmlview.c | 13 +++++-------- 13 files changed, 65 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cdc9eff5d2cb46a0a50bd…

1 0

Henri Verbeet : wined3d: Reset the command stream state as well in wined3d_device_reset().
by Alexandre Julliard 09 Jan '14

09 Jan '14

Module: wine Branch: master Commit: 4d93adf75e21cd09677e8e21e009d1b57435c452 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4d93adf75e21cd09677e8e21e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 9 12:16:58 2014 +0100 wined3d: Reset the command stream state as well in wined3d_device_reset(). --- dlls/wined3d/cs.c | 29 +++++++++++++++++++++++++++++ dlls/wined3d/device.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 31 insertions(+) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 3d9a07c..ef10e9d 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -48,6 +48,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_TRANSFORM, WINED3D_CS_OP_SET_CLIP_PLANE, WINED3D_CS_OP_SET_MATERIAL, + WINED3D_CS_OP_RESET_STATE, }; struct wined3d_cs_present @@ -218,6 +219,11 @@ struct wined3d_cs_set_material const struct wined3d_material *material; }; +struct wined3d_cs_reset_state +{ + enum wined3d_cs_op opcode; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -814,6 +820,28 @@ void wined3d_cs_emit_set_material(struct wined3d_cs *cs, const struct wined3d_ma cs->ops->submit(cs); } +static void wined3d_cs_exec_reset_state(struct wined3d_cs *cs, const void *data) +{ + struct wined3d_adapter *adapter = cs->device->adapter; + HRESULT hr; + + state_cleanup(&cs->state); + memset(&cs->state, 0, sizeof(cs->state)); + if (FAILED(hr = state_init(&cs->state, &cs->fb, &adapter->gl_info, &adapter->d3d_info, + WINED3D_STATE_NO_REF | WINED3D_STATE_INIT_DEFAULT))) + ERR("Failed to initialize CS state, hr %#x.\n", hr); +} + +void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) +{ + struct wined3d_cs_reset_state *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_RESET_STATE; + + cs->ops->submit(cs); +} + static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, @@ -838,6 +866,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_SET_TRANSFORM */ wined3d_cs_exec_set_transform, /* WINED3D_CS_OP_SET_CLIP_PLANE */ wined3d_cs_exec_set_clip_plane, /* WINED3D_CS_OP_SET_MATERIAL */ wined3d_cs_exec_set_material, + /* WINED3D_CS_OP_RESET_STATE */ wined3d_cs_exec_reset_state, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 46fdee2..46492c4 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4406,6 +4406,7 @@ HRESULT CDECL wined3d_device_reset(struct wined3d_device *device, wined3d_stateblock_decref(device->recording); device->recording = NULL; } + wined3d_cs_emit_reset_state(device->cs); state_cleanup(&device->state); if (device->d3d_initialized) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0735116..6d38ec2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2473,6 +2473,7 @@ void wined3d_cs_emit_draw(struct wined3d_cs *cs, UINT start_idx, UINT index_coun void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *swapchain, const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region, DWORD flags) DECLSPEC_HIDDEN; +void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_clip_plane(struct wined3d_cs *cs, UINT plane_idx, const struct wined3d_vec4 *plane) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_constant_buffer(struct wined3d_cs *cs, enum wined3d_shader_type type,

1 0

Henri Verbeet : wined3d: Introduce a common GLSL handler for scalar instructions.
by Alexandre Julliard 09 Jan '14

09 Jan '14

Module: wine Branch: master Commit: d412eb568e225adb42a1a317e85e6b976ba173db URL: http://source.winehq.org/git/wine.git/?a=commit;h=d412eb568e225adb42a1a317e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 9 12:16:59 2014 +0100 wined3d: Introduce a common GLSL handler for scalar instructions. --- dlls/wined3d/glsl_shader.c | 146 ++++++++++++++------------------------------ 1 file changed, 47 insertions(+), 99 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 8fdbb68..351742b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2588,33 +2588,6 @@ static void shader_glsl_pow(const struct wined3d_shader_instruction *ins) } } -/* Process the WINED3DSIO_LOG instruction in GLSL (dst = log2(|src0|)) - * Src0 is a scalar. Note that D3D uses the absolute of src0, while - * GLSL uses the value as-is. */ -static void shader_glsl_log(const struct wined3d_shader_instruction *ins) -{ - struct wined3d_shader_buffer *buffer = ins->ctx->buffer; - struct glsl_src_param src0_param; - DWORD dst_write_mask; - unsigned int dst_size; - - dst_write_mask = shader_glsl_append_dst(buffer, ins); - dst_size = shader_glsl_get_write_mask_size(dst_write_mask); - - shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_3, &src0_param); - - if (dst_size > 1) - { - shader_addline(buffer, "vec%u(log2(abs(%s))));\n", - dst_size, src0_param.param_str); - } - else - { - shader_addline(buffer, "log2(abs(%s)));\n", - src0_param.param_str); - } -} - /* Map the opcode 1-to-1 to the GL code (arg->dst = instruction(src0, src1, ...) */ static void shader_glsl_map2gl(const struct wined3d_shader_instruction *ins) { @@ -2688,22 +2661,54 @@ static void shader_glsl_nrm(const struct wined3d_shader_instruction *ins) } } -static void shader_glsl_exp(const struct wined3d_shader_instruction *ins) +static void shader_glsl_scalar_op(const struct wined3d_shader_instruction *ins) { struct wined3d_shader_buffer *buffer = ins->ctx->buffer; struct glsl_src_param src0_param; - DWORD dst_write_mask; + const char *prefix, *suffix; unsigned int dst_size; + DWORD dst_write_mask; dst_write_mask = shader_glsl_append_dst(buffer, ins); dst_size = shader_glsl_get_write_mask_size(dst_write_mask); shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_3, &src0_param); + switch (ins->handler_idx) + { + case WINED3DSIH_EXP: + case WINED3DSIH_EXPP: + prefix = "exp2("; + suffix = ")"; + break; + + case WINED3DSIH_LOG: + case WINED3DSIH_LOGP: + prefix = "log2(abs("; + suffix = "))"; + break; + + case WINED3DSIH_RCP: + prefix = "1.0 / "; + suffix = ""; + break; + + case WINED3DSIH_RSQ: + prefix = "inversesqrt(abs("; + suffix = "))"; + break; + + default: + prefix = ""; + suffix = ""; + FIXME("Unhandled instruction %#x.\n", ins->handler_idx); + break; + } + if (dst_size > 1) - shader_addline(buffer, "vec%u(exp2(%s)));\n", dst_size, src0_param.param_str); + shader_addline(buffer, "vec%u(%s%s%s));\n", dst_size, prefix, src0_param.param_str, suffix); else - shader_addline(buffer, "exp2(%s));\n", src0_param.param_str); + shader_addline(buffer, "%s%s%s);\n", prefix, src0_param.param_str, suffix); } /** Process the WINED3DSIO_EXPP instruction in GLSL: @@ -2717,14 +2722,13 @@ static void shader_glsl_exp(const struct wined3d_shader_instruction *ins) */ static void shader_glsl_expp(const struct wined3d_shader_instruction *ins) { - struct glsl_src_param src_param; - - shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_3, &src_param); - if (ins->ctx->reg_maps->shader_version.major < 2) { + struct glsl_src_param src_param; char dst_mask[6]; + shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_3, &src_param); + shader_addline(ins->ctx->buffer, "tmp0.x = exp2(floor(%s));\n", src_param.param_str); shader_addline(ins->ctx->buffer, "tmp0.y = %s - floor(%s);\n", src_param.param_str, src_param.param_str); shader_addline(ins->ctx->buffer, "tmp0.z = exp2(%s);\n", src_param.param_str); @@ -2733,19 +2737,10 @@ static void shader_glsl_expp(const struct wined3d_shader_instruction *ins) shader_glsl_append_dst(ins->ctx->buffer, ins); shader_glsl_get_write_mask(&ins->dst[0], dst_mask); shader_addline(ins->ctx->buffer, "tmp0%s);\n", dst_mask); - } else { - DWORD write_mask; - unsigned int mask_size; - - write_mask = shader_glsl_append_dst(ins->ctx->buffer, ins); - mask_size = shader_glsl_get_write_mask_size(write_mask); - - if (mask_size > 1) { - shader_addline(ins->ctx->buffer, "vec%d(exp2(%s)));\n", mask_size, src_param.param_str); - } else { - shader_addline(ins->ctx->buffer, "exp2(%s));\n", src_param.param_str); - } + return; } + + shader_glsl_scalar_op(ins); } static void shader_glsl_to_int(const struct wined3d_shader_instruction *ins) @@ -2782,53 +2777,6 @@ static void shader_glsl_to_float(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "float(%s));\n", src_param.param_str); } -/** Process the RCP (reciprocal or inverse) opcode in GLSL (dst = 1 / src) */ -static void shader_glsl_rcp(const struct wined3d_shader_instruction *ins) -{ - struct glsl_src_param src_param; - DWORD write_mask; - unsigned int mask_size; - - write_mask = shader_glsl_append_dst(ins->ctx->buffer, ins); - mask_size = shader_glsl_get_write_mask_size(write_mask); - shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_3, &src_param); - - if (mask_size > 1) - { - shader_addline(ins->ctx->buffer, "vec%u(1.0 / %s));\n", - mask_size, src_param.param_str); - } - else - { - shader_addline(ins->ctx->buffer, "1.0 / %s);\n", - src_param.param_str); - } -} - -static void shader_glsl_rsq(const struct wined3d_shader_instruction *ins) -{ - struct wined3d_shader_buffer *buffer = ins->ctx->buffer; - struct glsl_src_param src_param; - DWORD write_mask; - unsigned int mask_size; - - write_mask = shader_glsl_append_dst(buffer, ins); - mask_size = shader_glsl_get_write_mask_size(write_mask); - - shader_glsl_add_src_param(ins, &ins->src[0], WINED3DSP_WRITEMASK_3, &src_param); - - if (mask_size > 1) - { - shader_addline(buffer, "vec%u(inversesqrt(abs(%s))));\n", - mask_size, src_param.param_str); - } - else - { - shader_addline(buffer, "inversesqrt(abs(%s)));\n", - src_param.param_str); - } -} - /** Process signed comparison opcodes in GLSL. */ static void shader_glsl_compare(const struct wined3d_shader_instruction *ins) { @@ -6688,7 +6636,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_ENDLOOP */ shader_glsl_end, /* WINED3DSIH_ENDREP */ shader_glsl_end, /* WINED3DSIH_EQ */ shader_glsl_relop, - /* WINED3DSIH_EXP */ shader_glsl_exp, + /* WINED3DSIH_EXP */ shader_glsl_scalar_op, /* WINED3DSIH_EXPP */ shader_glsl_expp, /* WINED3DSIH_FRC */ shader_glsl_map2gl, /* WINED3DSIH_FTOI */ shader_glsl_to_int, @@ -6703,8 +6651,8 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_LABEL */ shader_glsl_label, /* WINED3DSIH_LD */ NULL, /* WINED3DSIH_LIT */ shader_glsl_lit, - /* WINED3DSIH_LOG */ shader_glsl_log, - /* WINED3DSIH_LOGP */ shader_glsl_log, + /* WINED3DSIH_LOG */ shader_glsl_scalar_op, + /* WINED3DSIH_LOGP */ shader_glsl_scalar_op, /* WINED3DSIH_LOOP */ shader_glsl_loop, /* WINED3DSIH_LRP */ shader_glsl_lrp, /* WINED3DSIH_LT */ shader_glsl_relop, @@ -6724,11 +6672,11 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_NRM */ shader_glsl_nrm, /* WINED3DSIH_PHASE */ shader_glsl_nop, /* WINED3DSIH_POW */ shader_glsl_pow, - /* WINED3DSIH_RCP */ shader_glsl_rcp, + /* WINED3DSIH_RCP */ shader_glsl_scalar_op, /* WINED3DSIH_REP */ shader_glsl_rep, /* WINED3DSIH_RET */ shader_glsl_ret, /* WINED3DSIH_ROUND_NI */ shader_glsl_map2gl, - /* WINED3DSIH_RSQ */ shader_glsl_rsq, + /* WINED3DSIH_RSQ */ shader_glsl_scalar_op, /* WINED3DSIH_SAMPLE */ NULL, /* WINED3DSIH_SAMPLE_GRAD */ NULL, /* WINED3DSIH_SAMPLE_LOD */ NULL,

1 0