wine-commits July 2008

wine-commits@winehq.org

3 participants
1114 discussions

Dylan Smith : richedit: PFE_TABLE flag is now used instead of private bTable value.
by Alexandre Julliard 09 Jul '08

09 Jul '08

Module: wine Branch: master Commit: aba425eb70adf376a71e8743f313a7e6fa306046 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aba425eb70adf376a71e8743f… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Tue Jul 8 13:38:54 2008 -0400 richedit: PFE_TABLE flag is now used instead of private bTable value. The PARAFORMAT structure has a bit in wEffects to indicate whether the paragraph is a table or not, so this should be used instead of a private bTable value, since this structure can be retrieved with EM_GETPARAFORMAT. --- dlls/riched20/caret.c | 4 +++- dlls/riched20/editor.c | 10 +++++----- dlls/riched20/editstr.h | 3 +-- dlls/riched20/para.c | 6 +++--- dlls/riched20/writer.c | 8 ++++---- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index a76f2db..08e9036 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -454,7 +454,9 @@ ME_InsertTableCellFromCursor(ME_TextEditor *editor, int nCursor) } } assert(run->type == diParagraph); - assert(run->member.para.bTable); + assert(run->member.para.pFmt); + assert(run->member.para.pFmt->dwMask & PFM_TABLE); + assert(run->member.para.pFmt->wEffects & PFE_TABLE); assert(run->member.para.pCells); p->member.run.pCell = run->member.para.pCells; } diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 8a099a6..4665845 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -452,7 +452,7 @@ static void ME_RTFParAttrHook(RTF_Info *info) { case rtfParDef: /* restores default paragraph attributes */ fmt.dwMask = PFM_ALIGNMENT | PFM_BORDER | PFM_LINESPACING | PFM_TABSTOPS | PFM_OFFSET | - PFM_RIGHTINDENT | PFM_SPACEAFTER | PFM_SPACEBEFORE | PFM_STARTINDENT; + PFM_RIGHTINDENT | PFM_SPACEAFTER | PFM_SPACEBEFORE | PFM_STARTINDENT | PFM_TABLE; /* TODO: numbering, shading */ fmt.wAlignment = PFA_LEFT; fmt.cTabCount = 0; @@ -462,8 +462,7 @@ static void ME_RTFParAttrHook(RTF_Info *info) fmt.bLineSpacingRule = 0; fmt.dySpaceBefore = fmt.dySpaceAfter = 0; fmt.dyLineSpacing = 0; - RTFFlushOutputBuffer(info); - ME_GetParagraph(info->editor->pCursors[0].pRun)->member.para.bTable = FALSE; + fmt.wEffects &= ~PFE_TABLE; break; case rtfInTable: { @@ -472,8 +471,9 @@ static void ME_RTFParAttrHook(RTF_Info *info) RTFFlushOutputBuffer(info); para = ME_GetParagraph(info->editor->pCursors[0].pRun); assert(para->member.para.pCells); - para->member.para.bTable = TRUE; - return; + fmt.dwMask |= PFM_TABLE; + fmt.wEffects |= PFE_TABLE; + break; } case rtfFirstIndent: ME_GetSelectionParaFormat(info->editor, &fmt); diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index e3f29b3..f3e837e 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -169,8 +169,7 @@ typedef struct tagME_TableCell typedef struct tagME_Paragraph { PARAFORMAT2 *pFmt; - - BOOL bTable; /* this paragraph is a table row */ + struct tagME_TableCell *pCells; /* list of cells and their properties */ struct tagME_TableCell *pLastCell; /* points to the last cell in the list */ diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index de69794..c0f1857 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -151,8 +151,6 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, ME new_para->member.para.nFlags = MEPF_REWRAP; /* FIXME copy flags (if applicable) */ /* FIXME initialize format style and call ME_SetParaFormat blah blah */ *new_para->member.para.pFmt = *run_para->member.para.pFmt; - - new_para->member.para.bTable = run_para->member.para.bTable; /* Inherit previous cell definitions if any */ new_para->member.para.pCells = NULL; @@ -174,7 +172,9 @@ ME_DisplayItem *ME_SplitParagraph(ME_TextEditor *editor, ME_DisplayItem *run, ME } /* fix paragraph properties. FIXME only needed when called from RTF reader */ - if (run_para->member.para.pCells && !run_para->member.para.bTable) + if (run_para->member.para.pCells && + !(run_para->member.para.pFmt->wEffects & PFE_TABLE + && run_para->member.para.pFmt->dwMask & PFM_TABLE)) { /* Paragraph does not have an \intbl keyword, so any table definition * stored is invalid */ diff --git a/dlls/riched20/writer.c b/dlls/riched20/writer.c index ce9e853..9845417 100644 --- a/dlls/riched20/writer.c +++ b/dlls/riched20/writer.c @@ -310,7 +310,7 @@ ME_StreamOutRTFParaProps(ME_OutStream *pStream, const ME_DisplayItem *para) if (!ME_StreamOutPrint(pStream, "\\pard")) return FALSE; - if (para->member.para.bTable) + if (fmt->dwMask & PFM_TABLE && fmt->wEffects & PFE_TABLE) strcat(props, "\\intbl"); /* TODO: PFM_BORDER. M$ does not emit any keywords for these properties, and @@ -376,8 +376,6 @@ ME_StreamOutRTFParaProps(ME_OutStream *pStream, const ME_DisplayItem *para) strcat(props, "\\rtlpar"); if (fmt->dwMask & PFM_SIDEBYSIDE && fmt->wEffects & PFE_SIDEBYSIDE) strcat(props, "\\sbys"); - if (fmt->dwMask & PFM_TABLE && fmt->dwMask & PFE_TABLE) - strcat(props, "\\intbl"); if (fmt->dwMask & PFM_OFFSET) sprintf(props + strlen(props), "\\li%d", fmt->dxOffset); @@ -704,7 +702,9 @@ ME_StreamOutRTF(ME_TextEditor *editor, ME_OutStream *pStream, int nStart, int nC return FALSE; nChars--; } else if (p->member.run.nFlags & MERF_ENDPARA) { - if (pPara->member.para.bTable) { + if (pPara->member.para.pFmt->dwMask & PFM_TABLE + && pPara->member.para.pFmt->wEffects & PFE_TABLE) + { if (!ME_StreamOutPrint(pStream, "\\row \r\n")) return FALSE; } else {

1 0

Maarten Lankhorst : quartz: Add tests for avi splitter.
by Alexandre Julliard 09 Jul '08

09 Jul '08

Module: wine Branch: master Commit: 3adf811645daaa876e1d223f98fc5428d2f79f75 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3adf811645daaa876e1d223f9… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Jul 4 18:43:31 2008 -0700 quartz: Add tests for avi splitter. --- dlls/quartz/tests/Makefile.in | 1 + dlls/quartz/tests/avisplitter.c | 463 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 464 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3adf811645daaa876e1d2…

1 0

Maarten Lankhorst : quartz: Add rewrite of avi splitter.
by Alexandre Julliard 09 Jul '08

09 Jul '08

Module: wine Branch: master Commit: 19360d41a0239970a7730756d7764be8f08970c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=19360d41a0239970a7730756d… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Jul 4 18:44:14 2008 -0700 quartz: Add rewrite of avi splitter. --- dlls/quartz/avisplit.c | 839 +++++++++++++++++++++++++++++++++--------------- 1 files changed, 579 insertions(+), 260 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=19360d41a0239970a7730…

1 0

Maarten Lankhorst : quartz: Fix deadlock with transform filter.
by Alexandre Julliard 09 Jul '08

09 Jul '08

Module: wine Branch: master Commit: 992fb02c732f8963cb70fd8167a7727911553d3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=992fb02c732f8963cb70fd816… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Fri Jul 4 16:59:22 2008 -0700 quartz: Fix deadlock with transform filter. --- dlls/quartz/acmwrapper.c | 42 ++++++++++++++++++++++++++++++++---------- dlls/quartz/avidec.c | 28 ++++++++++++++++++++++------ dlls/quartz/dsoundrender.c | 19 ++++++++++++++++++- dlls/quartz/nullrenderer.c | 26 +++++++------------------- dlls/quartz/pin.c | 8 +------- dlls/quartz/transform.c | 14 +------------- dlls/quartz/videorenderer.c | 16 ++++++++++++++++ 7 files changed, 97 insertions(+), 56 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=992fb02c732f8963cb70f…

1 0

Stefan Dösinger : wined3d: Move fog to the vertex states.
by Alexandre Julliard 09 Jul '08

09 Jul '08

Module: wine Branch: master Commit: ecc7b5fb18d39b4ff5dc565b14e4221296c18e97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecc7b5fb18d39b4ff5dc565b1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 2 20:49:43 2008 -0500 wined3d: Move fog to the vertex states. --- dlls/wined3d/state.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index f3cb7a4..ea4a5c4 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -896,7 +896,6 @@ static void state_stencilwrite(DWORD state, IWineD3DStateBlockImpl *stateblock, } static void state_fog(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { - /* TODO: Put this into the vertex type block once that is in the state table */ BOOL fogenable = stateblock->renderState[WINED3DRS_FOGENABLE]; BOOL is_ps3 = use_ps(stateblock->wineD3DDevice) && ((IWineD3DPixelShaderImpl *)stateblock->pixelShader)->baseShader.hex_version >= WINED3DPS_VERSION(3,0); @@ -3850,16 +3849,16 @@ const struct StateEntry FFPStateTable[] = { /* 25, WINED3DRS_ALPHAFUNC */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), NULL }, { /* 26, WINED3DRS_DITHERENABLE */ STATE_RENDER(WINED3DRS_DITHERENABLE), NULL }, { /* 27, WINED3DRS_ALPHABLENDENABLE */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), NULL }, - { /* 28, WINED3DRS_FOGENABLE */ STATE_RENDER(WINED3DRS_FOGENABLE), state_fog }, + { /* 28, WINED3DRS_FOGENABLE */ STATE_RENDER(WINED3DRS_FOGENABLE), NULL }, { /* 29, WINED3DRS_SPECULARENABLE */ STATE_RENDER(WINED3DRS_SPECULARENABLE), NULL }, { /* 30, WINED3DRS_ZVISIBLE */ 0 /* Not supported according to the msdn */, state_nogl }, { /* 31, WINED3DRS_SUBPIXEL */ STATE_RENDER(WINED3DRS_SUBPIXEL), NULL }, { /* 32, WINED3DRS_SUBPIXELX */ STATE_RENDER(WINED3DRS_SUBPIXELX), NULL }, { /* 33, WINED3DRS_STIPPLEDALPHA */ STATE_RENDER(WINED3DRS_STIPPLEDALPHA), NULL }, { /* 34, WINED3DRS_FOGCOLOR */ STATE_RENDER(WINED3DRS_FOGCOLOR), state_fogcolor }, - { /* 35, WINED3DRS_FOGTABLEMODE */ STATE_RENDER(WINED3DRS_FOGENABLE), state_fog }, - { /* 36, WINED3DRS_FOGSTART */ STATE_RENDER(WINED3DRS_FOGENABLE), state_fog }, - { /* 37, WINED3DRS_FOGEND */ STATE_RENDER(WINED3DRS_FOGENABLE), state_fog }, + { /* 35, WINED3DRS_FOGTABLEMODE */ STATE_RENDER(WINED3DRS_FOGENABLE), NULL }, + { /* 36, WINED3DRS_FOGSTART */ STATE_RENDER(WINED3DRS_FOGENABLE), NULL }, + { /* 37, WINED3DRS_FOGEND */ STATE_RENDER(WINED3DRS_FOGENABLE), NULL }, { /* 38, WINED3DRS_FOGDENSITY */ STATE_RENDER(WINED3DRS_FOGDENSITY), state_fogdensity }, { /* 39, WINED3DRS_STIPPLEENABLE */ STATE_RENDER(WINED3DRS_STIPPLEENABLE), state_stippleenable }, { /* 40, WINED3DRS_EDGEANTIALIAS */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), NULL }, @@ -3963,7 +3962,7 @@ const struct StateEntry FFPStateTable[] = { /*137, WINED3DRS_LIGHTING */ STATE_RENDER(WINED3DRS_LIGHTING), state_lighting }, { /*138, WINED3DRS_EXTENTS */ STATE_RENDER(WINED3DRS_EXTENTS), state_extents }, { /*139, WINED3DRS_AMBIENT */ STATE_RENDER(WINED3DRS_AMBIENT), state_ambient }, - { /*140, WINED3DRS_FOGVERTEXMODE */ STATE_RENDER(WINED3DRS_FOGENABLE), state_fog }, + { /*140, WINED3DRS_FOGVERTEXMODE */ STATE_RENDER(WINED3DRS_FOGENABLE), NULL }, { /*141, WINED3DRS_COLORVERTEX */ STATE_RENDER(WINED3DRS_COLORVERTEX), state_colormat }, { /*142, WINED3DRS_LOCALVIEWER */ STATE_RENDER(WINED3DRS_LOCALVIEWER), state_localviewer }, { /*143, WINED3DRS_NORMALIZENORMALS */ STATE_RENDER(WINED3DRS_NORMALIZENORMALS), state_normalize }, @@ -5266,6 +5265,12 @@ const struct StateEntryTemplate ffp_vertexstate_template[] = { { STATE_TEXTURESTAGE(5,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TRANSFORM(WINED3DTS_TEXTURE5), transform_texture }}, { STATE_TEXTURESTAGE(6,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TRANSFORM(WINED3DTS_TEXTURE6), transform_texture }}, { STATE_TEXTURESTAGE(7,WINED3DTSS_TEXTURETRANSFORMFLAGS),{STATE_TRANSFORM(WINED3DTS_TEXTURE7), transform_texture }}, + /* Fog */ + { STATE_RENDER(WINED3DRS_FOGENABLE), { STATE_RENDER(WINED3DRS_FOGENABLE), state_fog }}, + { STATE_RENDER(WINED3DRS_FOGTABLEMODE), { STATE_RENDER(WINED3DRS_FOGENABLE), state_fog }}, + { STATE_RENDER(WINED3DRS_FOGSTART), { STATE_RENDER(WINED3DRS_FOGENABLE), state_fog }}, + { STATE_RENDER(WINED3DRS_FOGEND), { STATE_RENDER(WINED3DRS_FOGENABLE), state_fog }}, + { STATE_RENDER(WINED3DRS_FOGVERTEXMODE), { STATE_RENDER(WINED3DRS_FOGENABLE), state_fog }}, {0 /* Terminate */, { 0, 0 }}, };

1 0

Stefan Dösinger : wined3d: Move a few more states to the misc states.
by Alexandre Julliard 09 Jul '08

09 Jul '08

Module: wine Branch: master Commit: cd9690d9d024def79f02abaab9e756a7854ef589 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd9690d9d024def79f02abaab… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 2 20:39:42 2008 -0500 wined3d: Move a few more states to the misc states. --- dlls/wined3d/state.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 31e8288..f3cb7a4 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3844,18 +3844,18 @@ const struct StateEntry FFPStateTable[] = { /* 19, WINED3DRS_SRCBLEND */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), NULL }, { /* 20, WINED3DRS_DESTBLEND */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), NULL }, { /* 21, WINED3DRS_TEXTUREMAPBLEND */ 0 /* Handled in ddraw */, state_undefined }, - { /* 22, WINED3DRS_CULLMODE */ STATE_RENDER(WINED3DRS_CULLMODE), state_cullmode }, - { /* 23, WINED3DRS_ZFUNC */ STATE_RENDER(WINED3DRS_ZFUNC), state_zfunc }, + { /* 22, WINED3DRS_CULLMODE */ STATE_RENDER(WINED3DRS_CULLMODE), NULL }, + { /* 23, WINED3DRS_ZFUNC */ STATE_RENDER(WINED3DRS_ZFUNC), NULL }, { /* 24, WINED3DRS_ALPHAREF */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), NULL }, { /* 25, WINED3DRS_ALPHAFUNC */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), NULL }, - { /* 26, WINED3DRS_DITHERENABLE */ STATE_RENDER(WINED3DRS_DITHERENABLE), state_ditherenable }, + { /* 26, WINED3DRS_DITHERENABLE */ STATE_RENDER(WINED3DRS_DITHERENABLE), NULL }, { /* 27, WINED3DRS_ALPHABLENDENABLE */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), NULL }, { /* 28, WINED3DRS_FOGENABLE */ STATE_RENDER(WINED3DRS_FOGENABLE), state_fog }, { /* 29, WINED3DRS_SPECULARENABLE */ STATE_RENDER(WINED3DRS_SPECULARENABLE), NULL }, { /* 30, WINED3DRS_ZVISIBLE */ 0 /* Not supported according to the msdn */, state_nogl }, - { /* 31, WINED3DRS_SUBPIXEL */ STATE_RENDER(WINED3DRS_SUBPIXEL), state_subpixel }, - { /* 32, WINED3DRS_SUBPIXELX */ STATE_RENDER(WINED3DRS_SUBPIXELX), state_subpixelx }, - { /* 33, WINED3DRS_STIPPLEDALPHA */ STATE_RENDER(WINED3DRS_STIPPLEDALPHA), state_stippledalpha }, + { /* 31, WINED3DRS_SUBPIXEL */ STATE_RENDER(WINED3DRS_SUBPIXEL), NULL }, + { /* 32, WINED3DRS_SUBPIXELX */ STATE_RENDER(WINED3DRS_SUBPIXELX), NULL }, + { /* 33, WINED3DRS_STIPPLEDALPHA */ STATE_RENDER(WINED3DRS_STIPPLEDALPHA), NULL }, { /* 34, WINED3DRS_FOGCOLOR */ STATE_RENDER(WINED3DRS_FOGCOLOR), state_fogcolor }, { /* 35, WINED3DRS_FOGTABLEMODE */ STATE_RENDER(WINED3DRS_FOGENABLE), state_fog }, { /* 36, WINED3DRS_FOGSTART */ STATE_RENDER(WINED3DRS_FOGENABLE), state_fog }, @@ -4933,6 +4933,12 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_RENDER(WINED3DRS_ALPHAFUNC), { STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha }}, { STATE_RENDER(WINED3DRS_COLORKEYENABLE), { STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha }}, { STATE_RENDER(WINED3DRS_LASTPIXEL), { STATE_RENDER(WINED3DRS_LASTPIXEL), state_lastpixel }}, + { STATE_RENDER(WINED3DRS_CULLMODE), { STATE_RENDER(WINED3DRS_CULLMODE), state_cullmode }}, + { STATE_RENDER(WINED3DRS_ZFUNC), { STATE_RENDER(WINED3DRS_ZFUNC), state_zfunc }}, + { STATE_RENDER(WINED3DRS_DITHERENABLE), { STATE_RENDER(WINED3DRS_DITHERENABLE), state_ditherenable }}, + { STATE_RENDER(WINED3DRS_SUBPIXEL), { STATE_RENDER(WINED3DRS_SUBPIXEL), state_subpixel }}, + { STATE_RENDER(WINED3DRS_SUBPIXELX), { STATE_RENDER(WINED3DRS_SUBPIXELX), state_subpixelx }}, + { STATE_RENDER(WINED3DRS_STIPPLEDALPHA), { STATE_RENDER(WINED3DRS_STIPPLEDALPHA), state_stippledalpha }}, {0 /* Terminate */, { 0, 0 }}, };

1 0

Stefan Dösinger : wined3d: WINED3DRS_LASTPIXEL -> misc states.
by Alexandre Julliard 09 Jul '08

09 Jul '08

Module: wine Branch: master Commit: a4c85d788ad3d5a13df76c6e1c67b99c69e0699f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4c85d788ad3d5a13df76c6e1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 2 20:20:44 2008 -0500 wined3d: WINED3DRS_LASTPIXEL -> 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 633fe2a..31e8288 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3838,7 +3838,7 @@ const struct StateEntry FFPStateTable[] = { /* 13, WINED3DRS_PLANEMASK */ STATE_RENDER(WINED3DRS_PLANEMASK), NULL }, { /* 14, WINED3DRS_ZWRITEENABLE */ STATE_RENDER(WINED3DRS_ZWRITEENABLE), NULL }, { /* 15, WINED3DRS_ALPHATESTENABLE */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), NULL }, - { /* 16, WINED3DRS_LASTPIXEL */ STATE_RENDER(WINED3DRS_LASTPIXEL), state_lastpixel }, + { /* 16, WINED3DRS_LASTPIXEL */ STATE_RENDER(WINED3DRS_LASTPIXEL), NULL }, { /* 17, WINED3DRS_TEXTUREMAG */ 0 /* Handled in ddraw */, state_undefined }, { /* 18, WINED3DRS_TEXTUREMIN */ 0 /* Handled in ddraw */, state_undefined }, { /* 19, WINED3DRS_SRCBLEND */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), NULL }, @@ -4932,6 +4932,7 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_RENDER(WINED3DRS_ALPHAREF), { STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha }}, { STATE_RENDER(WINED3DRS_ALPHAFUNC), { STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha }}, { STATE_RENDER(WINED3DRS_COLORKEYENABLE), { STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha }}, + { STATE_RENDER(WINED3DRS_LASTPIXEL), { STATE_RENDER(WINED3DRS_LASTPIXEL), state_lastpixel }}, {0 /* Terminate */, { 0, 0 }}, };

1 0

Stefan Dösinger : wined3d: Alpha states -> misc pipeline states.
by Alexandre Julliard 09 Jul '08

09 Jul '08

Module: wine Branch: master Commit: 58ef02fa69adcac6de8c3d16306e8e242cf27015 URL: http://source.winehq.org/git/wine.git/?a=commit;h=58ef02fa69adcac6de8c3d163… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 2 20:18:55 2008 -0500 wined3d: Alpha states -> misc pipeline states. --- dlls/wined3d/state.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 82f7734..633fe2a 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3837,7 +3837,7 @@ const struct StateEntry FFPStateTable[] = { /* 12, WINED3DRS_ROP2 */ STATE_RENDER(WINED3DRS_ROP2), NULL }, { /* 13, WINED3DRS_PLANEMASK */ STATE_RENDER(WINED3DRS_PLANEMASK), NULL }, { /* 14, WINED3DRS_ZWRITEENABLE */ STATE_RENDER(WINED3DRS_ZWRITEENABLE), NULL }, - { /* 15, WINED3DRS_ALPHATESTENABLE */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha }, + { /* 15, WINED3DRS_ALPHATESTENABLE */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), NULL }, { /* 16, WINED3DRS_LASTPIXEL */ STATE_RENDER(WINED3DRS_LASTPIXEL), state_lastpixel }, { /* 17, WINED3DRS_TEXTUREMAG */ 0 /* Handled in ddraw */, state_undefined }, { /* 18, WINED3DRS_TEXTUREMIN */ 0 /* Handled in ddraw */, state_undefined }, @@ -3846,8 +3846,8 @@ const struct StateEntry FFPStateTable[] = { /* 21, WINED3DRS_TEXTUREMAPBLEND */ 0 /* Handled in ddraw */, state_undefined }, { /* 22, WINED3DRS_CULLMODE */ STATE_RENDER(WINED3DRS_CULLMODE), state_cullmode }, { /* 23, WINED3DRS_ZFUNC */ STATE_RENDER(WINED3DRS_ZFUNC), state_zfunc }, - { /* 24, WINED3DRS_ALPHAREF */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha }, - { /* 25, WINED3DRS_ALPHAFUNC */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha }, + { /* 24, WINED3DRS_ALPHAREF */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), NULL }, + { /* 25, WINED3DRS_ALPHAFUNC */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), NULL }, { /* 26, WINED3DRS_DITHERENABLE */ STATE_RENDER(WINED3DRS_DITHERENABLE), state_ditherenable }, { /* 27, WINED3DRS_ALPHABLENDENABLE */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), NULL }, { /* 28, WINED3DRS_FOGENABLE */ STATE_RENDER(WINED3DRS_FOGENABLE), state_fog }, @@ -3863,7 +3863,7 @@ const struct StateEntry FFPStateTable[] = { /* 38, WINED3DRS_FOGDENSITY */ STATE_RENDER(WINED3DRS_FOGDENSITY), state_fogdensity }, { /* 39, WINED3DRS_STIPPLEENABLE */ STATE_RENDER(WINED3DRS_STIPPLEENABLE), state_stippleenable }, { /* 40, WINED3DRS_EDGEANTIALIAS */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), NULL }, - { /* 41, WINED3DRS_COLORKEYENABLE */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha }, + { /* 41, WINED3DRS_COLORKEYENABLE */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), NULL }, { /* 42, undefined */ 0, state_undefined }, { /* 43, WINED3DRS_BORDERCOLOR */ STATE_RENDER(WINED3DRS_BORDERCOLOR), state_bordercolor }, { /* 44, WINED3DRS_TEXTUREADDRESSU */ 0, /* Handled in ddraw */ state_undefined }, @@ -4928,6 +4928,10 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_RENDER(WINED3DRS_ROP2), { STATE_RENDER(WINED3DRS_ROP2), state_rop2 }}, { STATE_RENDER(WINED3DRS_PLANEMASK), { STATE_RENDER(WINED3DRS_PLANEMASK), state_planemask }}, { STATE_RENDER(WINED3DRS_ZWRITEENABLE), { STATE_RENDER(WINED3DRS_ZWRITEENABLE), state_zwritenable }}, + { STATE_RENDER(WINED3DRS_ALPHATESTENABLE), { STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha }}, + { STATE_RENDER(WINED3DRS_ALPHAREF), { STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha }}, + { STATE_RENDER(WINED3DRS_ALPHAFUNC), { STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha }}, + { STATE_RENDER(WINED3DRS_COLORKEYENABLE), { STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha }}, {0 /* Terminate */, { 0, 0 }}, };

1 0

Stefan Dösinger : wined3d: Move wrapu to the misc states.
by Alexandre Julliard 09 Jul '08

09 Jul '08

Module: wine Branch: master Commit: 5f3b11e9d62775748322e06558aca519392b8c4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f3b11e9d62775748322e0655… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 2 20:12:17 2008 -0500 wined3d: Move wrapu to the misc states. --- dlls/wined3d/state.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index ba2f134..82f7734 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3827,8 +3827,8 @@ const struct StateEntry FFPStateTable[] = { /* 2, WINED3DRS_ANTIALIAS */ STATE_RENDER(WINED3DRS_ANTIALIAS), NULL }, { /* 3, WINED3DRS_TEXTUREADDRESS */ 0 /* Handled in ddraw */, state_undefined }, { /* 4, WINED3DRS_TEXTUREPERSPECTIVE */ STATE_RENDER(WINED3DRS_TEXTUREPERSPECTIVE), NULL }, - { /* 5, WINED3DRS_WRAPU */ STATE_RENDER(WINED3DRS_WRAPU), state_wrapu }, - { /* 6, WINED3DRS_WRAPV */ STATE_RENDER(WINED3DRS_WRAPV), state_wrapv }, + { /* 5, WINED3DRS_WRAPU */ STATE_RENDER(WINED3DRS_WRAPU), NULL }, + { /* 6, WINED3DRS_WRAPV */ STATE_RENDER(WINED3DRS_WRAPV), NULL }, { /* 7, WINED3DRS_ZENABLE */ STATE_RENDER(WINED3DRS_ZENABLE), NULL }, { /* 8, WINED3DRS_FILLMODE */ STATE_RENDER(WINED3DRS_FILLMODE), NULL }, { /* 9, WINED3DRS_SHADEMODE */ STATE_RENDER(WINED3DRS_SHADEMODE), NULL }, @@ -4919,6 +4919,8 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_RENDER(WINED3DRS_ANTIALIAS), { STATE_RENDER(WINED3DRS_ANTIALIAS), state_antialias }}, { STATE_RENDER(WINED3DRS_TEXTUREPERSPECTIVE), { STATE_RENDER(WINED3DRS_TEXTUREPERSPECTIVE), state_perspective }}, { STATE_RENDER(WINED3DRS_ZENABLE), { STATE_RENDER(WINED3DRS_ZENABLE), state_zenable }}, + { STATE_RENDER(WINED3DRS_WRAPU), { STATE_RENDER(WINED3DRS_WRAPU), state_wrapu }}, + { STATE_RENDER(WINED3DRS_WRAPV), { STATE_RENDER(WINED3DRS_WRAPV), state_wrapv }}, { STATE_RENDER(WINED3DRS_FILLMODE), { STATE_RENDER(WINED3DRS_FILLMODE), state_fillmode }}, { STATE_RENDER(WINED3DRS_SHADEMODE), { STATE_RENDER(WINED3DRS_SHADEMODE), state_shademode }}, { STATE_RENDER(WINED3DRS_LINEPATTERN), { STATE_RENDER(WINED3DRS_LINEPATTERN), state_linepattern }},

1 0

Stefan Dösinger : wined3d: Move a few more states to the misc pipeline.
by Alexandre Julliard 09 Jul '08

09 Jul '08

Module: wine Branch: master Commit: dd90d62356282c7815935c4efcc149edd5e7320f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd90d62356282c7815935c4ef… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jul 2 16:08:40 2008 -0500 wined3d: Move a few more states to the misc pipeline. --- dlls/wined3d/state.c | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 91c402b..ba2f134 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3829,14 +3829,14 @@ const struct StateEntry FFPStateTable[] = { /* 4, WINED3DRS_TEXTUREPERSPECTIVE */ STATE_RENDER(WINED3DRS_TEXTUREPERSPECTIVE), NULL }, { /* 5, WINED3DRS_WRAPU */ STATE_RENDER(WINED3DRS_WRAPU), state_wrapu }, { /* 6, WINED3DRS_WRAPV */ STATE_RENDER(WINED3DRS_WRAPV), state_wrapv }, - { /* 7, WINED3DRS_ZENABLE */ STATE_RENDER(WINED3DRS_ZENABLE), state_zenable }, - { /* 8, WINED3DRS_FILLMODE */ STATE_RENDER(WINED3DRS_FILLMODE), state_fillmode }, - { /* 9, WINED3DRS_SHADEMODE */ STATE_RENDER(WINED3DRS_SHADEMODE), state_shademode }, - { /* 10, WINED3DRS_LINEPATTERN */ STATE_RENDER(WINED3DRS_LINEPATTERN), state_linepattern }, - { /* 11, WINED3DRS_MONOENABLE */ STATE_RENDER(WINED3DRS_MONOENABLE), state_monoenable }, - { /* 12, WINED3DRS_ROP2 */ STATE_RENDER(WINED3DRS_ROP2), state_rop2 }, - { /* 13, WINED3DRS_PLANEMASK */ STATE_RENDER(WINED3DRS_PLANEMASK), state_planemask }, - { /* 14, WINED3DRS_ZWRITEENABLE */ STATE_RENDER(WINED3DRS_ZWRITEENABLE), state_zwritenable }, + { /* 7, WINED3DRS_ZENABLE */ STATE_RENDER(WINED3DRS_ZENABLE), NULL }, + { /* 8, WINED3DRS_FILLMODE */ STATE_RENDER(WINED3DRS_FILLMODE), NULL }, + { /* 9, WINED3DRS_SHADEMODE */ STATE_RENDER(WINED3DRS_SHADEMODE), NULL }, + { /* 10, WINED3DRS_LINEPATTERN */ STATE_RENDER(WINED3DRS_LINEPATTERN), NULL }, + { /* 11, WINED3DRS_MONOENABLE */ STATE_RENDER(WINED3DRS_MONOENABLE), NULL }, + { /* 12, WINED3DRS_ROP2 */ STATE_RENDER(WINED3DRS_ROP2), NULL }, + { /* 13, WINED3DRS_PLANEMASK */ STATE_RENDER(WINED3DRS_PLANEMASK), NULL }, + { /* 14, WINED3DRS_ZWRITEENABLE */ STATE_RENDER(WINED3DRS_ZWRITEENABLE), NULL }, { /* 15, WINED3DRS_ALPHATESTENABLE */ STATE_RENDER(WINED3DRS_ALPHATESTENABLE), state_alpha }, { /* 16, WINED3DRS_LASTPIXEL */ STATE_RENDER(WINED3DRS_LASTPIXEL), state_lastpixel }, { /* 17, WINED3DRS_TEXTUREMAG */ 0 /* Handled in ddraw */, state_undefined }, @@ -4918,6 +4918,14 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_INDEXBUFFER, { STATE_INDEXBUFFER, indexbuffer }}, { STATE_RENDER(WINED3DRS_ANTIALIAS), { STATE_RENDER(WINED3DRS_ANTIALIAS), state_antialias }}, { STATE_RENDER(WINED3DRS_TEXTUREPERSPECTIVE), { STATE_RENDER(WINED3DRS_TEXTUREPERSPECTIVE), state_perspective }}, + { STATE_RENDER(WINED3DRS_ZENABLE), { STATE_RENDER(WINED3DRS_ZENABLE), state_zenable }}, + { STATE_RENDER(WINED3DRS_FILLMODE), { STATE_RENDER(WINED3DRS_FILLMODE), state_fillmode }}, + { STATE_RENDER(WINED3DRS_SHADEMODE), { STATE_RENDER(WINED3DRS_SHADEMODE), state_shademode }}, + { STATE_RENDER(WINED3DRS_LINEPATTERN), { STATE_RENDER(WINED3DRS_LINEPATTERN), state_linepattern }}, + { STATE_RENDER(WINED3DRS_MONOENABLE), { STATE_RENDER(WINED3DRS_MONOENABLE), state_monoenable }}, + { STATE_RENDER(WINED3DRS_ROP2), { STATE_RENDER(WINED3DRS_ROP2), state_rop2 }}, + { STATE_RENDER(WINED3DRS_PLANEMASK), { STATE_RENDER(WINED3DRS_PLANEMASK), state_planemask }}, + { STATE_RENDER(WINED3DRS_ZWRITEENABLE), { STATE_RENDER(WINED3DRS_ZWRITEENABLE), state_zwritenable }}, {0 /* Terminate */, { 0, 0 }}, };

1 0

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 July 2008