May 2010 - Wine-commits - list.winehq.org

Matteo Bruni : d3dx9: Add some version-specific checks in the shader assembler.
by Alexandre Julliard 18 May '10

18 May '10

Module: wine Branch: master Commit: c1f7faca453489b056a7cd18302a00793f2366b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1f7faca453489b056a7cd183… Author: Matteo Bruni <matteo.mystral(a)gmail.com> Date: Tue May 18 14:11:42 2010 +0200 d3dx9: Add some version-specific checks in the shader assembler. --- dlls/d3dx9_36/asmparser.c | 97 ++++++++++++++++++++++++++++++++++++++ dlls/d3dx9_36/d3dx9_36_private.h | 10 ++++ dlls/d3dx9_36/tests/asm.c | 6 ++ 3 files changed, 113 insertions(+), 0 deletions(-) diff --git a/dlls/d3dx9_36/asmparser.c b/dlls/d3dx9_36/asmparser.c index d1d75ba..bcdc85a 100644 --- a/dlls/d3dx9_36/asmparser.c +++ b/dlls/d3dx9_36/asmparser.c @@ -153,15 +153,112 @@ static void asmparser_instr(struct asm_parser *This, DWORD opcode, } } +/* Checks for unsupported source modifiers in VS (all versions) or + PS 2.0 and newer */ +static void check_legacy_srcmod(struct asm_parser *This, DWORD srcmod) { + if(srcmod == BWRITERSPSM_BIAS || srcmod == BWRITERSPSM_BIASNEG || + srcmod == BWRITERSPSM_SIGN || srcmod == BWRITERSPSM_SIGNNEG || + srcmod == BWRITERSPSM_COMP || srcmod == BWRITERSPSM_X2 || + srcmod == BWRITERSPSM_X2NEG || srcmod == BWRITERSPSM_DZ || + srcmod == BWRITERSPSM_DW) { + asmparser_message(This, "Line %u: Source modifier %s not supported in this shader version\n", + This->line_no, + debug_print_srcmod(srcmod)); + set_parse_status(This, PARSE_ERR); + } +} + +static void check_loop_swizzle(struct asm_parser *This, + const struct shader_reg *src) { + if((src->type == BWRITERSPR_LOOP && src->swizzle != BWRITERVS_NOSWIZZLE) || + (src->rel_reg && src->rel_reg->type == BWRITERSPR_LOOP && + src->rel_reg->swizzle != BWRITERVS_NOSWIZZLE)) { + asmparser_message(This, "Line %u: Swizzle not allowed on aL register\n", This->line_no); + set_parse_status(This, PARSE_ERR); + } +} + +static void check_shift_dstmod(struct asm_parser *This, DWORD shift) { + if(shift != 0) { + asmparser_message(This, "Line %u: Shift modifiers not supported in this shader version\n", + This->line_no); + set_parse_status(This, PARSE_ERR); + } +} + +static void check_ps_dstmod(struct asm_parser *This, DWORD dstmod) { + if(dstmod == BWRITERSPDM_PARTIALPRECISION || + dstmod == BWRITERSPDM_MSAMPCENTROID) { + asmparser_message(This, "Line %u: Instruction modifier %s not supported in this shader version\n", + This->line_no, + debug_print_dstmod(dstmod)); + set_parse_status(This, PARSE_ERR); + } +} + +struct allowed_reg_type { + DWORD type; + DWORD count; +}; + +static BOOL check_reg_type(const struct shader_reg *reg, + const struct allowed_reg_type *allowed) { + unsigned int i = 0; + + while(allowed[i].type != ~0U) { + if(reg->type == allowed[i].type) { + if(reg->rel_reg) return TRUE; /* The relative addressing register + can have a negative value, we + can't check the register index */ + if(reg->regnum < allowed[i].count) return TRUE; + return FALSE; + } + i++; + } + return FALSE; +} + +/* Native assembler doesn't do separate checks for src and dst registers */ +static const struct allowed_reg_type vs_3_reg_allowed[] = { + { BWRITERSPR_TEMP, 32 }, + { BWRITERSPR_INPUT, 16 }, + { BWRITERSPR_CONST, ~0U }, + { BWRITERSPR_ADDR, 1 }, + { BWRITERSPR_CONSTBOOL, 16 }, + { BWRITERSPR_CONSTINT, 16 }, + { BWRITERSPR_LOOP, 1 }, + { BWRITERSPR_LABEL, 2048 }, + { BWRITERSPR_PREDICATE, 1 }, + { BWRITERSPR_SAMPLER, 4 }, + { BWRITERSPR_OUTPUT, 12 }, + { ~0U, 0 } /* End tag */ +}; + static void asmparser_srcreg_vs_3(struct asm_parser *This, struct instruction *instr, int num, const struct shader_reg *src) { + if(!check_reg_type(src, vs_3_reg_allowed)) { + asmparser_message(This, "Line %u: Source register %s not supported in VS 3.0\n", + This->line_no, + debug_print_srcreg(src, ST_VERTEX)); + set_parse_status(This, PARSE_ERR); + } + check_loop_swizzle(This, src); + check_legacy_srcmod(This, src->srcmod); memcpy(&instr->src[num], src, sizeof(*src)); } static void asmparser_dstreg_vs_3(struct asm_parser *This, struct instruction *instr, const struct shader_reg *dst) { + if(!check_reg_type(dst, vs_3_reg_allowed)) { + asmparser_message(This, "Line %u: Destination register %s not supported in VS 3.0\n", + This->line_no, + debug_print_dstreg(dst, ST_VERTEX)); + set_parse_status(This, PARSE_ERR); + } + check_ps_dstmod(This, instr->dstmod); + check_shift_dstmod(This, instr->shift); memcpy(&instr->dst, dst, sizeof(*dst)); instr->has_dst = TRUE; } diff --git a/dlls/d3dx9_36/d3dx9_36_private.h b/dlls/d3dx9_36/d3dx9_36_private.h index a12cb99..ffecd31 100644 --- a/dlls/d3dx9_36/d3dx9_36_private.h +++ b/dlls/d3dx9_36/d3dx9_36_private.h @@ -371,6 +371,7 @@ struct bc_writer { }; /* Debug utility routines */ +const char *debug_print_srcmod(DWORD mod); const char *debug_print_dstmod(DWORD mod); const char *debug_print_dstreg(const struct shader_reg *reg, shader_type st); const char *debug_print_srcreg(const struct shader_reg *reg, shader_type st); @@ -510,6 +511,15 @@ typedef enum _BWRITERSAMPLER_TEXTURE_TYPE { typedef enum _BWRITERSHADER_PARAM_SRCMOD_TYPE { BWRITERSPSM_NONE = 0, BWRITERSPSM_NEG, + BWRITERSPSM_BIAS, + BWRITERSPSM_BIASNEG, + BWRITERSPSM_SIGN, + BWRITERSPSM_SIGNNEG, + BWRITERSPSM_COMP, + BWRITERSPSM_X2, + BWRITERSPSM_X2NEG, + BWRITERSPSM_DZ, + BWRITERSPSM_DW, BWRITERSPSM_ABS, BWRITERSPSM_ABSNEG, BWRITERSPSM_NOT, diff --git a/dlls/d3dx9_36/tests/asm.c b/dlls/d3dx9_36/tests/asm.c index 8a79dd4..b4e0ee5 100644 --- a/dlls/d3dx9_36/tests/asm.c +++ b/dlls/d3dx9_36/tests/asm.c @@ -1206,6 +1206,12 @@ static void failure_test(void) { /* shader 22: register r5 doesn't exist in PS < 1.4 */ "ps_1_3\n" "mov r5, r0\n", + /* shader 23: can't declare output registers in a pixel shader */ + "ps_3_0\n" + "dcl_positiont o0\n", + /* shader 24: _pp instruction modifier not allowed in vertex shaders */ + "vs_3_0\n" + "add_pp r0, r0, r1\n", }; HRESULT hr; unsigned int i;

1 0

Jörg Höhle : winealsa: Supply FFFFFFFF for midiOutGetVolume, no garbage.
by Alexandre Julliard 18 May '10

18 May '10

Module: wine Branch: master Commit: 3af7e99ba0bc7509e01edc4ff73aa57260b9e0b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3af7e99ba0bc7509e01edc4ff… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Jan 28 17:39:29 2010 +0100 winealsa: Supply FFFFFFFF for midiOutGetVolume, no garbage. --- dlls/winealsa.drv/midi.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 0eee1c8..49b7f94 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -1066,6 +1066,17 @@ static DWORD modUnprepare(WORD wDevID, LPMIDIHDR lpMidiHdr, DWORD dwSize) } /************************************************************************** + * modGetVolume [internal] + */ +static DWORD modGetVolume(WORD wDevID, DWORD* lpdwVolume) +{ + if (!lpdwVolume) return MMSYSERR_INVALPARAM; + if (wDevID >= MODM_NumDevs) return MMSYSERR_BADDEVICEID; + *lpdwVolume = 0xFFFFFFFF; + return (MidiOutDev[wDevID].caps.dwSupport & MIDICAPS_VOLUME) ? 0 : MMSYSERR_NOTSUPPORTED; +} + +/************************************************************************** * modReset [internal] */ static DWORD modReset(WORD wDevID) @@ -1371,7 +1382,7 @@ DWORD WINAPI ALSA_modMessage(UINT wDevID, UINT wMsg, DWORD_PTR dwUser, case MODM_GETNUMDEVS: return MODM_NumDevs; case MODM_GETVOLUME: - return 0; + return modGetVolume(wDevID, (DWORD*)dwParam1); case MODM_SETVOLUME: return 0; case MODM_RESET:

1 0

Jörg Höhle : winealsa: MOD_MIDIPORT has 0 voices and notes and FFFF ChannelMask.
by Alexandre Julliard 18 May '10

18 May '10

Module: wine Branch: master Commit: 8fa84df772c73bc1e6147b87171a29d3eb9d79a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8fa84df772c73bc1e6147b871… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Wed Apr 14 18:43:45 2010 +0200 winealsa: MOD_MIDIPORT has 0 voices and notes and FFFF ChannelMask. --- dlls/winealsa.drv/midi.c | 50 ++++++++++++++++++++++----------------------- 1 files changed, 24 insertions(+), 26 deletions(-) diff --git a/dlls/winealsa.drv/midi.c b/dlls/winealsa.drv/midi.c index 49b7f94..54ea2eb 100644 --- a/dlls/winealsa.drv/midi.c +++ b/dlls/winealsa.drv/midi.c @@ -1135,14 +1135,11 @@ static void ALSA_AddMidiPort(snd_seq_client_info_t* cinfo, snd_seq_port_info_t* MidiOutDev[MODM_NumDevs].caps.wPid = 0x0001; /* FIXME Product ID */ /* Product Version. We simply say "1" */ MidiOutDev[MODM_NumDevs].caps.vDriverVersion = 0x001; + /* The following are mandatory for MOD_MIDIPORT */ MidiOutDev[MODM_NumDevs].caps.wChannelMask = 0xFFFF; - - /* FIXME Do we have this information? - * Assuming the soundcards can handle - * MIDICAPS_VOLUME and MIDICAPS_LRVOLUME but - * not MIDICAPS_CACHE. - */ - MidiOutDev[MODM_NumDevs].caps.dwSupport = MIDICAPS_VOLUME|MIDICAPS_LRVOLUME; + MidiOutDev[MODM_NumDevs].caps.wVoices = 0; + MidiOutDev[MODM_NumDevs].caps.wNotes = 0; + MidiOutDev[MODM_NumDevs].caps.dwSupport = 0; /* Try to use both client and port names, if this is too long take the port name only. In the second case the port name should be explicit enough due to its big size. @@ -1150,22 +1147,30 @@ static void ALSA_AddMidiPort(snd_seq_client_info_t* cinfo, snd_seq_port_info_t* if ( (strlen(snd_seq_client_info_get_name(cinfo)) + strlen(snd_seq_port_info_get_name(pinfo)) + 3) < MAXPNAMELEN ) { sprintf(midiPortName, "%s - %s", snd_seq_client_info_get_name(cinfo), snd_seq_port_info_get_name(pinfo)); } else { - lstrcpynA(midiPortName, snd_seq_port_info_get_name(pinfo), MAXPNAMELEN-1); - midiPortName[MAXPNAMELEN-1] = 0; + lstrcpynA(midiPortName, snd_seq_port_info_get_name(pinfo), MAXPNAMELEN); } MultiByteToWideChar(CP_UNIXCP, 0, midiPortName, -1, MidiOutDev[MODM_NumDevs].caps.szPname, sizeof(MidiOutDev[MODM_NumDevs].caps.szPname) / sizeof(WCHAR)); MidiOutDev[MODM_NumDevs].caps.wTechnology = MIDI_AlsaToWindowsDeviceType(type); - MidiOutDev[MODM_NumDevs].caps.wVoices = 16; - - /* FIXME Is it possible to know the maximum - * number of simultaneous notes of a soundcard ? - * I believe we don't have this information, but - * it's probably equal or more than wVoices - */ - MidiOutDev[MODM_NumDevs].caps.wNotes = 16; + + if (MOD_MIDIPORT != MidiOutDev[MODM_NumDevs].caps.wTechnology) { + /* FIXME Do we have this information? + * Assuming the soundcards can handle + * MIDICAPS_VOLUME and MIDICAPS_LRVOLUME but + * not MIDICAPS_CACHE. + */ + MidiOutDev[MODM_NumDevs].caps.dwSupport = MIDICAPS_VOLUME|MIDICAPS_LRVOLUME; + MidiOutDev[MODM_NumDevs].caps.wVoices = 16; + + /* FIXME Is it possible to know the maximum + * number of simultaneous notes of a soundcard ? + * I believe we don't have this information, but + * it's probably equal or more than wVoices + */ + MidiOutDev[MODM_NumDevs].caps.wNotes = 16; + } MidiOutDev[MODM_NumDevs].bEnabled = TRUE; TRACE("MidiOut[%d]\tname='%s' techn=%d voices=%d notes=%d chnMsk=%04x support=%d\n" @@ -1201,13 +1206,7 @@ static void ALSA_AddMidiPort(snd_seq_client_info_t* cinfo, snd_seq_port_info_t* MidiInDev[MIDM_NumDevs].caps.wPid = 0x0001; /* FIXME Product ID */ /* Product Version. We simply say "1" */ MidiInDev[MIDM_NumDevs].caps.vDriverVersion = 0x001; - - /* FIXME Do we have this information? - * Assuming the soundcards can handle - * MIDICAPS_VOLUME and MIDICAPS_LRVOLUME but - * not MIDICAPS_CACHE. - */ - MidiInDev[MIDM_NumDevs].caps.dwSupport = MIDICAPS_VOLUME|MIDICAPS_LRVOLUME; + MidiInDev[MIDM_NumDevs].caps.dwSupport = 0; /* mandatory with MIDIINCAPS */ /* Try to use both client and port names, if this is too long take the port name only. In the second case the port name should be explicit enough due to its big size. @@ -1215,8 +1214,7 @@ static void ALSA_AddMidiPort(snd_seq_client_info_t* cinfo, snd_seq_port_info_t* if ( (strlen(snd_seq_client_info_get_name(cinfo)) + strlen(snd_seq_port_info_get_name(pinfo)) + 3) < MAXPNAMELEN ) { sprintf(midiPortName, "%s - %s", snd_seq_client_info_get_name(cinfo), snd_seq_port_info_get_name(pinfo)); } else { - lstrcpynA(midiPortName, snd_seq_port_info_get_name(pinfo), MAXPNAMELEN-1); - midiPortName[MAXPNAMELEN-1] = 0; + lstrcpynA(midiPortName, snd_seq_port_info_get_name(pinfo), MAXPNAMELEN); } MultiByteToWideChar(CP_UNIXCP, 0, midiPortName, -1, MidiInDev[MIDM_NumDevs].caps.szPname,

1 0

Jörg Höhle : imaadp32: Refine size checks.
by Alexandre Julliard 18 May '10

18 May '10

Module: wine Branch: master Commit: f5715f96ab78d56d25b07a59df191cc3f9cf9d60 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5715f96ab78d56d25b07a59d… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Oct 13 23:12:02 2009 +0200 imaadp32: Refine size checks. --- dlls/imaadp32.acm/imaadp32.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/imaadp32.acm/imaadp32.c b/dlls/imaadp32.acm/imaadp32.c index 9a2fb53..4e59448 100644 --- a/dlls/imaadp32.acm/imaadp32.c +++ b/dlls/imaadp32.acm/imaadp32.c @@ -657,7 +657,6 @@ static LRESULT ADPCM_FormatSuggest(PACMDRVFORMATSUGGEST adfs) adfs->cbwfxDst < sizeof(PCMWAVEFORMAT) || adfs->pwfxSrc->wFormatTag == adfs->pwfxDst->wFormatTag || ADPCM_GetFormatIndex(adfs->pwfxSrc) == 0xFFFFFFFF) return ACMERR_NOTPOSSIBLE; - /* FIXME: should do those tests against the real size (according to format tag */ /* If no suggestion for destination, then copy source value */ if (!(adfs->fdwSuggest & ACM_FORMATSUGGESTF_NCHANNELS)) @@ -684,12 +683,14 @@ static LRESULT ADPCM_FormatSuggest(PACMDRVFORMATSUGGEST adfs) switch (adfs->pwfxDst->wFormatTag) { case WAVE_FORMAT_PCM: + if (adfs->cbwfxSrc < sizeof(IMAADPCMWAVEFORMAT)) return ACMERR_NOTPOSSIBLE; adfs->pwfxDst->nBlockAlign = (adfs->pwfxDst->nChannels * adfs->pwfxDst->wBitsPerSample) / 8; adfs->pwfxDst->nAvgBytesPerSec = adfs->pwfxDst->nSamplesPerSec * adfs->pwfxDst->nBlockAlign; /* check if result is ok */ if (ADPCM_GetFormatIndex(adfs->pwfxDst) == 0xFFFFFFFF) return ACMERR_NOTPOSSIBLE; break; case WAVE_FORMAT_IMA_ADPCM: + if (adfs->cbwfxDst < sizeof(IMAADPCMWAVEFORMAT)) return ACMERR_NOTPOSSIBLE; init_wfx_ima_adpcm((IMAADPCMWAVEFORMAT*)adfs->pwfxDst); /* FIXME: not handling header overhead */ TRACE("setting spb=%u\n", ((IMAADPCMWAVEFORMAT*)adfs->pwfxDst)->wSamplesPerBlock);

1 0

Maarten Lankhorst : mciqtz32: Add command table from mciavi32.
by Alexandre Julliard 18 May '10

18 May '10

Module: wine Branch: master Commit: f65d4c5a4752c42811025e3bac9f2b904e85593a URL: http://source.winehq.org/git/wine.git/?a=commit;h=f65d4c5a4752c42811025e3ba… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Tue May 18 15:07:34 2010 +0200 mciqtz32: Add command table from mciavi32. --- dlls/mciqtz32/Makefile.in | 4 +- dlls/mciqtz32/mciavi_res.rc | 573 ++++++++++++++++++++++++++++++++++++++++ dlls/mciqtz32/mciqtz.c | 4 + dlls/mciqtz32/mciqtz_private.h | 1 + 4 files changed, 581 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f65d4c5a4752c42811025…

1 0

Michael Stefaniuc : cmdlgtst: Replace long with LONG.
by Alexandre Julliard 18 May '10

18 May '10

Module: wine Branch: master Commit: b06e30d360646127d7a308de6324e7521d2a83f8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b06e30d360646127d7a308de6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue May 18 09:46:52 2010 +0200 cmdlgtst: Replace long with LONG. --- programs/cmdlgtst/cmdlgtst.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/cmdlgtst/cmdlgtst.c b/programs/cmdlgtst/cmdlgtst.c index a4d3204..ac992ca 100644 --- a/programs/cmdlgtst/cmdlgtst.c +++ b/programs/cmdlgtst/cmdlgtst.c @@ -60,7 +60,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(cmdlgtst); struct FlagTableEntry { int ft_id; - unsigned long ft_bit; + ULONG ft_bit; }; #define EXPORT @@ -576,7 +576,7 @@ static void mwcd_SetFlags(HWND hWnd, struct FlagTableEntry *table, DWORD flags) static DWORD mwcd_GetFlags(HWND hWnd, struct FlagTableEntry * table) { int i; - unsigned long l = 0; + ULONG l = 0; for(i=0; table[i].ft_id != IDOK; i++) {

1 0

Henri Verbeet : wined3d: context_validate_onscreen_formats() may modify context->render_offscreen.
by Alexandre Julliard 18 May '10

18 May '10

Module: wine Branch: master Commit: 96cdab179245b18ef98be7cfa37f68ce43ee740e URL: http://source.winehq.org/git/wine.git/?a=commit;h=96cdab179245b18ef98be7cfa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 18 09:53:06 2010 +0200 wined3d: context_validate_onscreen_formats() may modify context->render_offscreen. I merged this by accident in be43c867a5fd06dc6b9f5b686abb22a1e17a712e. --- dlls/wined3d/context.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index d240686..ce20282 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1992,6 +1992,8 @@ void context_apply_blit_state(struct wined3d_context *context, IWineD3DDeviceImp { if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { + if (!context->render_offscreen) context_validate_onscreen_formats(device, context); + if (context->render_offscreen) { FIXME("Applying blit state for an offscreen target with ORM_FBO. This should be avoided.\n"); @@ -2003,8 +2005,6 @@ void context_apply_blit_state(struct wined3d_context *context, IWineD3DDeviceImp } else { - context_validate_onscreen_formats(device, context); - ENTER_GL(); context_bind_fbo(context, GL_FRAMEBUFFER, NULL); LEAVE_GL(); @@ -2077,9 +2077,10 @@ void context_apply_draw_state(struct wined3d_context *context, IWineD3DDeviceImp if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { + if (!context->render_offscreen) context_validate_onscreen_formats(device, context); + if (!context->render_offscreen) { - context_validate_onscreen_formats(device, context); ENTER_GL(); context_apply_fbo_state(context, GL_FRAMEBUFFER, NULL, NULL); LEAVE_GL();

1 0

Henri Verbeet : wined3d: Explicitly pass the depth/ stencil surface to context_validate_onscreen_formats().
by Alexandre Julliard 18 May '10

18 May '10

Module: wine Branch: master Commit: 4889c33da6831a909e505229bc59cf64461617ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=4889c33da6831a909e505229b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 18 09:53:07 2010 +0200 wined3d: Explicitly pass the depth/stencil surface to context_validate_onscreen_formats(). This avoids switching to offscreen rendering in context_apply_blit_state() for a depth buffer that isn't going to be used anyway. This switch would be problematic for blits to the frontbuffer, since it's always onscreen. I.e., we'd be blitting to the screen, but with offscreen transforms. --- dlls/wined3d/context.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index ce20282..9cbdd46 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1967,10 +1967,10 @@ static BOOL match_depth_stencil_format(const struct wined3d_format_desc *existin return TRUE; } /* The caller provides a context */ -static void context_validate_onscreen_formats(IWineD3DDeviceImpl *device, struct wined3d_context *context) +static void context_validate_onscreen_formats(IWineD3DDeviceImpl *device, + struct wined3d_context *context, IWineD3DSurfaceImpl *depth_stencil) { /* Onscreen surfaces are always in a swapchain */ - IWineD3DSurfaceImpl *depth_stencil = device->depth_stencil; IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *)context->current_rt->container; if (!depth_stencil) return; @@ -1992,7 +1992,7 @@ void context_apply_blit_state(struct wined3d_context *context, IWineD3DDeviceImp { if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - if (!context->render_offscreen) context_validate_onscreen_formats(device, context); + if (!context->render_offscreen) context_validate_onscreen_formats(device, context, NULL); if (context->render_offscreen) { @@ -2032,7 +2032,8 @@ void context_apply_clear_state(struct wined3d_context *context, IWineD3DDeviceIm if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - if (!context->render_offscreen) context_validate_onscreen_formats(device, context); + if (!context->render_offscreen) context_validate_onscreen_formats(device, context, depth_stencil); + ENTER_GL(); context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, render_target, depth_stencil); LEAVE_GL(); @@ -2077,7 +2078,7 @@ void context_apply_draw_state(struct wined3d_context *context, IWineD3DDeviceImp if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - if (!context->render_offscreen) context_validate_onscreen_formats(device, context); + if (!context->render_offscreen) context_validate_onscreen_formats(device, context, device->depth_stencil); if (!context->render_offscreen) {

1 0

Henri Verbeet : wined3d: Check for offscreen contexts inside context_validate_onscreen_formats() itself.
by Alexandre Julliard 18 May '10

18 May '10

Module: wine Branch: master Commit: e0d6ca57d7ca1bdc74a88e67490004838f028412 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e0d6ca57d7ca1bdc74a88e674… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 18 09:53:08 2010 +0200 wined3d: Check for offscreen contexts inside context_validate_onscreen_formats() itself. --- dlls/wined3d/context.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9cbdd46..065fceb 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1973,7 +1973,7 @@ static void context_validate_onscreen_formats(IWineD3DDeviceImpl *device, /* Onscreen surfaces are always in a swapchain */ IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *)context->current_rt->container; - if (!depth_stencil) return; + if (context->render_offscreen || !depth_stencil) return; if (match_depth_stencil_format(swapchain->ds_format, depth_stencil->resource.format_desc)) return; /* TODO: If the requested format would satisfy the needs of the existing one(reverse match), @@ -1992,7 +1992,7 @@ void context_apply_blit_state(struct wined3d_context *context, IWineD3DDeviceImp { if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - if (!context->render_offscreen) context_validate_onscreen_formats(device, context, NULL); + context_validate_onscreen_formats(device, context, NULL); if (context->render_offscreen) { @@ -2032,7 +2032,7 @@ void context_apply_clear_state(struct wined3d_context *context, IWineD3DDeviceIm if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - if (!context->render_offscreen) context_validate_onscreen_formats(device, context, depth_stencil); + context_validate_onscreen_formats(device, context, depth_stencil); ENTER_GL(); context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, render_target, depth_stencil); @@ -2078,7 +2078,7 @@ void context_apply_draw_state(struct wined3d_context *context, IWineD3DDeviceImp if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - if (!context->render_offscreen) context_validate_onscreen_formats(device, context, device->depth_stencil); + context_validate_onscreen_formats(device, context, device->depth_stencil); if (!context->render_offscreen) {

1 0

Henri Verbeet : wined3d: Correctly translate between coordinate systems in swapchain_blit().
by Alexandre Julliard 18 May '10

18 May '10

Module: wine Branch: master Commit: 7bec8e1dcb1d08e22ff4929eed024eb470933bb8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7bec8e1dcb1d08e22ff4929ee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 18 09:53:09 2010 +0200 wined3d: Correctly translate between coordinate systems in swapchain_blit(). --- dlls/wined3d/swapchain.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index eeb1278..7dca253 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -105,6 +105,8 @@ static void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_context * UINT src_h = src_rect->bottom - src_rect->top; GLenum gl_filter; const struct wined3d_gl_info *gl_info = context->gl_info; + RECT win_rect; + UINT win_h; TRACE("swapchain %p, context %p, src_rect %s, dst_rect %s.\n", This, context, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect)); @@ -114,6 +116,9 @@ static void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_context * else gl_filter = GL_LINEAR; + GetClientRect(This->win_handle, &win_rect); + win_h = win_rect.bottom - win_rect.top; + if (gl_info->fbo_ops.glBlitFramebuffer && is_identity_fixup(backbuffer->resource.format_desc->color_fixup)) { ENTER_GL(); @@ -128,8 +133,8 @@ static void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_context * /* Note that the texture is upside down */ gl_info->fbo_ops.glBlitFramebuffer(src_rect->left, src_rect->top, src_rect->right, src_rect->bottom, - dst_rect->left, dst_rect->bottom, dst_rect->right, dst_rect->top, - GL_COLOR_BUFFER_BIT, gl_filter); + dst_rect->left, win_h - dst_rect->top, dst_rect->right, win_h - dst_rect->bottom, + GL_COLOR_BUFFER_BIT, gl_filter); checkGLcall("Swapchain present blit(EXT_framebuffer_blit)\n"); LEAVE_GL(); } @@ -176,7 +181,7 @@ static void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_context * * Note that context_apply_blit_state() set up viewport and ortho to * match the surface size - we want the GL drawable(=window) size. */ glPushAttrib(GL_VIEWPORT_BIT); - glViewport(dst_rect->left, dst_rect->top, dst_rect->right, dst_rect->bottom); + glViewport(dst_rect->left, win_h - dst_rect->bottom, dst_rect->right, win_h - dst_rect->top); glMatrixMode(GL_PROJECTION); glPushMatrix(); glLoadIdentity();

1 0