March 2007 - Wine-Devel - list.winehq.org

Re: Allow enabling/disabling Direct3D usage of GLSL in Winecfg + update Czech locales for Winecfg

by Stefan Dösinger

> changelog entry: Allow enabling/disabling Direct3D usage of GLSL in winecfg > changelog entry: Update Czech localization for winecfg The changelog suggests that you have 2 different changesets in one path. If they do not depend on each other, please send them in seperate patches(and mails)

March 28, 2007

Re: WineD3D: Make CreateCubeTexture fail when not supported

by Felix Nawothnig

Duane Clark wrote: > On a Matrox G550, Win2k, crosscompiled on Linux with MingW: > > I:\dlls\d3d8\tests>d3d8_crosstest texture > texture.c:122:texture caps: 0x000041c7 > texture.c:110:pool=0 hr=0x8876086c > texture.c:110:pool=1 hr=0x8876086c > texture.c:110:pool=2 hr=0x8876086c > texture.c:110:pool=3 hr=0x00000000 > texture: 57 tests executed (0 marked as todo, 0 failures), 0 skipped. Thanks. Guess the patch is okay to commit then.

March 28, 2007

Re: Allow enabling/disabling Direct3D usage of GLSL in Winecfg +update Czech locales for Winecfg

by Marty Schmidt

You can send the patches as you want/will................ Martin J. Schmidt 1007 Bechtel Street Monaca, Pa. 15061-1733 724-774-6826 0r 724-622-4939 redman61(a)netzero.com ----- Original Message ----- From: "Stefan Dösinger" <stefandoesinger(a)gmx.at> To: <wine-patches(a)winehq.org>; <wine-devel(a)winehq.org> Sent: Thursday, March 29, 2007 1:59 PM Subject: Re: Allow enabling/disabling Direct3D usage of GLSL in Winecfg +update Czech locales for Winecfg Am Mittwoch 28 März 2007 23:09 schrieb Vit Hrachovy: > Hi Stephan, > GLSL depends on Czech localization update. > Should I split them into two separate patches with different numbers? > Should I send them split in two different requests? > Regards Send the localization update first, then GLSL. Number the patches, for example [1/2] winecfg: czech localization update [2/2] winecfg: add d3d options You can send them at once, but in different mails

March 28, 2007

Re: WineD3D: Make CreateCubeTexture fail when not supported

by Duane Clark

Felix Nawothnig wrote: > Not tested under Windows (does _anyone_ besides me have a Matrox? :) - > would be nice if someone with either an MGA or an really ancient GPU > could run the test on windows (if the pool=0 trace has an hr!=0 you got > one of those ancient cards :). CCing to wine-devel for that reason. On a Matrox G550, Win2k, crosscompiled on Linux with MingW: I:\dlls\d3d8\tests>d3d8_crosstest texture texture.c:122:texture caps: 0x000041c7 texture.c:110:pool=0 hr=0x8876086c texture.c:110:pool=1 hr=0x8876086c texture.c:110:pool=2 hr=0x8876086c texture.c:110:pool=3 hr=0x00000000 texture: 57 tests executed (0 marked as todo, 0 failures), 0 skipped.

March 28, 2007

Re: [2/2] wined3d: Fix GLSL cnd instruction for INF and NAN arguments

by Marty Schmidt

Can you send me a patch?? ----- Original Message ----- From: "Fabian Bieler" <der.fabe(a)gmx.net> To: <wine-patches(a)winehq.org> Sent: Thursday, March 29, 2007 1:00 PM Subject: [2/2] wined3d: Fix GLSL cnd instruction for INF and NAN arguments > > -------------------------------------------------------------------------------- >From 1bca82ab76f27dd0e636305da74ec428caf9a919 Mon Sep 17 00:00:00 2001 From: Fabian Bieler <der.fabe(a)gmx.net> Date: Thu, 29 Mar 2007 19:59:11 +0200 Subject: [PATCH] wined3d: Fix GLSL cnd instruction for INF and NAN arguments --- dlls/wined3d/glsl_shader.c | 37 +++++++++++++++++++++++-------------- 1 files changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3d04f45..3ceb935 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1156,26 +1156,35 @@ void shader_glsl_cnd(SHADER_OPCODE_ARG* arg) { glsl_src_param_t src0_param; glsl_src_param_t src1_param; glsl_src_param_t src2_param; - DWORD write_mask; - size_t mask_size; - - write_mask = shader_glsl_append_dst(arg->buffer, arg); + DWORD write_mask, cmp_channel = 0; + unsigned int i, j; if (shader->baseShader.hex_version < WINED3DPS_VERSION(1, 4)) { - mask_size = 1; + write_mask = shader_glsl_append_dst(arg->buffer, arg); shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], WINED3DSP_WRITEMASK_0, &src0_param); - } else { - mask_size = shader_glsl_get_write_mask_size(write_mask); - shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], write_mask, &src0_param); + shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], write_mask, &src1_param); + shader_glsl_add_src_param(arg, arg->src[2], arg->src_addr[2], write_mask, &src2_param); + shader_addline(arg->buffer, "%s < 0.5 ? %s : %s);\n", + src0_param.param_str, src1_param.param_str, src2_param.param_str); + return; } + /* Cycle through all source0 channels */ + for (i=0; i<4; i++) { + write_mask = 0; + /* Find the destination channels which use the current source0 channel */ + for (j=0; j<4; j++) { + if ( ((arg->src[0] >> (WINED3DSP_SWIZZLE_SHIFT + 2*j)) & 0x3) == i ) { + write_mask |= WINED3DSP_WRITEMASK_0 << j; + cmp_channel = WINED3DSP_WRITEMASK_0 << j; + } + } + write_mask = shader_glsl_append_dst_ext(arg->buffer, arg, arg->dst & (~WINED3DSP_SWIZZLE_MASK | write_mask)); + if (!write_mask) continue; - shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], write_mask, &src1_param); - shader_glsl_add_src_param(arg, arg->src[2], arg->src_addr[2], write_mask, &src2_param); + shader_glsl_add_src_param(arg, arg->src[0], arg->src_addr[0], cmp_channel, &src0_param); + shader_glsl_add_src_param(arg, arg->src[1], arg->src_addr[1], write_mask, &src1_param); + shader_glsl_add_src_param(arg, arg->src[2], arg->src_addr[2], write_mask, &src2_param); - if (mask_size > 1) { - shader_addline(arg->buffer, "mix(%s, %s, vec%d(lessThan(%s, vec%d(0.5)))));\n", - src2_param.param_str, src1_param.param_str, mask_size, src0_param.param_str, mask_size); - } else { shader_addline(arg->buffer, "%s < 0.5 ? %s : %s);\n", src0_param.param_str, src1_param.param_str, src2_param.param_str); } -- 1.4.4.1 -------------------------------------------------------------------------------- > >

March 28, 2007

Re: WineD3D: Make CreateCubeTexture fail when not supported

by Felix Nawothnig

Luke Bratch wrote: > Somewhere I have an ancient Matrix MGA G200 AGP > card... If this would be of any use, I'll dig it out > and run any tests in Wine/Windows that you'd like? Sure, if you're willing to do that just because I'm lazy. :-) I was just hoping someone might be running a box with an MGA and Windows installed as I'd have to reconnect my CDROM drive, steal a HDD from my brother and install Windows first. Felix

March 28, 2007

WineD3D: Make CreateCubeTexture fail when not supported

by Luke Bratch

> Not tested under Windows (does _anyone_ besides me have a Matrox? :) - > would be nice if someone with either an MGA or an really ancient GPU > could run the test on windows (if the pool=0 trace has an hr!=0 you got > one of those ancient cards :). CCing to wine-devel for that reason. Somewhere I have an ancient Matrix MGA G200 AGP card... If this would be of any use, I'll dig it out and run any tests in Wine/Windows that you'd like? ___________________________________________________________ New Yahoo! Mail is the ultimate force in competitive emailing. Find out more at the Yahoo! Mail Championships. Plus: play games and win prizes. http://uk.rd.yahoo.com/evt=44106/*http://mail.yahoo.net/uk

March 28, 2007

Re: Alexandre Julliard : server: Add support for queuing a user APC upon async I/O completion.

by Eric Pouech

Alexandre Julliard a écrit : > Eric Pouech <eric.pouech(a)wanadoo.fr> writes: > > >> do you have a plan, when the apc routine is used, to free the >> allocated async_fileio (in dlls/ntdll/file.c) ? >> > > The async_fileio is freed by the async callback that performs the > actual I/O, that's not going to change. The APC here is the user APC > called after completion, currently called directly by fileio_terminate > (which is wrong since we may not be in an alertable wait at this > point). > > ok, I didn't see you where queueing in fact two APCs A+ -- Eric Pouech "The problem with designing something completely foolproof is to underestimate the ingenuity of a complete idiot." (Douglas Adams)

March 28, 2007

WineD3D: Make CreateCubeTexture fail when not supported

by Felix Nawothnig

Not tested under Windows (does _anyone_ besides me have a Matrox? :) - would be nice if someone with either an MGA or an really ancient GPU could run the test on windows (if the pool=0 trace has an hr!=0 you got one of those ancient cards :). CCing to wine-devel for that reason. --- dlls/d3d8/tests/texture.c | 27 +++++++++++++++++++++++++++ dlls/wined3d/device.c | 5 +++++ 2 files changed, 32 insertions(+), 0 deletions(-)

March 28, 2007

Re: Regression?

by Bill Medland

On Wed, 2007-28-03 at 08:41 +0100, Robert Shearman wrote: > Bill Medland wrote: > > I just tripped over this; I think it crept in over the past couple of > > weeks. Anyone know what's going on? I'm not going to waste days > > searching for it if it is obvious to someone. > > > > wine: Call from 0x126ce72 to unimplemented function > > nspr4.dll.PR_GetPhysicalMemorySize, aborting > > > > Looks like you've got an incompatible nspr4.dll installed. Try > downloading and installing the Gecko engine from sourceforge again. > Thanks Rob I had installed some other stuff which included a nspr4.dll which sat in system32 and hid the Gecko one. Bill

March 28, 2007