December 2006 - Wine-commits

Stefan Dösinger : wined3d: Add a WINED3DTSS_BUMPENVSCALE stub.
by Alexandre Julliard 20 Dec '06

20 Dec '06

Module: wine Branch: master Commit: 72a4f6e1cf328eef28def099c3e327a6978bd479 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72a4f6e1cf328eef28def099c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 19 23:05:08 2006 +0100 wined3d: Add a WINED3DTSS_BUMPENVSCALE stub. --- dlls/wined3d/state.c | 29 +++++++++++++++++++++-------- 1 files changed, 21 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index f438486..c90f017 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1613,6 +1613,19 @@ static void tex_coordindex(DWORD state, } } +static void tex_bumpenvlscale(DWORD state, IWineD3DStateBlockImpl *stateblock) { + DWORD stage = (state - STATE_TEXTURESTAGE(0, 0)) / WINED3D_HIGHEST_TEXTURE_STATE; + union { + DWORD d; + float f; + } tmpvalue; + + tmpvalue.d = stateblock->textureState[stage][WINED3DTSS_BUMPENVLSCALE]; + if(tmpvalue.f != 0.0) { + ERR("WINED3DTSS_BUMPENVLSCALE not supported yet\n"); + } +} + const struct StateEntry StateTable[] = { /* State name representative, apply function */ @@ -1851,7 +1864,7 @@ const struct StateEntry StateTable[] = { /*0, 19, WINED3DTSS_MIPMAPLODBIAS */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*0, 20, WINED3DTSS_MAXMIPLEVEL */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*0, 21, WINED3DTSS_MAXANISOTROPY */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, - { /*0, 22, WINED3DTSS_BUMPENVLSCALE */ STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVLSCALE), state_undefined }, + { /*0, 22, WINED3DTSS_BUMPENVLSCALE */ STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, { /*0, 23, WINED3DTSS_BUMPENVLOFFSET */ STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVLOFFSET), state_undefined }, { /*0, 24, WINED3DTSS_TEXTURETRANSFORMFLAGS */ STATE_TEXTURESTAGE(0, WINED3DTSS_TEXTURETRANSFORMFLAGS), state_undefined}, { /*0, 25, WINED3DTSS_ADDRESSW */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, @@ -1884,7 +1897,7 @@ const struct StateEntry StateTable[] = { /*1, 19, WINED3DTSS_MIPMAPLODBIAS */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*1, 20, WINED3DTSS_MAXMIPLEVEL */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*1, 21, WINED3DTSS_MAXANISOTROPY */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, - { /*1, 22, WINED3DTSS_BUMPENVLSCALE */ STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVLSCALE), state_undefined }, + { /*1, 22, WINED3DTSS_BUMPENVLSCALE */ STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, { /*1, 23, WINED3DTSS_BUMPENVLOFFSET */ STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVLOFFSET), state_undefined }, { /*1, 24, WINED3DTSS_TEXTURETRANSFORMFLAGS */ STATE_TEXTURESTAGE(1, WINED3DTSS_TEXTURETRANSFORMFLAGS), state_undefined}, { /*1, 25, WINED3DTSS_ADDRESSW */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, @@ -1917,7 +1930,7 @@ const struct StateEntry StateTable[] = { /*2, 19, WINED3DTSS_MIPMAPLODBIAS */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*2, 20, WINED3DTSS_MAXMIPLEVEL */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*2, 21, WINED3DTSS_MAXANISOTROPY */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, - { /*2, 22, WINED3DTSS_BUMPENVLSCALE */ STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVLSCALE), state_undefined }, + { /*2, 22, WINED3DTSS_BUMPENVLSCALE */ STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, { /*2, 23, WINED3DTSS_BUMPENVLOFFSET */ STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVLOFFSET), state_undefined }, { /*2, 24, WINED3DTSS_TEXTURETRANSFORMFLAGS */ STATE_TEXTURESTAGE(2, WINED3DTSS_TEXTURETRANSFORMFLAGS), state_undefined}, { /*2, 25, WINED3DTSS_ADDRESSW */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, @@ -1950,7 +1963,7 @@ const struct StateEntry StateTable[] = { /*3, 19, WINED3DTSS_MIPMAPLODBIAS */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*3, 20, WINED3DTSS_MAXMIPLEVEL */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*3, 21, WINED3DTSS_MAXANISOTROPY */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, - { /*3, 22, WINED3DTSS_BUMPENVLSCALE */ STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVLSCALE), state_undefined }, + { /*3, 22, WINED3DTSS_BUMPENVLSCALE */ STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, { /*3, 23, WINED3DTSS_BUMPENVLOFFSET */ STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVLOFFSET), state_undefined }, { /*3, 24, WINED3DTSS_TEXTURETRANSFORMFLAGS */ STATE_TEXTURESTAGE(3, WINED3DTSS_TEXTURETRANSFORMFLAGS), state_undefined}, { /*3, 25, WINED3DTSS_ADDRESSW */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, @@ -1983,7 +1996,7 @@ const struct StateEntry StateTable[] = { /*4, 19, WINED3DTSS_MIPMAPLODBIAS */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*4, 20, WINED3DTSS_MAXMIPLEVEL */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*4, 21, WINED3DTSS_MAXANISOTROPY */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, - { /*4, 22, WINED3DTSS_BUMPENVLSCALE */ STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVLSCALE), state_undefined }, + { /*4, 22, WINED3DTSS_BUMPENVLSCALE */ STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, { /*4, 23, WINED3DTSS_BUMPENVLOFFSET */ STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVLOFFSET), state_undefined }, { /*4, 24, WINED3DTSS_TEXTURETRANSFORMFLAGS */ STATE_TEXTURESTAGE(4, WINED3DTSS_TEXTURETRANSFORMFLAGS), state_undefined}, { /*4, 25, WINED3DTSS_ADDRESSW */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, @@ -2016,7 +2029,7 @@ const struct StateEntry StateTable[] = { /*5, 19, WINED3DTSS_MIPMAPLODBIAS */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*5, 20, WINED3DTSS_MAXMIPLEVEL */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*5, 21, WINED3DTSS_MAXANISOTROPY */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, - { /*5, 22, WINED3DTSS_BUMPENVLSCALE */ STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVLSCALE), state_undefined }, + { /*5, 22, WINED3DTSS_BUMPENVLSCALE */ STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, { /*5, 23, WINED3DTSS_BUMPENVLOFFSET */ STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVLOFFSET), state_undefined }, { /*5, 24, WINED3DTSS_TEXTURETRANSFORMFLAGS */ STATE_TEXTURESTAGE(5, WINED3DTSS_TEXTURETRANSFORMFLAGS), state_undefined}, { /*5, 25, WINED3DTSS_ADDRESSW */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, @@ -2049,7 +2062,7 @@ const struct StateEntry StateTable[] = { /*6, 19, WINED3DTSS_MIPMAPLODBIAS */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*6, 20, WINED3DTSS_MAXMIPLEVEL */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*6, 21, WINED3DTSS_MAXANISOTROPY */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, - { /*6, 22, WINED3DTSS_BUMPENVLSCALE */ STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVLSCALE), state_undefined }, + { /*6, 22, WINED3DTSS_BUMPENVLSCALE */ STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, { /*6, 23, WINED3DTSS_BUMPENVLOFFSET */ STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVLOFFSET), state_undefined }, { /*6, 24, WINED3DTSS_TEXTURETRANSFORMFLAGS */ STATE_TEXTURESTAGE(6, WINED3DTSS_TEXTURETRANSFORMFLAGS), state_undefined}, { /*6, 25, WINED3DTSS_ADDRESSW */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, @@ -2082,7 +2095,7 @@ const struct StateEntry StateTable[] = { /*7, 19, WINED3DTSS_MIPMAPLODBIAS */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*7, 20, WINED3DTSS_MAXMIPLEVEL */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*7, 21, WINED3DTSS_MAXANISOTROPY */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, - { /*7, 22, WINED3DTSS_BUMPENVLSCALE */ STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVLSCALE), state_undefined }, + { /*7, 22, WINED3DTSS_BUMPENVLSCALE */ STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, { /*7, 23, WINED3DTSS_BUMPENVLOFFSET */ STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVLOFFSET), state_undefined }, { /*7, 24, WINED3DTSS_TEXTURETRANSFORMFLAGS */ STATE_TEXTURESTAGE(7, WINED3DTSS_TEXTURETRANSFORMFLAGS), state_undefined}, { /*7, 25, WINED3DTSS_ADDRESSW */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined },

1 0

Stefan Dösinger : wined3d: Add a WINED3DTSS_BUMPENVLOFFSET stub.
by Alexandre Julliard 20 Dec '06

20 Dec '06

Module: wine Branch: master Commit: 1021f644748a45f571b2ba425d646a9e9b280699 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1021f644748a45f571b2ba425… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 19 23:34:17 2006 +0100 wined3d: Add a WINED3DTSS_BUMPENVLOFFSET stub. --- dlls/wined3d/state.c | 29 +++++++++++++++++++++-------- 1 files changed, 21 insertions(+), 8 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1021f644748a45f571b2b…

1 0

Stefan Dösinger : wined3d: Make WINED3DTSS_TEXTURETRANSFORMFLAGS a nogl state.
by Alexandre Julliard 20 Dec '06

20 Dec '06

Module: wine Branch: master Commit: aec9f1143b153ccaf10c51457bd1b0c842eb181d URL: http://source.winehq.org/git/wine.git/?a=commit;h=aec9f1143b153ccaf10c51457… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 19 23:07:57 2006 +0100 wined3d: Make WINED3DTSS_TEXTURETRANSFORMFLAGS a nogl state. --- dlls/wined3d/state.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 064c81d..9a1d647 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -1879,7 +1879,7 @@ const struct StateEntry StateTable[] = { /*0, 21, WINED3DTSS_MAXANISOTROPY */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*0, 22, WINED3DTSS_BUMPENVLSCALE */ STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, { /*0, 23, WINED3DTSS_BUMPENVLOFFSET */ STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVLOFFSET), tex_bumpenvloffset }, - { /*0, 24, WINED3DTSS_TEXTURETRANSFORMFLAGS */ STATE_TEXTURESTAGE(0, WINED3DTSS_TEXTURETRANSFORMFLAGS), state_undefined}, + { /*0, 24, WINED3DTSS_TEXTURETRANSFORMFLAGS */ 0 /* for now, later stream sources */, state_nogl }, { /*0, 25, WINED3DTSS_ADDRESSW */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*0, 26, WINED3DTSS_COLORARG0 */ STATE_TEXTURESTAGE(0, WINED3DTSS_COLOROP), tex_colorop }, { /*0, 27, WINED3DTSS_ALPHAARG0 */ STATE_TEXTURESTAGE(0, WINED3DTSS_ALPHAOP), tex_alphaop }, @@ -1912,7 +1912,7 @@ const struct StateEntry StateTable[] = { /*1, 21, WINED3DTSS_MAXANISOTROPY */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*1, 22, WINED3DTSS_BUMPENVLSCALE */ STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, { /*1, 23, WINED3DTSS_BUMPENVLOFFSET */ STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVLOFFSET), tex_bumpenvloffset }, - { /*1, 24, WINED3DTSS_TEXTURETRANSFORMFLAGS */ STATE_TEXTURESTAGE(1, WINED3DTSS_TEXTURETRANSFORMFLAGS), state_undefined}, + { /*1, 24, WINED3DTSS_TEXTURETRANSFORMFLAGS */ 0 /* for now, later stream sources */, state_nogl }, { /*1, 25, WINED3DTSS_ADDRESSW */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*1, 26, WINED3DTSS_COLORARG0 */ STATE_TEXTURESTAGE(1, WINED3DTSS_COLOROP), tex_colorop }, { /*1, 27, WINED3DTSS_ALPHAARG0 */ STATE_TEXTURESTAGE(1, WINED3DTSS_ALPHAOP), tex_alphaop }, @@ -1945,7 +1945,7 @@ const struct StateEntry StateTable[] = { /*2, 21, WINED3DTSS_MAXANISOTROPY */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*2, 22, WINED3DTSS_BUMPENVLSCALE */ STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, { /*2, 23, WINED3DTSS_BUMPENVLOFFSET */ STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVLOFFSET), tex_bumpenvloffset }, - { /*2, 24, WINED3DTSS_TEXTURETRANSFORMFLAGS */ STATE_TEXTURESTAGE(2, WINED3DTSS_TEXTURETRANSFORMFLAGS), state_undefined}, + { /*2, 24, WINED3DTSS_TEXTURETRANSFORMFLAGS */ 0 /* for now, later stream sources */, state_nogl }, { /*2, 25, WINED3DTSS_ADDRESSW */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*2, 26, WINED3DTSS_COLORARG0 */ STATE_TEXTURESTAGE(2, WINED3DTSS_COLOROP), tex_colorop }, { /*2, 27, WINED3DTSS_ALPHAARG0 */ STATE_TEXTURESTAGE(2, WINED3DTSS_ALPHAOP), tex_alphaop }, @@ -1978,7 +1978,7 @@ const struct StateEntry StateTable[] = { /*3, 21, WINED3DTSS_MAXANISOTROPY */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*3, 22, WINED3DTSS_BUMPENVLSCALE */ STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, { /*3, 23, WINED3DTSS_BUMPENVLOFFSET */ STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVLOFFSET), tex_bumpenvloffset }, - { /*3, 24, WINED3DTSS_TEXTURETRANSFORMFLAGS */ STATE_TEXTURESTAGE(3, WINED3DTSS_TEXTURETRANSFORMFLAGS), state_undefined}, + { /*3, 24, WINED3DTSS_TEXTURETRANSFORMFLAGS */ 0 /* for now, later stream sources */, state_nogl }, { /*3, 25, WINED3DTSS_ADDRESSW */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*3, 26, WINED3DTSS_COLORARG0 */ STATE_TEXTURESTAGE(3, WINED3DTSS_COLOROP), tex_colorop }, { /*3, 27, WINED3DTSS_ALPHAARG0 */ STATE_TEXTURESTAGE(3, WINED3DTSS_ALPHAOP), tex_alphaop }, @@ -2011,7 +2011,7 @@ const struct StateEntry StateTable[] = { /*4, 21, WINED3DTSS_MAXANISOTROPY */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*4, 22, WINED3DTSS_BUMPENVLSCALE */ STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, { /*4, 23, WINED3DTSS_BUMPENVLOFFSET */ STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVLOFFSET), tex_bumpenvloffset }, - { /*4, 24, WINED3DTSS_TEXTURETRANSFORMFLAGS */ STATE_TEXTURESTAGE(4, WINED3DTSS_TEXTURETRANSFORMFLAGS), state_undefined}, + { /*4, 24, WINED3DTSS_TEXTURETRANSFORMFLAGS */ 0 /* for now, later stream sources */, state_nogl }, { /*4, 25, WINED3DTSS_ADDRESSW */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*4, 26, WINED3DTSS_COLORARG0 */ STATE_TEXTURESTAGE(4, WINED3DTSS_COLOROP), tex_colorop }, { /*4, 27, WINED3DTSS_ALPHAARG0 */ STATE_TEXTURESTAGE(4, WINED3DTSS_ALPHAOP), tex_alphaop }, @@ -2044,7 +2044,7 @@ const struct StateEntry StateTable[] = { /*5, 21, WINED3DTSS_MAXANISOTROPY */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*5, 22, WINED3DTSS_BUMPENVLSCALE */ STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, { /*5, 23, WINED3DTSS_BUMPENVLOFFSET */ STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVLOFFSET), tex_bumpenvloffset }, - { /*5, 24, WINED3DTSS_TEXTURETRANSFORMFLAGS */ STATE_TEXTURESTAGE(5, WINED3DTSS_TEXTURETRANSFORMFLAGS), state_undefined}, + { /*5, 24, WINED3DTSS_TEXTURETRANSFORMFLAGS */ 0 /* for now, later stream sources */, state_nogl }, { /*5, 25, WINED3DTSS_ADDRESSW */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*5, 26, WINED3DTSS_COLORARG0 */ STATE_TEXTURESTAGE(5, WINED3DTSS_COLOROP), tex_colorop }, { /*5, 27, WINED3DTSS_ALPHAARG0 */ STATE_TEXTURESTAGE(5, WINED3DTSS_ALPHAOP), tex_alphaop }, @@ -2077,7 +2077,7 @@ const struct StateEntry StateTable[] = { /*6, 21, WINED3DTSS_MAXANISOTROPY */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*6, 22, WINED3DTSS_BUMPENVLSCALE */ STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, { /*6, 23, WINED3DTSS_BUMPENVLOFFSET */ STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVLOFFSET), tex_bumpenvloffset }, - { /*6, 24, WINED3DTSS_TEXTURETRANSFORMFLAGS */ STATE_TEXTURESTAGE(6, WINED3DTSS_TEXTURETRANSFORMFLAGS), state_undefined}, + { /*6, 24, WINED3DTSS_TEXTURETRANSFORMFLAGS */ 0 /* for now, later stream sources */, state_nogl }, { /*6, 25, WINED3DTSS_ADDRESSW */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*6, 26, WINED3DTSS_COLORARG0 */ STATE_TEXTURESTAGE(6, WINED3DTSS_COLOROP), tex_colorop }, { /*6, 27, WINED3DTSS_ALPHAARG0 */ STATE_TEXTURESTAGE(6, WINED3DTSS_ALPHAOP), tex_alphaop }, @@ -2110,7 +2110,7 @@ const struct StateEntry StateTable[] = { /*7, 21, WINED3DTSS_MAXANISOTROPY */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*7, 22, WINED3DTSS_BUMPENVLSCALE */ STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVLSCALE), tex_bumpenvlscale }, { /*7, 23, WINED3DTSS_BUMPENVLOFFSET */ STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVLOFFSET), tex_bumpenvloffset }, - { /*7, 24, WINED3DTSS_TEXTURETRANSFORMFLAGS */ STATE_TEXTURESTAGE(7, WINED3DTSS_TEXTURETRANSFORMFLAGS), state_undefined}, + { /*7, 24, WINED3DTSS_TEXTURETRANSFORMFLAGS */ 0 /* for now, later stream sources */, state_nogl }, { /*7, 25, WINED3DTSS_ADDRESSW */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined }, { /*7, 26, WINED3DTSS_COLORARG0 */ STATE_TEXTURESTAGE(7, WINED3DTSS_COLOROP), tex_colorop }, { /*7, 27, WINED3DTSS_ALPHAARG0 */ STATE_TEXTURESTAGE(7, WINED3DTSS_ALPHAOP), tex_alphaop },

1 0

Stefan Dösinger : wined3d: Move WINED3DTSS_TEXCOORDINDEX to the state table.
by Alexandre Julliard 20 Dec '06

20 Dec '06

Module: wine Branch: master Commit: 4e5314011bb43442a751b7d695404fca4e1a5f93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e5314011bb43442a751b7d69… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 19 23:04:16 2006 +0100 wined3d: Move WINED3DTSS_TEXCOORDINDEX to the state table. --- dlls/wined3d/device.c | 140 +--------------------------------------- dlls/wined3d/state.c | 175 ++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 168 insertions(+), 147 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4e5314011bb43442a751b…

1 0

Stefan Dösinger : wined3d: Do not enable the texture dimensions in BindTexture.
by Alexandre Julliard 20 Dec '06

20 Dec '06

Module: wine Branch: master Commit: 251f1eea7a4da51cc3c018c64786964913582743 URL: http://source.winehq.org/git/wine.git/?a=commit;h=251f1eea7a4da51cc3c018c64… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 19 22:53:26 2006 +0100 wined3d: Do not enable the texture dimensions in BindTexture. --- dlls/wined3d/basetexture.c | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 3fdbf4a..9b9b5d7 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -236,11 +236,6 @@ HRESULT WINAPI IWineD3DBaseTextureImpl_B textureDimensions = IWineD3DBaseTexture_GetTextureDimensions(iface); ENTER_GL(); -#if 0 /* TODO: context manager support */ - IWineD3DContextManager_PushState(This->contextManager, textureDimensions, ENABLED, NOW /* make sure the state is applied now */); -#else - glEnable(textureDimensions); -#endif /* Generate a texture name if we don't already have one */ if (This->baseTexture.textureName == 0) {

1 0

Stefan Dösinger : wined3d: Move WINED3DTSS_COLOROP to the state table.
by Alexandre Julliard 20 Dec '06

20 Dec '06

Module: wine Branch: master Commit: 762af471e8c2f061db220e59b20274c01c1d35b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=762af471e8c2f061db220e59b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 19 23:00:58 2006 +0100 wined3d: Move WINED3DTSS_COLOROP to the state table. --- dlls/wined3d/device.c | 74 +++++++++++++ dlls/wined3d/drawprim.c | 30 +----- dlls/wined3d/state.c | 236 ++++++++++++++++++++++++++++++---------- dlls/wined3d/stateblock.c | 12 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 264 insertions(+), 89 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=762af471e8c2f061db220…

1 0

Stefan Dösinger : wined3d: Move WINED3DTSS_ALPHAOP to the state table.
by Alexandre Julliard 20 Dec '06

20 Dec '06

Module: wine Branch: master Commit: bd6a6ad2c0ab85b6c995343e540d1e76ee568ca7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd6a6ad2c0ab85b6c995343e5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 19 23:03:37 2006 +0100 wined3d: Move WINED3DTSS_ALPHAOP to the state table. --- dlls/wined3d/device.c | 4 +- dlls/wined3d/drawprim.c | 17 -------- dlls/wined3d/state.c | 102 ++++++++++++++++++++++++++++++++--------------- 3 files changed, 73 insertions(+), 50 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bd6a6ad2c0ab85b6c9953…

1 0

Alexandre Julliard : loader: Try to detect glibc 2. 3 without NPTL or TLS and print a warning.
by Alexandre Julliard 20 Dec '06

20 Dec '06

Module: wine Branch: master Commit: 959113d27019c25c2cc30009dce52155907461b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=959113d27019c25c2cc30009d… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 20 17:03:23 2006 +0100 loader: Try to detect glibc 2.3 without NPTL or TLS and print a warning. --- loader/kthread.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/loader/kthread.c b/loader/kthread.c index 91f00e4..1c43be5 100644 --- a/loader/kthread.c +++ b/loader/kthread.c @@ -903,6 +903,14 @@ void __pthread_initialize(void) if (!done) { done = 1; + /* check for exported epoll_create to detect glibc versions that we cannot support */ + if (wine_dlsym( RTLD_DEFAULT, "epoll_create", NULL, 0 )) + { + static const char warning[] = + "wine: glibc >= 2.3 without NPTL or TLS is not a supported combination.\n" + " It will most likely crash. Please upgrade to a glibc with NPTL support.\n"; + write( 2, warning, sizeof(warning)-1 ); + } libc_fork = wine_dlsym( RTLD_NEXT, "fork", NULL, 0 ); libc_sigaction = wine_dlsym( RTLD_NEXT, "sigaction", NULL, 0 ); libc_uselocale = wine_dlsym( RTLD_DEFAULT, "uselocale", NULL, 0 );

1 0

Alexandre Julliard : shell32: Don' t hardcode the system32 directory in registered classes.
by Alexandre Julliard 20 Dec '06

20 Dec '06

Module: wine Branch: master Commit: d56b3c10c43e050f571c0a4cf4f8c10739c354b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d56b3c10c43e050f571c0a4cf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 20 17:05:02 2006 +0100 shell32: Don't hardcode the system32 directory in registered classes. --- dlls/shell32/regsvr.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/regsvr.c b/dlls/shell32/regsvr.c index 27cb5f3..f4cffd7 100644 --- a/dlls/shell32/regsvr.c +++ b/dlls/shell32/regsvr.c @@ -273,23 +273,23 @@ static HRESULT register_coclasses(struct } if (list->idName) { - char buffer[64] = "@%SYSTEMROOT%\\system32\\shell32.dll,-"; - sprintf(buffer+strlen(buffer), "%u", list->idName); - res = RegSetValueExA(clsid_key, localized_valuename, 0, REG_EXPAND_SZ, + char buffer[64]; + sprintf(buffer, "@shell32.dll,-%u", list->idName); + res = RegSetValueExA(clsid_key, localized_valuename, 0, REG_SZ, (CONST BYTE*)(buffer), strlen(buffer)+1); if (res != ERROR_SUCCESS) goto error_close_clsid_key; } if (list->idDefaultIcon) { HKEY icon_key; - char buffer[64] = "%SYSTEMROOT%\\system32\\shell32.dll,-"; + char buffer[64]; res = RegCreateKeyExW(clsid_key, defaulticon_keyname, 0, NULL, 0, KEY_READ | KEY_WRITE, NULL, &icon_key, NULL); if (res != ERROR_SUCCESS) goto error_close_clsid_key; - sprintf(buffer+strlen(buffer), "%u", list->idDefaultIcon); - res = RegSetValueExA(icon_key, NULL, 0, REG_EXPAND_SZ, + sprintf(buffer, "shell32.dll,-%u", list->idDefaultIcon); + res = RegSetValueExA(icon_key, NULL, 0, REG_SZ, (CONST BYTE*)(buffer), strlen(buffer)+1); RegCloseKey(icon_key); if (res != ERROR_SUCCESS) goto error_close_clsid_key;

1 0

Stefan Dösinger : wined3d: Temporary disable nvrc junk texture skipping.
by Alexandre Julliard 20 Dec '06

20 Dec '06

Module: wine Branch: master Commit: 1e264e5dd4f01f5450fd0be79cec78ed979035c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e264e5dd4f01f5450fd0be79… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Dec 19 22:37:37 2006 +0100 wined3d: Temporary disable nvrc junk texture skipping. --- dlls/wined3d/drawprim.c | 8 +++--- dlls/wined3d/stateblock.c | 65 ++++++++++++++++++++++----------------------- 2 files changed, 36 insertions(+), 37 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 6ac7462..88a3f90 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -1166,7 +1166,7 @@ static void loadVertexData(IWineD3DDevic continue; } - if (!GL_SUPPORT(NV_REGISTER_COMBINERS) || This->stateBlock->textures[textureNo]) { + if (/*!GL_SUPPORT(NV_REGISTER_COMBINERS) || This->stateBlock->textures[textureNo]*/ TRUE) { /* Select the correct texture stage */ GL_EXTCALL(glClientActiveTextureARB(GL_TEXTURE0_ARB + texture_idx)); } @@ -1204,7 +1204,7 @@ static void loadVertexData(IWineD3DDevic glDisableClientState(GL_TEXTURE_COORD_ARRAY); GL_EXTCALL(glMultiTexCoord4fARB(GL_TEXTURE0_ARB + textureNo, 0, 0, 0, 1)); } - if (!GL_SUPPORT(NV_REGISTER_COMBINERS) || This->stateBlock->textures[textureNo]) ++texture_idx; + if (/*!GL_SUPPORT(NV_REGISTER_COMBINERS) || This->stateBlock->textures[textureNo]*/ TRUE) ++texture_idx; } if (GL_SUPPORT(NV_REGISTER_COMBINERS)) { for (textureNo = texture_idx; textureNo < GL_LIMITS(textures); ++textureNo) { @@ -1479,7 +1479,7 @@ static void drawStridedSlow(IWineD3DDevi } } } - if (!GL_SUPPORT(NV_REGISTER_COMBINERS) || This->stateBlock->textures[textureNo]) ++texture_idx; + if (/*!GL_SUPPORT(NV_REGISTER_COMBINERS) || This->stateBlock->textures[textureNo]*/TRUE) ++texture_idx; } /* End of textures */ /* Diffuse -------------------------------- */ @@ -1911,7 +1911,7 @@ static void drawPrimitiveUploadTextures( /* WINED3DTOP_DISABLE disables the current & any higher texture stages */ if (This->stateBlock->textureState[i][WINED3DTSS_COLOROP] == WINED3DTOP_DISABLE) break; - if (!GL_SUPPORT(NV_REGISTER_COMBINERS) || This->stateBlock->textures[i]) { + if (/*!GL_SUPPORT(NV_REGISTER_COMBINERS) || This->stateBlock->textures[i]*/ TRUE) { texture_idx = current_sampler++; /* Active the texture unit corresponding to the current texture stage */ diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 98904cc..e7e0f3a 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1026,46 +1026,45 @@ static HRESULT WINAPI IWineD3DStateBloc bound. We emulate this by creating dummy textures and binding them to each texture stage, but disable all stages by default. Hence if a stage is enabled then the default texture will kick in until replaced by a SetTexture call */ - if (!GL_SUPPORT(NV_REGISTER_COMBINERS)) { - ENTER_GL(); - - for (i = 0; i < GL_LIMITS(texture_stages); i++) { - GLubyte white = 255; - - /* Note this avoids calling settexture, so pretend it has been called */ - This->set.textures[i] = TRUE; - This->changed.textures[i] = TRUE; - This->textures[i] = NULL; - - /* Make appropriate texture active */ - if (GL_SUPPORT(ARB_MULTITEXTURE)) { - GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + i)); - checkGLcall("glActiveTextureARB"); - } else if (i > 0) { - FIXME("Program using multiple concurrent textures which this opengl implementation doesn't support\n"); - } + ENTER_GL(); + + for (i = 0; i < GL_LIMITS(texture_stages); i++) { + GLubyte white = 255; + + /* Note this avoids calling settexture, so pretend it has been called */ + This->set.textures[i] = TRUE; + This->changed.textures[i] = TRUE; + This->textures[i] = NULL; + + /* Make appropriate texture active */ + if (GL_SUPPORT(ARB_MULTITEXTURE)) { + GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + i)); + checkGLcall("glActiveTextureARB"); + } else if (i > 0) { + FIXME("Program using multiple concurrent textures which this opengl implementation doesn't support\n"); + } - /* Generate an opengl texture name */ - glGenTextures(1, &ThisDevice->dummyTextureName[i]); - checkGLcall("glGenTextures"); - TRACE("Dummy Texture %d given name %d\n", i, ThisDevice->dummyTextureName[i]); + /* Generate an opengl texture name */ + glGenTextures(1, &ThisDevice->dummyTextureName[i]); + checkGLcall("glGenTextures"); + TRACE("Dummy Texture %d given name %d\n", i, ThisDevice->dummyTextureName[i]); - /* Generate a dummy 1d texture */ - This->textureDimensions[i] = GL_TEXTURE_1D; - glBindTexture(GL_TEXTURE_1D, ThisDevice->dummyTextureName[i]); - checkGLcall("glBindTexture"); + /* Generate a dummy 1d texture */ + This->textureDimensions[i] = GL_TEXTURE_1D; + glBindTexture(GL_TEXTURE_1D, ThisDevice->dummyTextureName[i]); + checkGLcall("glBindTexture"); - glTexImage1D(GL_TEXTURE_1D, 0, GL_LUMINANCE, 1, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, &white); - checkGLcall("glTexImage1D"); + glTexImage1D(GL_TEXTURE_1D, 0, GL_LUMINANCE, 1, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, &white); + checkGLcall("glTexImage1D"); #if 1 /* TODO: move the setting texture states off to basetexture */ - /* Reapply all the texture state information to this texture */ - IWineD3DDevice_SetupTextureStates(device, i, i, REAPPLY_ALL); + /* Reapply all the texture state information to this texture */ + IWineD3DDevice_SetupTextureStates(device, i, i, REAPPLY_ALL); #endif - } - - LEAVE_GL(); } + LEAVE_GL(); + + /* Defaulting palettes - Note these are device wide but reinitialized here for convenience*/ for (i = 0; i < MAX_PALETTES; ++i) { int j;

1 0