wine-commits August 2008

wine-commits@winehq.org

2 participants
839 discussions

Alexandre Julliard : user32: Apply the SendMessage recursion counter to DispatchMessage too.
by Alexandre Julliard 27 Aug '08

27 Aug '08

Module: wine Branch: master Commit: bcc1bb2b36774163766a0522d2d7f80fdf09abc6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bcc1bb2b36774163766a0522d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Aug 27 13:07:30 2008 +0200 user32: Apply the SendMessage recursion counter to DispatchMessage too. --- dlls/user32/message.c | 6 ------ dlls/user32/winproc.c | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 522ff38..5990133 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -52,7 +52,6 @@ WINE_DECLARE_DEBUG_CHANNEL(key); #define WM_NCMOUSELAST (WM_NCMOUSEFIRST+(WM_MOUSELAST-WM_MOUSEFIRST)) #define MAX_PACK_COUNT 4 -#define MAX_SENDMSG_RECURSION 64 #define SYS_TIMER_RATE 55 /* min. timer rate in ms (actually 54.925)*/ @@ -1613,14 +1612,10 @@ static BOOL unpack_dde_message( HWND hwnd, UINT message, WPARAM *wparam, LPARAM static LRESULT call_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL unicode, BOOL same_thread, enum wm_char_mapping mapping ) { - struct user_thread_info *thread_info = get_user_thread_info(); LRESULT result = 0; CWPSTRUCT cwp; CWPRETSTRUCT cwpret; - if (thread_info->recursion_count > MAX_SENDMSG_RECURSION) return 0; - thread_info->recursion_count++; - if (msg & 0x80000000) { result = handle_internal_message( hwnd, msg, wparam, lparam ); @@ -1646,7 +1641,6 @@ static LRESULT call_window_proc( HWND hwnd, UINT msg, WPARAM wparam, LPARAM lpar cwpret.hwnd = hwnd; HOOK_CallHooks( WH_CALLWNDPROCRET, HC_ACTION, same_thread, (LPARAM)&cwpret, unicode ); done: - thread_info->recursion_count--; return result; } diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 6de86e8..ac5ec41 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -53,6 +53,7 @@ typedef struct tagWINDOWPROC #define WINPROC_HANDLE (~0UL >> 16) #define MAX_WINPROCS 8192 #define BUILTIN_WINPROCS 9 /* first BUILTIN_WINPROCS entries are reserved for builtin procs */ +#define MAX_WINPROC_RECURSION 64 WNDPROC EDIT_winproc_handle = 0; @@ -2177,6 +2178,7 @@ LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, LRESULT *result, BOOL unicode, enum wm_char_mapping mapping ) { + struct user_thread_info *thread_info = get_user_thread_info(); WND *wndPtr; WINDOWPROC *proc; @@ -2192,6 +2194,9 @@ BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, if (!proc) return TRUE; + if (thread_info->recursion_count > MAX_WINPROC_RECURSION) return FALSE; + thread_info->recursion_count++; + if (unicode) { if (proc->procW) @@ -2210,6 +2215,7 @@ BOOL WINPROC_call_window( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam, else WINPROC_CallProc32ATo16( call_window_proc16, hwnd, msg, wParam, lParam, result, proc->proc16 ); } + thread_info->recursion_count--; return TRUE; }

1 0

Alistair Leslie-Hughes : msxml3: Correct unsupported functions in IDispatchEx.
by Alexandre Julliard 27 Aug '08

27 Aug '08

Module: wine Branch: master Commit: ac29a3d838ed122af1d8cd9c447e55966a0cfdc7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac29a3d838ed122af1d8cd9c4… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Aug 27 16:33:40 2008 +1000 msxml3: Correct unsupported functions in IDispatchEx. --- dlls/msxml3/dispex.c | 14 +++++++------- dlls/msxml3/tests/domdoc.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 7 deletions(-) diff --git a/dlls/msxml3/dispex.c b/dlls/msxml3/dispex.c index 4156c78..438cf48 100644 --- a/dlls/msxml3/dispex.c +++ b/dlls/msxml3/dispex.c @@ -542,42 +542,42 @@ static HRESULT WINAPI DispatchEx_InvokeEx(IDispatchEx *iface, DISPID id, LCID lc static HRESULT WINAPI DispatchEx_DeleteMemberByName(IDispatchEx *iface, BSTR bstrName, DWORD grfdex) { DispatchEx *This = impl_from_IDispatchEx(iface); - FIXME("(%p)->(%s %x)\n", This, debugstr_w(bstrName), grfdex); - return S_OK; + TRACE("Not implemented in native msxml3 (%p)->(%s %x)\n", This, debugstr_w(bstrName), grfdex); + return E_NOTIMPL; } static HRESULT WINAPI DispatchEx_DeleteMemberByDispID(IDispatchEx *iface, DISPID id) { DispatchEx *This = impl_from_IDispatchEx(iface); - FIXME("(%p)->(%x)\n", This, id); + TRACE("Not implemented in native msxml3 (%p)->(%x)\n", This, id); return E_NOTIMPL; } static HRESULT WINAPI DispatchEx_GetMemberProperties(IDispatchEx *iface, DISPID id, DWORD grfdexFetch, DWORD *pgrfdex) { DispatchEx *This = impl_from_IDispatchEx(iface); - FIXME("(%p)->(%x %x %p)\n", This, id, grfdexFetch, pgrfdex); + TRACE("Not implemented in native msxml3 (%p)->(%x %x %p)\n", This, id, grfdexFetch, pgrfdex); return E_NOTIMPL; } static HRESULT WINAPI DispatchEx_GetMemberName(IDispatchEx *iface, DISPID id, BSTR *pbstrName) { DispatchEx *This = impl_from_IDispatchEx(iface); - FIXME("(%p)->(%x %p)\n", This, id, pbstrName); + TRACE("Not implemented in native msxml3 (%p)->(%x %p)\n", This, id, pbstrName); return E_NOTIMPL; } static HRESULT WINAPI DispatchEx_GetNextDispID(IDispatchEx *iface, DWORD grfdex, DISPID id, DISPID *pid) { DispatchEx *This = impl_from_IDispatchEx(iface); - FIXME("(%p)->(%x %x %p)\n", This, grfdex, id, pid); + TRACE(" Not implemented in native msxml3 (%p)->(%x %x %p)\n", This, grfdex, id, pid); return E_NOTIMPL; } static HRESULT WINAPI DispatchEx_GetNameSpaceParent(IDispatchEx *iface, IUnknown **ppunk) { DispatchEx *This = impl_from_IDispatchEx(iface); - FIXME("(%p)->(%p)\n", This, ppunk); + TRACE("Not implemented in native msxml3 (%p)->(%p)\n", This, ppunk); return E_NOTIMPL; } diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 8a48882..8af6b02 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -26,6 +26,7 @@ #include "ole2.h" #include "xmldom.h" #include "msxml2.h" +#include "msxml2did.h" #include "dispex.h" #include <stdio.h> #include <assert.h> @@ -1544,7 +1545,39 @@ static void test_getElementsByTagName(void) r = IXMLDOMNodeList_QueryInterface( node_list, &IID_IDispatchEx, (void**)&dispex ); ok( r == S_OK, "rets %08x\n", r); if( r == S_OK ) + { + DISPID dispid = DISPID_XMLDOM_NODELIST_RESET; + DWORD dwProps = 0; + BSTR sName; + IUnknown *pUnk; + + sName = SysAllocString( szstar ); + r = IDispatchEx_DeleteMemberByName(dispex, sName, fdexNameCaseSensitive); + ok(r == E_NOTIMPL, "expected E_NOTIMPL got %08x\n", r); + SysFreeString( sName ); + + r = IDispatchEx_DeleteMemberByDispID(dispex, dispid); + ok(r == E_NOTIMPL, "expected E_NOTIMPL got %08x\n", r); + + r = IDispatchEx_GetMemberProperties(dispex, dispid, grfdexPropCanAll, &dwProps); + ok(r == E_NOTIMPL, "expected E_NOTIMPL got %08x\n", r); + ok(dwProps == 0, "expected 0 got %d\n", dwProps); + + r = IDispatchEx_GetMemberName(dispex, dispid, &sName); + ok(r == E_NOTIMPL, "expected E_NOTIMPL got %08x\n", r); + if(sName) + SysFreeString(sName); + + r = IDispatchEx_GetNextDispID(dispex, fdexEnumDefault, DISPID_XMLDOM_NODELIST_RESET, &dispid); + ok(r == E_NOTIMPL, "expected E_NOTIMPL got %08x\n", r); + + r = IDispatchEx_GetNameSpaceParent(dispex, &pUnk); + ok(r == E_NOTIMPL, "expected E_NOTIMPL got %08x\n", r); + if(r == S_OK) + IUnknown_Release(pUnk); + IDispatchEx_Release( dispex ); + } IXMLDOMNodeList_Release( node_list );

1 0

Stefan Dösinger : wined3d: Make the texture stage mapping nvrc independent.
by Alexandre Julliard 27 Aug '08

27 Aug '08

Module: wine Branch: master Commit: 462ddaa25404cd1a07135f5d7acdd2e298d7dfad URL: http://source.winehq.org/git/wine.git/?a=commit;h=462ddaa25404cd1a07135f5d7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 21 13:23:38 2008 -0500 wined3d: Make the texture stage mapping nvrc independent. --- dlls/wined3d/device.c | 3 ++- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 98b1910..a569e96 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3750,7 +3750,8 @@ static void device_map_fixed_function_samplers(IWineD3DDeviceImpl *This) { device_update_fixed_function_usage_map(This); - if (!GL_SUPPORT(NV_REGISTER_COMBINERS) || This->stateBlock->lowest_disabled_stage <= This->max_ffp_textures) { + if (This->max_ffp_textures == This->max_ffp_texture_stages || + This->stateBlock->lowest_disabled_stage <= This->max_ffp_textures) { for (i = 0; i < This->stateBlock->lowest_disabled_stage; ++i) { if (!This->fixed_function_usage_map[i]) continue; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c897e70..53ea543 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3608,6 +3608,7 @@ static HRESULT WINAPI IWineD3DImpl_CreateDevice(IWineD3D *iface, UINT Adapter, object->frag_pipe = frag_pipeline; frag_pipeline->get_caps(DeviceType, &GLINFO_LOCATION, &ffp_caps); object->max_ffp_textures = ffp_caps.MaxSimultaneousTextures; + object->max_ffp_texture_stages = ffp_caps.MaxTextureBlendStages; compile_state_table(object->StateTable, object->multistate_funcs, &GLINFO_LOCATION, ffp_vertexstate_template, frag_pipeline, misc_state_template); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8daee2d..fdb56b5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -859,7 +859,7 @@ struct IWineD3DDeviceImpl const struct fragment_pipeline *frag_pipe; const struct blit_shader *blitter; - unsigned int max_ffp_textures; + unsigned int max_ffp_textures, max_ffp_texture_stages; /* To store */ BOOL view_ident; /* true iff view matrix is identity */

1 0

Stefan Dösinger : wined3d: Remove unneeded code.
by Alexandre Julliard 27 Aug '08

27 Aug '08

Module: wine Branch: master Commit: 0e2713a1e15ad0814581497879798ee9678593ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e2713a1e15ad081458149787… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 21 13:16:07 2008 -0500 wined3d: Remove unneeded code. The fixed function backend disables the extension. Also messing with the final combiner shouldn't be needed if nvrc is disabled. --- dlls/wined3d/context.c | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index fb3fcc4..66206bd 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -740,10 +740,6 @@ static inline void SetupForBlit(IWineD3DDeviceImpl *This, WineD3DContext *contex /* Disable all textures. The caller can then bind a texture it wants to blit * from */ - if(GL_SUPPORT(NV_REGISTER_COMBINERS)) { - glDisable(GL_REGISTER_COMBINERS_NV); - checkGLcall("glDisable(GL_REGISTER_COMBINERS_NV)"); - } if (GL_SUPPORT(ARB_MULTITEXTURE)) { /* The blitting code uses (for now) the fixed function pipeline, so make sure to reset all fixed * function texture unit. No need to care for higher samplers @@ -855,11 +851,6 @@ static inline void SetupForBlit(IWineD3DDeviceImpl *This, WineD3DContext *contex Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_SPECULARENABLE), StateTable); checkGLcall("glDisable(GL_COLOR_SUM_EXT)"); } - if (GL_SUPPORT(NV_REGISTER_COMBINERS)) { - GL_EXTCALL(glFinalCombinerInputNV(GL_VARIABLE_B_NV, GL_SPARE0_NV, GL_UNSIGNED_IDENTITY_NV, GL_RGB)); - Context_MarkStateDirty(context, STATE_RENDER(WINED3DRS_SPECULARENABLE), StateTable); - checkGLcall("glFinalCombinerInputNV"); - } /* Setup transforms */ glMatrixMode(GL_MODELVIEW);

1 0

Stefan Dösinger : wined3d: Remove dead code.
by Alexandre Julliard 27 Aug '08

27 Aug '08

Module: wine Branch: master Commit: a674ae71ae6b599214f19a52dc1265545cc3be70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a674ae71ae6b599214f19a52d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 21 13:14:38 2008 -0500 wined3d: Remove dead code. --- dlls/wined3d/device.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 92c3f75..98b1910 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4603,9 +4603,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetTextureStageState(IWineD3DDevice *if This->stateBlock->lowest_disabled_stage = i; TRACE("New lowest disabled: %d\n", i); } - if(GL_SUPPORT(NV_REGISTER_COMBINERS) && !This->stateBlock->pixelShader) { - /* TODO: Built a stage -> texture unit mapping for register combiners */ - } } IWineD3DDeviceImpl_MarkStateDirty(This, STATE_TEXTURESTAGE(Stage, Type));

1 0

Stefan Dösinger : wined3d: Remove some junk.
by Alexandre Julliard 27 Aug '08

27 Aug '08

Module: wine Branch: master Commit: 43fe6b0bcfcdfb1265b51cf54a29a4feef8f67a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=43fe6b0bcfcdfb1265b51cf54… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Aug 21 12:47:14 2008 -0500 wined3d: Remove some junk. --- dlls/wined3d/drawprim.c | 8 -------- 1 files changed, 0 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index b0f6a53..3be34d3 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -32,14 +32,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_draw); #include <stdio.h> #include <math.h> -#if 0 /* TODO */ -extern IWineD3DVertexShaderImpl* VertexShaders[64]; -extern IWineD3DVertexDeclarationImpl* VertexShaderDeclarations[64]; -extern IWineD3DPixelShaderImpl* PixelShaders[64]; - -#undef GL_VERSION_1_4 /* To be fixed, caused by mesa headers */ -#endif - /* Issues the glBegin call for gl given the primitive type and count */ static DWORD primitiveToGl(WINED3DPRIMITIVETYPE PrimitiveType, DWORD NumPrimitives,

1 0

Stefan Dösinger : wined3d: Update the arbfp shader on a texturetransformflags change.
by Alexandre Julliard 27 Aug '08

27 Aug '08

Module: wine Branch: master Commit: dda59e361c1be741ff5f5088bd40b100f3a6e787 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dda59e361c1be741ff5f5088b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 17 00:15:55 2008 +0200 wined3d: Update the arbfp shader on a texturetransformflags change. --- dlls/wined3d/arb_program_shader.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index eb3eed8..86faaf2 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2962,6 +2962,12 @@ static void state_arbfp_fog(DWORD state, IWineD3DStateBlockImpl *stateblock, Win } } +static void textransform(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { + if(!isStateDirty(context, STATE_PIXELSHADER)) { + fragment_prog_arbfp(state, stateblock, context); + } +} + #undef GLINFO_LOCATION static const struct StateEntryTemplate arbfp_fragmentstate_template[] = { @@ -3099,6 +3105,14 @@ static const struct StateEntryTemplate arbfp_fragmentstate_template[] = { { STATE_RENDER(WINED3DRS_FOGTABLEMODE), { STATE_RENDER(WINED3DRS_FOGENABLE), state_arbfp_fog }, 0 }, { STATE_RENDER(WINED3DRS_FOGVERTEXMODE), { STATE_RENDER(WINED3DRS_FOGENABLE), state_arbfp_fog }, 0 }, { STATE_RENDER(WINED3DRS_SRGBWRITEENABLE), { STATE_PIXELSHADER, fragment_prog_arbfp }, 0 }, + {STATE_TEXTURESTAGE(0,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(0, WINED3DTSS_TEXTURETRANSFORMFLAGS), textransform }, 0 }, + {STATE_TEXTURESTAGE(1,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(1, WINED3DTSS_TEXTURETRANSFORMFLAGS), textransform }, 0 }, + {STATE_TEXTURESTAGE(2,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(2, WINED3DTSS_TEXTURETRANSFORMFLAGS), textransform }, 0 }, + {STATE_TEXTURESTAGE(3,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(3, WINED3DTSS_TEXTURETRANSFORMFLAGS), textransform }, 0 }, + {STATE_TEXTURESTAGE(4,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(4, WINED3DTSS_TEXTURETRANSFORMFLAGS), textransform }, 0 }, + {STATE_TEXTURESTAGE(5,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(5, WINED3DTSS_TEXTURETRANSFORMFLAGS), textransform }, 0 }, + {STATE_TEXTURESTAGE(6,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(6, WINED3DTSS_TEXTURETRANSFORMFLAGS), textransform }, 0 }, + {STATE_TEXTURESTAGE(7,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(7, WINED3DTSS_TEXTURETRANSFORMFLAGS), textransform }, 0 }, {0 /* Terminate */, { 0, 0 }, 0 }, };

1 0

Stefan Dösinger : wined3d: Handle texture transforms in the TEXTURETRANSFORMFLAGS state.
by Alexandre Julliard 27 Aug '08

27 Aug '08

Module: wine Branch: master Commit: 8f20b882bb36a2eb04234e727ca45c9921715e85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f20b882bb36a2eb04234e727… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 26 14:25:56 2008 -0500 wined3d: Handle texture transforms in the TEXTURETRANSFORMFLAGS state. This is a nop by itself, but it makes it easier for fragment pipelines to read WINED3DTSS_TEXTURETRANSFORMFLAGS. --- dlls/wined3d/state.c | 40 ++++++++++++++++++++-------------------- 1 files changed, 20 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 31c76ae..22b0e7b 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3105,7 +3105,7 @@ void tex_alphaop(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext } static void transform_texture(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { - DWORD texUnit = state - STATE_TRANSFORM(WINED3DTS_TEXTURE0); + DWORD texUnit = (state - STATE_TEXTURESTAGE(0, 0)) / WINED3D_HIGHEST_TEXTURE_STATE; DWORD mapped_stage = stateblock->wineD3DDevice->texUnitMap[texUnit]; BOOL generated; int coordIdx; @@ -3375,7 +3375,7 @@ static void tex_coordindex(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine /* Update the texture matrix */ if(!isStateDirty(context, STATE_TRANSFORM(WINED3DTS_TEXTURE0 + stage))) { - transform_texture(STATE_TRANSFORM(WINED3DTS_TEXTURE0 + stage), stateblock, context); + transform_texture(STATE_TEXTURESTAGE(stage, WINED3DTSS_TEXTURETRANSFORMFLAGS), stateblock, context); } if(!isStateDirty(context, STATE_VDECL) && context->namedArraysLoaded) { @@ -3448,7 +3448,7 @@ static void sampler_texmatrix(DWORD state, IWineD3DStateBlockImpl *stateblock, W if(texIsPow2 || context->lastWasPow2Texture[sampler]) { context->lastWasPow2Texture[sampler] = texIsPow2; - transform_texture(STATE_TRANSFORM(WINED3DTS_TEXTURE0 + stateblock->wineD3DDevice->texUnitMap[sampler]), stateblock, context); + transform_texture(STATE_TEXTURESTAGE(stateblock->wineD3DDevice->texUnitMap[sampler], WINED3DTSS_TEXTURETRANSFORMFLAGS), stateblock, context); } } } @@ -4624,7 +4624,7 @@ static void vertexdeclaration(DWORD state, IWineD3DStateBlockImpl *stateblock, W int i; for(i = 0; i < MAX_TEXTURES; i++) { if(!isStateDirty(context, STATE_TRANSFORM(WINED3DTS_TEXTURE0 + i))) { - transform_texture(STATE_TRANSFORM(WINED3DTS_TEXTURE0 + i), stateblock, context); + transform_texture(STATE_TEXTURESTAGE(i, WINED3DTSS_TEXTURETRANSFORMFLAGS), stateblock, context); } } } @@ -5053,14 +5053,14 @@ const struct StateEntryTemplate ffp_vertexstate_template[] = { /* Transform states follow */ { STATE_TRANSFORM(WINED3DTS_VIEW), { STATE_TRANSFORM(WINED3DTS_VIEW), transform_view }, 0 }, { STATE_TRANSFORM(WINED3DTS_PROJECTION), { STATE_TRANSFORM(WINED3DTS_PROJECTION), transform_projection}, 0 }, - { STATE_TRANSFORM(WINED3DTS_TEXTURE0), { STATE_TRANSFORM(WINED3DTS_TEXTURE0), transform_texture }, 0 }, - { STATE_TRANSFORM(WINED3DTS_TEXTURE1), { STATE_TRANSFORM(WINED3DTS_TEXTURE1), transform_texture }, 0 }, - { STATE_TRANSFORM(WINED3DTS_TEXTURE2), { STATE_TRANSFORM(WINED3DTS_TEXTURE2), transform_texture }, 0 }, - { STATE_TRANSFORM(WINED3DTS_TEXTURE3), { STATE_TRANSFORM(WINED3DTS_TEXTURE3), transform_texture }, 0 }, - { STATE_TRANSFORM(WINED3DTS_TEXTURE4), { STATE_TRANSFORM(WINED3DTS_TEXTURE4), transform_texture }, 0 }, - { STATE_TRANSFORM(WINED3DTS_TEXTURE5), { STATE_TRANSFORM(WINED3DTS_TEXTURE5), transform_texture }, 0 }, - { STATE_TRANSFORM(WINED3DTS_TEXTURE6), { STATE_TRANSFORM(WINED3DTS_TEXTURE6), transform_texture }, 0 }, - { STATE_TRANSFORM(WINED3DTS_TEXTURE7), { STATE_TRANSFORM(WINED3DTS_TEXTURE7), transform_texture }, 0 }, + { STATE_TRANSFORM(WINED3DTS_TEXTURE0), { STATE_TEXTURESTAGE(0,WINED3DTSS_TEXTURETRANSFORMFLAGS), transform_texture }, 0 }, + { STATE_TRANSFORM(WINED3DTS_TEXTURE1), { STATE_TEXTURESTAGE(0,WINED3DTSS_TEXTURETRANSFORMFLAGS), transform_texture }, 0 }, + { STATE_TRANSFORM(WINED3DTS_TEXTURE2), { STATE_TEXTURESTAGE(0,WINED3DTSS_TEXTURETRANSFORMFLAGS), transform_texture }, 0 }, + { STATE_TRANSFORM(WINED3DTS_TEXTURE3), { STATE_TEXTURESTAGE(0,WINED3DTSS_TEXTURETRANSFORMFLAGS), transform_texture }, 0 }, + { STATE_TRANSFORM(WINED3DTS_TEXTURE4), { STATE_TEXTURESTAGE(0,WINED3DTSS_TEXTURETRANSFORMFLAGS), transform_texture }, 0 }, + { STATE_TRANSFORM(WINED3DTS_TEXTURE5), { STATE_TEXTURESTAGE(0,WINED3DTSS_TEXTURETRANSFORMFLAGS), transform_texture }, 0 }, + { STATE_TRANSFORM(WINED3DTS_TEXTURE6), { STATE_TEXTURESTAGE(0,WINED3DTSS_TEXTURETRANSFORMFLAGS), transform_texture }, 0 }, + { STATE_TRANSFORM(WINED3DTS_TEXTURE7), { STATE_TEXTURESTAGE(0,WINED3DTSS_TEXTURETRANSFORMFLAGS), transform_texture }, 0 }, { STATE_TRANSFORM(WINED3DTS_WORLDMATRIX( 0)), { STATE_TRANSFORM(WINED3DTS_WORLDMATRIX( 0)), transform_world }, 0 }, { STATE_TRANSFORM(WINED3DTS_WORLDMATRIX( 1)), { STATE_TRANSFORM(WINED3DTS_WORLDMATRIX( 1)), transform_world }, 0 }, { STATE_TRANSFORM(WINED3DTS_WORLDMATRIX( 2)), { STATE_TRANSFORM(WINED3DTS_WORLDMATRIX( 2)), transform_world }, 0 }, @@ -5317,14 +5317,14 @@ const struct StateEntryTemplate ffp_vertexstate_template[] = { { STATE_TRANSFORM(WINED3DTS_WORLDMATRIX(253)), { STATE_TRANSFORM(WINED3DTS_WORLDMATRIX(253)), transform_world }, 0 }, { STATE_TRANSFORM(WINED3DTS_WORLDMATRIX(254)), { STATE_TRANSFORM(WINED3DTS_WORLDMATRIX(254)), transform_world }, 0 }, { STATE_TRANSFORM(WINED3DTS_WORLDMATRIX(255)), { STATE_TRANSFORM(WINED3DTS_WORLDMATRIX(255)), transform_world }, 0 }, - { STATE_TEXTURESTAGE(0,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TRANSFORM(WINED3DTS_TEXTURE0), transform_texture }, 0 }, - { STATE_TEXTURESTAGE(1,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TRANSFORM(WINED3DTS_TEXTURE1), transform_texture }, 0 }, - { STATE_TEXTURESTAGE(2,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TRANSFORM(WINED3DTS_TEXTURE2), transform_texture }, 0 }, - { STATE_TEXTURESTAGE(3,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TRANSFORM(WINED3DTS_TEXTURE3), transform_texture }, 0 }, - { STATE_TEXTURESTAGE(4,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TRANSFORM(WINED3DTS_TEXTURE4), transform_texture }, 0 }, - { STATE_TEXTURESTAGE(5,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TRANSFORM(WINED3DTS_TEXTURE5), transform_texture }, 0 }, - { STATE_TEXTURESTAGE(6,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TRANSFORM(WINED3DTS_TEXTURE6), transform_texture }, 0 }, - { STATE_TEXTURESTAGE(7,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TRANSFORM(WINED3DTS_TEXTURE7), transform_texture }, 0 }, + { STATE_TEXTURESTAGE(0,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(0,WINED3DTSS_TEXTURETRANSFORMFLAGS),transform_texture }, 0 }, + { STATE_TEXTURESTAGE(1,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(1,WINED3DTSS_TEXTURETRANSFORMFLAGS),transform_texture }, 0 }, + { STATE_TEXTURESTAGE(2,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(2,WINED3DTSS_TEXTURETRANSFORMFLAGS),transform_texture }, 0 }, + { STATE_TEXTURESTAGE(3,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(3,WINED3DTSS_TEXTURETRANSFORMFLAGS),transform_texture }, 0 }, + { STATE_TEXTURESTAGE(4,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(4,WINED3DTSS_TEXTURETRANSFORMFLAGS),transform_texture }, 0 }, + { STATE_TEXTURESTAGE(5,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(5,WINED3DTSS_TEXTURETRANSFORMFLAGS),transform_texture }, 0 }, + { STATE_TEXTURESTAGE(6,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(6,WINED3DTSS_TEXTURETRANSFORMFLAGS),transform_texture }, 0 }, + { STATE_TEXTURESTAGE(7,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TEXTURESTAGE(7,WINED3DTSS_TEXTURETRANSFORMFLAGS),transform_texture }, 0 }, { STATE_TEXTURESTAGE(0, WINED3DTSS_TEXCOORDINDEX), { STATE_TEXTURESTAGE(0, WINED3DTSS_TEXCOORDINDEX), tex_coordindex }, 0 }, { STATE_TEXTURESTAGE(1, WINED3DTSS_TEXCOORDINDEX), { STATE_TEXTURESTAGE(1, WINED3DTSS_TEXCOORDINDEX), tex_coordindex }, 0 }, { STATE_TEXTURESTAGE(2, WINED3DTSS_TEXCOORDINDEX), { STATE_TEXTURESTAGE(2, WINED3DTSS_TEXCOORDINDEX), tex_coordindex }, 0 },

1 0

Stefan Dösinger : wined3d: Clean up the texbeml parameter forward.
by Alexandre Julliard 27 Aug '08

27 Aug '08

Module: wine Branch: master Commit: 8dcc6b66dc3588fce1c0b847ef9c9c636ddcaff3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dcc6b66dc3588fce1c0b847e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Aug 20 11:31:05 2008 -0500 wined3d: Clean up the texbeml parameter forward. There's no point in separating scale and luminance since they're uploaded at the same time. We still want to separate the stages though. --- dlls/wined3d/state.c | 49 ++++++++----------------------------------------- 1 files changed, 8 insertions(+), 41 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 5b92420..31c76ae 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3407,10 +3407,6 @@ static void shaderconstant(DWORD state, IWineD3DStateBlockImpl *stateblock, Wine static void tex_bumpenvlscale(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { DWORD stage = (state - STATE_TEXTURESTAGE(0, 0)) / WINED3D_HIGHEST_TEXTURE_STATE; - union { - DWORD d; - float f; - } tmpvalue; if(stateblock->pixelShader && stage != 0 && ((IWineD3DPixelShaderImpl *) stateblock->pixelShader)->baseShader.reg_maps.luminanceparams[stage]) { @@ -3422,35 +3418,6 @@ static void tex_bumpenvlscale(DWORD state, IWineD3DStateBlockImpl *stateblock, W shaderconstant(STATE_PIXELSHADERCONSTANT, stateblock, context); } } - - tmpvalue.d = stateblock->textureState[stage][WINED3DTSS_BUMPENVLSCALE]; - if(tmpvalue.f != 0.0) { - FIXME("WINED3DTSS_BUMPENVLSCALE not supported yet\n"); - } -} - -static void tex_bumpenvloffset(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { - DWORD stage = (state - STATE_TEXTURESTAGE(0, 0)) / WINED3D_HIGHEST_TEXTURE_STATE; - union { - DWORD d; - float f; - } tmpvalue; - - if(stateblock->pixelShader && stage != 0 && - ((IWineD3DPixelShaderImpl *) stateblock->pixelShader)->baseShader.reg_maps.luminanceparams[stage]) { - /* The pixel shader has to know the luminance offset. Do a constants update if it - * isn't scheduled anyway - */ - if(!isStateDirty(context, STATE_PIXELSHADERCONSTANT) && - !isStateDirty(context, STATE_PIXELSHADER)) { - shaderconstant(STATE_PIXELSHADERCONSTANT, stateblock, context); - } - } - - tmpvalue.d = stateblock->textureState[stage][WINED3DTSS_BUMPENVLOFFSET]; - if(tmpvalue.f != 0.0) { - FIXME("WINED3DTSS_BUMPENVLOFFSET not supported yet\n"); - } } static void sampler_texmatrix(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { @@ -4906,21 +4873,21 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT10), { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT00), shader_bumpenvmat }, 0 }, { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT11), { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT00), shader_bumpenvmat }, 0 }, { STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVLSCALE), { STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, 0 }, - { STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVLOFFSET), { STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVLOFFSET), tex_bumpenvloffset }, 0 }, + { STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVLOFFSET), { STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, 0 }, { STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVLSCALE), { STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, 0 }, - { STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVLOFFSET), { STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVLOFFSET), tex_bumpenvloffset }, 0 }, + { STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVLOFFSET), { STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, 0 }, { STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVLSCALE), { STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, 0 }, - { STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVLOFFSET), { STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVLOFFSET), tex_bumpenvloffset }, 0 }, + { STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVLOFFSET), { STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, 0 }, { STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVLSCALE), { STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, 0 }, - { STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVLOFFSET), { STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVLOFFSET), tex_bumpenvloffset }, 0 }, + { STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVLOFFSET), { STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, 0 }, { STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVLSCALE), { STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, 0 }, - { STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVLOFFSET), { STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVLOFFSET), tex_bumpenvloffset }, 0 }, + { STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVLOFFSET), { STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, 0 }, { STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVLSCALE), { STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, 0 }, - { STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVLOFFSET), { STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVLOFFSET), tex_bumpenvloffset }, 0 }, + { STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVLOFFSET), { STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, 0 }, { STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVLSCALE), { STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, 0 }, - { STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVLOFFSET), { STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVLOFFSET), tex_bumpenvloffset }, 0 }, + { STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVLOFFSET), { STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, 0 }, { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVLSCALE), { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, 0 }, - { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVLOFFSET), { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVLOFFSET), tex_bumpenvloffset }, 0 }, + { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVLOFFSET), { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, 0 }, { STATE_VIEWPORT, { STATE_VIEWPORT, viewport_miscpart }, 0 }, { STATE_INDEXBUFFER, { STATE_INDEXBUFFER, indexbuffer }, ARB_VERTEX_BUFFER_OBJECT },

1 0

Stefan Dösinger : wined3d: D3DTOP_DOTPRODUCT3 colorop overrides the alphaop.
by Alexandre Julliard 27 Aug '08

27 Aug '08

Module: wine Branch: master Commit: b294e43206dab65687dd9358f4a1c8ae396ab7fe URL: http://source.winehq.org/git/wine.git/?a=commit;h=b294e43206dab65687dd9358f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 26 14:11:47 2008 -0500 wined3d: D3DTOP_DOTPRODUCT3 colorop overrides the alphaop. Note that the fix is only implemented in the arbfp and atifs fragment pipeline. Unfortunately nvrc doesn't support dot3 as alpha operation. --- dlls/d3d9/tests/visual.c | 78 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/utils.c | 16 ++++++++-- 2 files changed, 91 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index d36411f..c889e7e 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -9576,6 +9576,82 @@ static void alphareplicate_test(IDirect3DDevice9 *device) { } +static void dp3_alpha_test(IDirect3DDevice9 *device) { + HRESULT hr; + D3DCAPS9 caps; + DWORD color; + struct vertex quad[] = { + { -1.0, -1.0, 0.1, 0x408080c0 }, + { 1.0, -1.0, 0.1, 0x408080c0 }, + { -1.0, 1.0, 0.1, 0x408080c0 }, + { 1.0, 1.0, 0.1, 0x408080c0 }, + }; + + memset(&caps, 0, sizeof(caps)); + hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); + ok(SUCCEEDED(hr), "GetDeviceCaps failed with 0x%08x\n", hr); + if (!(caps.TextureOpCaps & D3DTEXOPCAPS_DOTPRODUCT3)) { + skip("D3DTOP_DOTPRODUCT3 not supported\n"); + return; + } + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0x00000000, 1.0f, 0); + ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed with 0x%08x\n", hr); + + hr = IDirect3DDevice9_SetFVF(device, D3DFVF_XYZ | D3DFVF_DIFFUSE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetFVF failed with 0x%08x\n", hr); + + /* dp3_x4 r0, diffuse_bias, tfactor_bias + * mov r0.a, diffuse.a + * mov r0, r0.a + * + * It turns out that the 2nd line is ignored, and the dp3 result written into r0.a instead + * thus with input vec4(0.5, 0.5, 0.75, 0.25) and vec4(1.0, 1.0, 1.0, 1.0) the result is + * (0.0 * 0.5 + 0.0 * 0.5 + 0.25 * 0.5) * 4 = 0.125 * 4 = 0.5, with a bunch of inprecision. + */ + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_DOTPRODUCT3); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState failed with 0x%08x\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG1, D3DTA_DIFFUSE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState failed with 0x%08x\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLORARG2, D3DTA_TFACTOR); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState failed with 0x%08x\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_ALPHAOP, D3DTOP_SELECTARG1); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState failed with 0x%08x\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_ALPHAARG1, D3DTA_DIFFUSE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState failed with 0x%08x\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_COLOROP, D3DTOP_SELECTARG1); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState failed with 0x%08x\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_COLORARG1, D3DTA_CURRENT | D3DTA_ALPHAREPLICATE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState failed with 0x%08x\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_ALPHAOP, D3DTOP_DISABLE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState failed with 0x%08x\n", hr); + hr = IDirect3DDevice9_SetRenderState(device, D3DRS_TEXTUREFACTOR, 0xffffffff); + ok(SUCCEEDED(hr), "IDirect3DDevice9_SetRenderState failed with 0x%08x\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene failed with 0x%08x\n", hr); + if(SUCCEEDED(hr)) { + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed with 0x%08x\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(hr == D3D_OK, "IDirect3DDevice9_BeginScene failed with 0x%08x\n", hr); + } + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "IDirect3DDevice9_Present failed with 0x%08x\n", hr); + + color = getPixelColor(device, 320, 240); + ok(color_match(color, 0x00808080, 4), "dp3 alpha test 0x%08x, expected 0x00808080\n", + color); + + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_COLOROP, D3DTOP_DISABLE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState failed with 0x%08x\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 0, D3DTSS_ALPHAOP, D3DTOP_DISABLE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState failed with 0x%08x\n", hr); + hr = IDirect3DDevice9_SetTextureStageState(device, 1, D3DTSS_COLOROP, D3DTOP_DISABLE); + ok(hr == D3D_OK, "IDirect3DDevice9_SetTextureStageState failed with 0x%08x\n", hr); +} + START_TEST(visual) { IDirect3DDevice9 *device_ptr; @@ -9732,9 +9808,11 @@ START_TEST(visual) } } else skip("No ps_1_1 support\n"); + texop_test(device_ptr); texop_range_test(device_ptr); alphareplicate_test(device_ptr); + dp3_alpha_test(device_ptr); cleanup: if(device_ptr) { diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 8501544..3cce302 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1871,9 +1871,19 @@ void gen_ffp_op(IWineD3DStateBlockImpl *stateblock, struct ffp_settings *setting cop = WINED3DTOP_SELECTARG1; } - aarg1 = (args[aop] & ARG1) ? stateblock->textureState[i][WINED3DTSS_ALPHAARG1] : 0xffffffff; - aarg2 = (args[aop] & ARG2) ? stateblock->textureState[i][WINED3DTSS_ALPHAARG2] : 0xffffffff; - aarg0 = (args[aop] & ARG0) ? stateblock->textureState[i][WINED3DTSS_ALPHAARG0] : 0xffffffff; + if(cop == WINED3DTOP_DOTPRODUCT3) { + /* A dotproduct3 on the colorop overwrites the alphaop operation and replicates + * the color result to the alpha component of the destination + */ + aop = cop; + aarg1 = carg1; + aarg2 = carg2; + aarg0 = carg0; + } else { + aarg1 = (args[aop] & ARG1) ? stateblock->textureState[i][WINED3DTSS_ALPHAARG1] : 0xffffffff; + aarg2 = (args[aop] & ARG2) ? stateblock->textureState[i][WINED3DTSS_ALPHAARG2] : 0xffffffff; + aarg0 = (args[aop] & ARG0) ? stateblock->textureState[i][WINED3DTSS_ALPHAARG0] : 0xffffffff; + } if(i == 0 && stateblock->textures[0] && stateblock->renderState[WINED3DRS_COLORKEYENABLE] &&

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
84
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 August 2008