July 2008 - Wine-Commits - list.winehq.org

Andrew Talbot : advapi32: Remove unneeded address-of operator from array name.
by Alexandre Julliard July 8, 2008

July 8, 2008

Module: wine Branch: master Commit: e095a08a383648ecaa18a09fa9eea48b22540bba URL: http://source.winehq.org/git/wine.git/?a=commit;h=e095a08a383648ecaa18a09fa… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Jul 7 22:40:20 2008 +0100 advapi32: Remove unneeded address-of operator from array name. --- dlls/advapi32/security.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index 2f91329..3423cbe 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -480,7 +480,7 @@ BOOL ADVAPI_GetComputerSid(PSID sid) SID_IDENTIFIER_AUTHORITY identifierAuthority = {SECURITY_NT_AUTHORITY}; DWORD id[3]; - if (RtlGenRandom(&id, sizeof(id))) + if (RtlGenRandom(id, sizeof(id))) { if (AllocateAndInitializeSid(&identifierAuthority, 4, SECURITY_NT_NON_UNIQUE, id[0], id[1], id[2], 0, 0, 0, 0, &new_sid)) {

1 0

Andrew Talbot : comctl32: Remove unneeded address-of operators from array names.
by Alexandre Julliard July 8, 2008

July 8, 2008

Module: wine Branch: master Commit: b7cc9c66b324df21f09aee9fb18a34426b97bac0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7cc9c66b324df21f09aee9fb… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Jul 7 22:40:28 2008 +0100 comctl32: Remove unneeded address-of operators from array names. --- dlls/comctl32/imagelist.c | 4 ++-- dlls/comctl32/monthcal.c | 8 ++++---- dlls/comctl32/tooltips.c | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index 660edde..a673b1b 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -658,11 +658,11 @@ ImageList_Create (INT cx, INT cy, UINT flags, himl->hbmMask = 0; /* create blending brushes */ - hbmTemp = CreateBitmap (8, 8, 1, 1, &aBitBlend25); + hbmTemp = CreateBitmap (8, 8, 1, 1, aBitBlend25); himl->hbrBlend25 = CreatePatternBrush (hbmTemp); DeleteObject (hbmTemp); - hbmTemp = CreateBitmap (8, 8, 1, 1, &aBitBlend50); + hbmTemp = CreateBitmap (8, 8, 1, 1, aBitBlend50); himl->hbrBlend50 = CreatePatternBrush (hbmTemp); DeleteObject (hbmTemp); diff --git a/dlls/comctl32/monthcal.c b/dlls/comctl32/monthcal.c index a9647cd..f3d54b1 100644 --- a/dlls/comctl32/monthcal.c +++ b/dlls/comctl32/monthcal.c @@ -1498,8 +1498,8 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam) MONTHCAL_CopyTime(&ht.st, &selArray[0]); MONTHCAL_CopyTime(&ht.st, &selArray[1]); - MONTHCAL_SetSelRange(infoPtr, (LPARAM)&selArray); - MONTHCAL_SetCurSel(infoPtr, (LPARAM)&selArray); + MONTHCAL_SetSelRange(infoPtr, (LPARAM)selArray); + MONTHCAL_SetCurSel(infoPtr, (LPARAM)selArray); TRACE("MCHT_CALENDARDATE\n"); nmsc.nmhdr.hwndFrom = infoPtr->hwndSelf; nmsc.nmhdr.idFrom = GetWindowLongPtrW(infoPtr->hwndSelf, GWLP_ID); @@ -1647,7 +1647,7 @@ MONTHCAL_MouseMove(MONTHCAL_INFO *infoPtr, WPARAM wParam, LPARAM lParam) SYSTEMTIME selArray[2]; int i; - MONTHCAL_GetSelRange(infoPtr, (LPARAM)&selArray); + MONTHCAL_GetSelRange(infoPtr, (LPARAM)selArray); i = 0; if(infoPtr->firstSelDay==selArray[0].wDay) i=1; TRACE("oldRange:%d %d %d %d\n", infoPtr->firstSelDay, selArray[0].wDay, selArray[1].wDay, i); @@ -1677,7 +1677,7 @@ MONTHCAL_MouseMove(MONTHCAL_INFO *infoPtr, WPARAM wParam, LPARAM lParam) selArray[0].wDay = tempday; } - MONTHCAL_SetSelRange(infoPtr, (LPARAM)&selArray); + MONTHCAL_SetSelRange(infoPtr, (LPARAM)selArray); } } diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index fb2191b..5368835 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -368,7 +368,7 @@ static void TOOLTIPS_GetDispInfoA(HWND hwnd, TOOLTIPS_INFO *infoPtr, TTTOOL_INFO ttnmdi.hdr.hwndFrom = hwnd; ttnmdi.hdr.idFrom = toolPtr->uId; ttnmdi.hdr.code = TTN_GETDISPINFOA; /* == TTN_NEEDTEXTA */ - ttnmdi.lpszText = (LPSTR)&ttnmdi.szText; + ttnmdi.lpszText = (LPSTR)ttnmdi.szText; ttnmdi.uFlags = toolPtr->uFlags; ttnmdi.lParam = toolPtr->lParam; @@ -424,7 +424,7 @@ static void TOOLTIPS_GetDispInfoW(HWND hwnd, TOOLTIPS_INFO *infoPtr, TTTOOL_INFO ttnmdi.hdr.hwndFrom = hwnd; ttnmdi.hdr.idFrom = toolPtr->uId; ttnmdi.hdr.code = TTN_GETDISPINFOW; /* == TTN_NEEDTEXTW */ - ttnmdi.lpszText = (LPWSTR)&ttnmdi.szText; + ttnmdi.lpszText = (LPWSTR)ttnmdi.szText; ttnmdi.uFlags = toolPtr->uFlags; ttnmdi.lParam = toolPtr->lParam;

1 0

H. Verbeet : wined3d: Store the current GLSL program in the backend' s private data.
by Alexandre Julliard July 8, 2008

July 8, 2008

Module: wine Branch: master Commit: a637fda7bf0c15db3f7812ad6a8857f3fec99490 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a637fda7bf0c15db3f7812ad6… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Mon Jul 7 21:02:57 2008 +0200 wined3d: Store the current GLSL program in the backend's private data. --- dlls/wined3d/glsl_shader.c | 17 ++++++++++------- dlls/wined3d/stateblock.c | 5 ----- dlls/wined3d/wined3d_private.h | 4 +--- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4823126..34b86a3 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -369,13 +369,14 @@ void shader_glsl_load_constants( char useVertexShader) { IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) device; + struct shader_glsl_priv *priv = (struct shader_glsl_priv *)deviceImpl->shader_priv; IWineD3DStateBlockImpl* stateBlock = deviceImpl->stateBlock; WineD3D_GL_Info *gl_info = &deviceImpl->adapter->gl_info; GLhandleARB *constant_locations; struct list *constant_list; GLhandleARB programId; - struct glsl_shader_prog_link *prog = stateBlock->glsl_program; + struct glsl_shader_prog_link *prog = priv->glsl_program; unsigned int i; if (!prog) { @@ -3145,6 +3146,7 @@ static void hardcode_local_constants(IWineD3DBaseShaderImpl *shader, WineD3D_GL_ */ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use_vs) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + struct shader_glsl_priv *priv = (struct shader_glsl_priv *)This->shader_priv; WineD3D_GL_Info *gl_info = &This->adapter->gl_info; IWineD3DPixelShader *pshader = This->stateBlock->pixelShader; IWineD3DVertexShader *vshader = This->stateBlock->vertexShader; @@ -3158,7 +3160,7 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use GLhandleARB pshader_id = use_ps ? ((IWineD3DBaseShaderImpl*)pshader)->baseShader.prgId : 0; entry = get_glsl_program_entry(This, vshader_id, pshader_id); if (entry) { - This->stateBlock->glsl_program = entry; + priv->glsl_program = entry; return; } @@ -3175,7 +3177,7 @@ static void set_glsl_shader_program(IWineD3DDevice *iface, BOOL use_ps, BOOL use add_glsl_program_entry(This, entry); /* Set the current program */ - This->stateBlock->glsl_program = entry; + priv->glsl_program = entry; /* Attach GLSL vshader */ if (vshader_id) { @@ -3356,16 +3358,17 @@ static GLhandleARB create_glsl_blt_shader(WineD3D_GL_Info *gl_info) { static void shader_glsl_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + struct shader_glsl_priv *priv = (struct shader_glsl_priv *)This->shader_priv; WineD3D_GL_Info *gl_info = &This->adapter->gl_info; GLhandleARB program_id = 0; GLenum old_vertex_color_clamp, current_vertex_color_clamp; - old_vertex_color_clamp = This->stateBlock->glsl_program ? This->stateBlock->glsl_program->vertex_color_clamp : GL_FIXED_ONLY_ARB; + old_vertex_color_clamp = priv->glsl_program ? priv->glsl_program->vertex_color_clamp : GL_FIXED_ONLY_ARB; if (useVS || usePS) set_glsl_shader_program(iface, usePS, useVS); - else This->stateBlock->glsl_program = NULL; + else priv->glsl_program = NULL; - current_vertex_color_clamp = This->stateBlock->glsl_program ? This->stateBlock->glsl_program->vertex_color_clamp : GL_FIXED_ONLY_ARB; + current_vertex_color_clamp = priv->glsl_program ? priv->glsl_program->vertex_color_clamp : GL_FIXED_ONLY_ARB; if (old_vertex_color_clamp != current_vertex_color_clamp) { if (GL_SUPPORT(ARB_COLOR_BUFFER_FLOAT)) { @@ -3376,7 +3379,7 @@ static void shader_glsl_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) { } } - program_id = This->stateBlock->glsl_program ? This->stateBlock->glsl_program->programId : 0; + program_id = priv->glsl_program ? priv->glsl_program->programId : 0; if (program_id) TRACE("Using GLSL program %u\n", program_id); GL_EXTCALL(glUseProgramObjectARB(program_id)); checkGLcall("glUseProgramObjectARB"); diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index ceb1330..a7b20ee 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -170,7 +170,6 @@ void stateblock_copy( Dest->viewport = This->viewport; Dest->material = This->material; Dest->pixelShader = This->pixelShader; - Dest->glsl_program = This->glsl_program; Dest->scissorRect = This->scissorRect; /* Lights */ @@ -1240,10 +1239,6 @@ static HRESULT WINAPI IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DStat This->textures[i] = NULL; } - /* Set default GLSL program to NULL. We won't actually create one - * until the app sets a vertex or pixel shader */ - This->glsl_program = NULL; - TRACE("-----------------------> Device defaults now set up...\n"); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 35b096b..706fdff 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -312,6 +312,7 @@ extern const shader_backend_t none_shader_backend; /* GLSL shader private data */ struct shader_glsl_priv { + struct glsl_shader_prog_link *glsl_program; GLhandleARB depth_blt_glsl_program_id; }; @@ -1610,9 +1611,6 @@ struct IWineD3DStateBlockImpl /* Sampler States */ DWORD samplerState[MAX_COMBINED_SAMPLERS][WINED3D_HIGHEST_SAMPLER_STATE + 1]; - /* Current GLSL Shader Program */ - struct glsl_shader_prog_link *glsl_program; - /* Scissor test rectangle */ RECT scissorRect;

1 0

Andrew Talbot : avifil32: Remove unneeded address-of operators from array names.
by Alexandre Julliard July 8, 2008

July 8, 2008

Module: wine Branch: master Commit: 22f2558e24d2ea9313454ed8a5ce26e6011b33dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=22f2558e24d2ea9313454ed8a… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Jul 7 22:40:24 2008 +0100 avifil32: Remove unneeded address-of operators from array names. --- dlls/avifil32/editstream.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/avifil32/editstream.c b/dlls/avifil32/editstream.c index 8b9eb55..e69d036 100644 --- a/dlls/avifil32/editstream.c +++ b/dlls/avifil32/editstream.c @@ -793,7 +793,7 @@ static HRESULT WINAPI IAVIEditStream_fnSetInfo(IAVIEditStream*iface, if (asi->dwQuality <= ICQUALITY_HIGH) This->sInfo.dwQuality = ICQUALITY_HIGH; CopyRect(&This->sInfo.rcFrame, &asi->rcFrame); - memcpy(&This->sInfo.szName, &asi->szName, sizeof(asi->szName)); + memcpy(This->sInfo.szName, asi->szName, sizeof(asi->szName)); This->sInfo.dwEditCount++; return AVIERR_OK;

1 0

Stefan Dösinger : wined3d: Move lights to the vertex pipeline states.
by Alexandre Julliard July 8, 2008

July 8, 2008

Module: wine Branch: master Commit: 95099404d58b3da3badc13ccdff131359fc3463b URL: http://source.winehq.org/git/wine.git/?a=commit;h=95099404d58b3da3badc13ccd… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 2 12:15:34 2008 -0500 wined3d: Move lights to the vertex pipeline states. --- dlls/wined3d/state.c | 25 +++++++++++++++++-------- 1 files changed, 17 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 4b53282..94798a4 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4843,14 +4843,14 @@ const struct StateEntry FFPStateTable[] = { /* , STATE_VERTEXSHADERCONSTANT */ STATE_VERTEXSHADERCONSTANT, shaderconstant }, { /* , STATE_PIXELSHADERCONSTANT */ STATE_VERTEXSHADERCONSTANT, shaderconstant }, /* Lights */ - { /* , STATE_ACTIVELIGHT(0) */ STATE_ACTIVELIGHT(0), light }, - { /* , STATE_ACTIVELIGHT(1) */ STATE_ACTIVELIGHT(1), light }, - { /* , STATE_ACTIVELIGHT(2) */ STATE_ACTIVELIGHT(2), light }, - { /* , STATE_ACTIVELIGHT(3) */ STATE_ACTIVELIGHT(3), light }, - { /* , STATE_ACTIVELIGHT(4) */ STATE_ACTIVELIGHT(4), light }, - { /* , STATE_ACTIVELIGHT(5) */ STATE_ACTIVELIGHT(5), light }, - { /* , STATE_ACTIVELIGHT(6) */ STATE_ACTIVELIGHT(6), light }, - { /* , STATE_ACTIVELIGHT(7) */ STATE_ACTIVELIGHT(7), light }, + { /* , STATE_ACTIVELIGHT(0) */ STATE_ACTIVELIGHT(0), NULL }, + { /* , STATE_ACTIVELIGHT(1) */ STATE_ACTIVELIGHT(1), NULL }, + { /* , STATE_ACTIVELIGHT(2) */ STATE_ACTIVELIGHT(2), NULL }, + { /* , STATE_ACTIVELIGHT(3) */ STATE_ACTIVELIGHT(3), NULL }, + { /* , STATE_ACTIVELIGHT(4) */ STATE_ACTIVELIGHT(4), NULL }, + { /* , STATE_ACTIVELIGHT(5) */ STATE_ACTIVELIGHT(5), NULL }, + { /* , STATE_ACTIVELIGHT(6) */ STATE_ACTIVELIGHT(6), NULL }, + { /* , STATE_ACTIVELIGHT(7) */ STATE_ACTIVELIGHT(7), NULL }, { /* Scissor rect */ STATE_SCISSORRECT, NULL }, /* Clip planes */ @@ -4947,6 +4947,15 @@ const struct StateEntryTemplate ffp_vertexstate_template[] = { { STATE_CLIPPLANE(29), { STATE_CLIPPLANE(29), clipplane }}, { STATE_CLIPPLANE(30), { STATE_CLIPPLANE(30), clipplane }}, { STATE_CLIPPLANE(31), { STATE_CLIPPLANE(31), clipplane }}, + /* Lights */ + { STATE_ACTIVELIGHT(0), { STATE_ACTIVELIGHT(0), light }}, + { STATE_ACTIVELIGHT(1), { STATE_ACTIVELIGHT(1), light }}, + { STATE_ACTIVELIGHT(2), { STATE_ACTIVELIGHT(2), light }}, + { STATE_ACTIVELIGHT(3), { STATE_ACTIVELIGHT(3), light }}, + { STATE_ACTIVELIGHT(4), { STATE_ACTIVELIGHT(4), light }}, + { STATE_ACTIVELIGHT(5), { STATE_ACTIVELIGHT(5), light }}, + { STATE_ACTIVELIGHT(6), { STATE_ACTIVELIGHT(6), light }}, + { STATE_ACTIVELIGHT(7), { STATE_ACTIVELIGHT(7), light }}, {0 /* Terminate */, { 0, 0 }}, };

1 0

Stefan Dösinger : wined3d: Move the scissor rect to the misc states.
by Alexandre Julliard July 8, 2008

July 8, 2008

Module: wine Branch: master Commit: 298c953b2574815711b6bf2edc5462f85c8226e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=298c953b2574815711b6bf2ed… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 2 12:12:00 2008 -0500 wined3d: Move the scissor rect to the misc states. --- dlls/wined3d/state.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index c28edef..4b53282 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4852,7 +4852,7 @@ const struct StateEntry FFPStateTable[] = { /* , STATE_ACTIVELIGHT(6) */ STATE_ACTIVELIGHT(6), light }, { /* , STATE_ACTIVELIGHT(7) */ STATE_ACTIVELIGHT(7), light }, - { /* Scissor rect */ STATE_SCISSORRECT, scissorrect }, + { /* Scissor rect */ STATE_SCISSORRECT, NULL }, /* Clip planes */ { /* STATE_CLIPPLANE(0) */ STATE_CLIPPLANE(0), NULL }, { /* STATE_CLIPPLANE(1) */ STATE_CLIPPLANE(1), NULL }, @@ -4905,6 +4905,7 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_STREAMSRC, { STATE_VDECL, streamsrc }}, { STATE_VDECL, { STATE_VDECL, streamsrc }}, { STATE_FRONTFACE, { STATE_FRONTFACE, frontface }}, + { STATE_SCISSORRECT, { STATE_SCISSORRECT, scissorrect }}, {0 /* Terminate */, { 0, 0 }}, };

1 0

Stefan Dösinger : wined3d: Move clipplanes to vertex states.
by Alexandre Julliard July 8, 2008

July 8, 2008

Module: wine Branch: master Commit: 3668f7508f5136820319a577f6fb36271e3649c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3668f7508f5136820319a577f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 2 12:10:42 2008 -0500 wined3d: Move clipplanes to vertex states. --- dlls/wined3d/state.c | 97 +++++++++++++++++++++++++++++++++---------------- 1 files changed, 65 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3668f7508f5136820319a…

1 0

Stefan Dösinger : wined3d: Move stream source and vshader to misc and vertex pipeline tables.
by Alexandre Julliard July 8, 2008

July 8, 2008

Module: wine Branch: master Commit: 141f31f05dff3405f26f3b7a29c943ecab866c68 URL: http://source.winehq.org/git/wine.git/?a=commit;h=141f31f05dff3405f26f3b7a2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 2 10:02:19 2008 -0500 wined3d: Move stream source and vshader to misc and vertex pipeline tables. --- dlls/wined3d/directx.c | 2 +- dlls/wined3d/state.c | 18 ++++++++++++------ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7f77604..c1f68f8 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3447,7 +3447,7 @@ static HRESULT WINAPI IWineD3DImpl_CreateDevice(IWineD3D *iface, UINT Adapter, object->shader_backend = select_shader_backend(Adapter, DeviceType); compile_state_table(object->StateTable, object->multistate_funcs, - NULL, NULL, misc_state_template, + ffp_vertexstate_template, NULL, misc_state_template, object->shader_backend->StateTable_remove); /* Prefer the vtable with functions optimized for single dirtifyable objects if the shader diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index c8bbc14..47fb87f 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3381,7 +3381,7 @@ static inline void drawPrimitiveTraceDataLocations( return; } -static void handleStreams(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { +static void streamsrc(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { IWineD3DDeviceImpl *device = stateblock->wineD3DDevice; BOOL fixup = FALSE; WineDirect3DVertexStridedData *dataLocations = &device->strided_streams; @@ -3478,8 +3478,6 @@ static void vertexdeclaration(DWORD state, IWineD3DStateBlockImpl *stateblock, W IWineD3DDeviceImpl *device = stateblock->wineD3DDevice; BOOL wasrhw = context->last_was_rhw; - handleStreams(state, stateblock, context); - /* Shaders can be implemented using ARB_PROGRAM, GLSL, or software - * here simply check whether a shader was set, or the user disabled shaders */ @@ -4837,10 +4835,10 @@ const struct StateEntry FFPStateTable[] = { /*510, WINED3DTS_WORLDMATRIX(254) */ STATE_TRANSFORM(WINED3DTS_WORLDMATRIX(254)), transform_worldex }, { /*511, WINED3DTS_WORLDMATRIX(255) */ STATE_TRANSFORM(WINED3DTS_WORLDMATRIX(255)), transform_worldex }, /* Various Vertex states follow */ - { /* , STATE_STREAMSRC */ STATE_VDECL, vertexdeclaration }, + { /* , STATE_STREAMSRC */ STATE_VDECL, NULL }, { /* , STATE_INDEXBUFFER */ STATE_INDEXBUFFER, indexbuffer }, - { /* , STATE_VDECL */ STATE_VDECL, vertexdeclaration }, - { /* , STATE_VSHADER */ STATE_VDECL, vertexdeclaration }, + { /* , STATE_VDECL */ STATE_VDECL, NULL }, + { /* , STATE_VSHADER */ STATE_VDECL, NULL }, { /* , STATE_VIEWPORT */ STATE_VIEWPORT, viewport }, { /* , STATE_VERTEXSHADERCONSTANT */ STATE_VERTEXSHADERCONSTANT, shaderconstant }, { /* , STATE_PIXELSHADERCONSTANT */ STATE_VERTEXSHADERCONSTANT, shaderconstant }, @@ -4904,6 +4902,14 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_RENDER(WINED3DRS_DESTBLENDALPHA), { STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), state_blend }}, { STATE_RENDER(WINED3DRS_DESTBLENDALPHA), { STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), state_blend }}, { STATE_RENDER(WINED3DRS_BLENDOPALPHA), { STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), state_blend }}, + { STATE_STREAMSRC, { STATE_VDECL, streamsrc }}, + { STATE_VDECL, { STATE_VDECL, streamsrc }}, + {0 /* Terminate */, { 0, 0 }}, +}; + +const struct StateEntryTemplate ffp_vertexstate_template[] = { + { STATE_VDECL, { STATE_VDECL, vertexdeclaration }}, + { STATE_VSHADER, { STATE_VDECL, vertexdeclaration }}, {0 /* Terminate */, { 0, 0 }}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 90f89fe..35b096b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -593,6 +593,7 @@ struct StateEntryTemplate }; extern const struct StateEntryTemplate misc_state_template[]; +extern const struct StateEntryTemplate ffp_vertexstate_template[]; /* "Base" state table */ extern const struct StateEntry FFPStateTable[];

1 0

Stefan Dösinger : wined3d: Make the stream source application a regular state function.
by Alexandre Julliard July 8, 2008

July 8, 2008

Module: wine Branch: master Commit: 6675374dda76c7bf1b2c9eb603bf39177d79ea9d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6675374dda76c7bf1b2c9eb60… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 2 09:33:24 2008 -0500 wined3d: Make the stream source application a regular state function. --- dlls/wined3d/state.c | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 4e0f5d8..c8bbc14 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3381,11 +3381,19 @@ static inline void drawPrimitiveTraceDataLocations( return; } -/* Helper for vertexdeclaration() */ -static inline void handleStreams(IWineD3DStateBlockImpl *stateblock, BOOL useVertexShaderFunction, WineD3DContext *context) { +static void handleStreams(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { IWineD3DDeviceImpl *device = stateblock->wineD3DDevice; BOOL fixup = FALSE; WineDirect3DVertexStridedData *dataLocations = &device->strided_streams; + BOOL useVertexShaderFunction; + + if (device->vs_selected_mode != SHADER_NONE && stateblock->vertexShader && + ((IWineD3DVertexShaderImpl *)stateblock->vertexShader)->baseShader.function != NULL) { + useVertexShaderFunction = TRUE; + } else { + useVertexShaderFunction = FALSE; + } + if(device->up_strided) { /* Note: this is a ddraw fixed-function code path */ @@ -3470,11 +3478,12 @@ static void vertexdeclaration(DWORD state, IWineD3DStateBlockImpl *stateblock, W IWineD3DDeviceImpl *device = stateblock->wineD3DDevice; BOOL wasrhw = context->last_was_rhw; + handleStreams(state, stateblock, context); + /* Shaders can be implemented using ARB_PROGRAM, GLSL, or software - * here simply check whether a shader was set, or the user disabled shaders */ - if (device->vs_selected_mode != SHADER_NONE && stateblock->vertexShader && - ((IWineD3DVertexShaderImpl *)stateblock->vertexShader)->baseShader.function != NULL) { + if (use_vs(device)) { useVertexShaderFunction = TRUE; if(((IWineD3DVertexShaderImpl *)stateblock->vertexShader)->baseShader.reg_maps.fog != context->last_was_foggy_shader) { @@ -3484,8 +3493,6 @@ static void vertexdeclaration(DWORD state, IWineD3DStateBlockImpl *stateblock, W updateFog = TRUE; } - handleStreams(stateblock, useVertexShaderFunction, context); - transformed = device->strided_streams.u.s.position_transformed; if (transformed) useVertexShaderFunction = FALSE;

1 0

Stefan Dösinger : wined3d: Move the frontfacing state to the misc state table.
by Alexandre Julliard July 8, 2008

July 8, 2008

Module: wine Branch: master Commit: eb9d3d2a8f46df7fd685a0e3120b41c105d88f35 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb9d3d2a8f46df7fd685a0e31… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 2 10:42:38 2008 -0500 wined3d: Move the frontfacing state to the misc state table. --- dlls/wined3d/state.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 2b1adba..41ac47d 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -4888,7 +4888,7 @@ const struct StateEntry FFPStateTable[] = { /* STATE_CLIPPLANE(31) */ STATE_CLIPPLANE(31), clipplane }, { /* STATE_MATERIAL */ STATE_RENDER(WINED3DRS_SPECULARENABLE), NULL }, - { /* STATE_FRONTFACE */ STATE_FRONTFACE, frontface }, + { /* STATE_FRONTFACE */ STATE_FRONTFACE, NULL }, }; const struct StateEntryTemplate misc_state_template[] = { @@ -4904,6 +4904,7 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_RENDER(WINED3DRS_BLENDOPALPHA), { STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), state_blend }}, { STATE_STREAMSRC, { STATE_VDECL, streamsrc }}, { STATE_VDECL, { STATE_VDECL, streamsrc }}, + { STATE_FRONTFACE, { STATE_FRONTFACE, frontface }}, {0 /* Terminate */, { 0, 0 }}, };

1 0