March 2015 - Wine-Commits - list.winehq.org

Vincent Povirk : gdiplus: Fix leak in test in todo_wine case.
by Alexandre Julliard March 19, 2015

March 19, 2015

Module: wine Branch: master Commit: 2827a1a460a509d4b91f76d822295ec3a1a9a4d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2827a1a460a509d4b91f76d82… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Mar 18 11:12:59 2015 -0500 gdiplus: Fix leak in test in todo_wine case. --- dlls/gdiplus/tests/image.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 68a06c4..63fc96e 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -4103,8 +4103,9 @@ static void test_image_format(void) ok(status == OutOfMemory || broken(status == InvalidParameter) /* before win7 */, "expected OutOfMemory, got %d\n", status); else - { expect(Ok, status); + if (status == Ok) + { status = GdipGetImagePixelFormat(thumb, &format); expect(Ok, status); ok(format == PixelFormat32bppPARGB || broken(format != PixelFormat32bppPARGB) /* before win7 */,

1 0

Francois Gouget : riched20: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard March 19, 2015

March 19, 2015

Module: wine Branch: master Commit: cd0200113c9f9c3556645599945c449933c6207f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd0200113c9f9c35566455999… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 18 18:59:06 2015 +0100 riched20: Remove unneeded NONAMELESSXXX directives. --- dlls/riched20/clipboard.c | 2 ++ dlls/riched20/editor.c | 2 ++ dlls/riched20/editstr.h | 2 -- dlls/riched20/richole.c | 1 - dlls/riched20/txthost.c | 2 -- dlls/riched20/txtsrv.c | 2 -- 6 files changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/clipboard.c b/dlls/riched20/clipboard.c index 250a233..c536665 100644 --- a/dlls/riched20/clipboard.c +++ b/dlls/riched20/clipboard.c @@ -18,6 +18,8 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define NONAMELESSUNION + #include "editor.h" WINE_DEFAULT_DEBUG_CHANNEL(richedit); diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 4da2369..146e4be 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -224,6 +224,8 @@ * */ +#define NONAMELESSUNION + #include "editor.h" #include "commdlg.h" #include "winreg.h" diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 4fd965c..1b1eda6 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -32,8 +32,6 @@ #include <limits.h> #define COBJMACROS -#define NONAMELESSUNION -#define NONAMELESSSTRUCT #include <windef.h> #include <winbase.h> diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index c62998a..db55e84 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -22,7 +22,6 @@ #include <stdarg.h> #define NONAMELESSUNION -#define NONAMELESSSTRUCT #define COBJMACROS #include "windef.h" diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 4b72d8b..af32c1a 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -21,8 +21,6 @@ #include "config.h" #include "wine/port.h" -#define NONAMELESSSTRUCT -#define NONAMELESSUNION #define COBJMACROS #include "editor.h" diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 75bee6d..e9c1061 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -21,8 +21,6 @@ #include "config.h" #include "wine/port.h" -#define NONAMELESSSTRUCT -#define NONAMELESSUNION #define COBJMACROS #include "editor.h"

1 0

Francois Gouget : setupapi: Remove unneeded NONAMELESSXXX directives.
by Alexandre Julliard March 19, 2015

March 19, 2015

Module: wine Branch: master Commit: 16019848b8cbecc00409f9230212d0f71aab5ecd URL: http://source.winehq.org/git/wine.git/?a=commit;h=16019848b8cbecc00409f9230… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Mar 18 19:01:26 2015 +0100 setupapi: Remove unneeded NONAMELESSXXX directives. --- dlls/setupapi/fakedll.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/setupapi/fakedll.c b/dlls/setupapi/fakedll.c index b543ade..fdd9bea 100644 --- a/dlls/setupapi/fakedll.c +++ b/dlls/setupapi/fakedll.c @@ -35,8 +35,7 @@ #define COBJMACROS #define ATL_INITGUID -#define NONAMELESSSTRUCT -#define NONAMELESSUNION + #include "ntstatus.h" #define WIN32_NO_STATUS #include "windef.h"

1 0

Ken Thomases : winejoystick: Fix a crash on accessing a CFArray past its end due to an off-by-one error in the Mac code.
by Alexandre Julliard March 19, 2015

March 19, 2015

Module: wine Branch: master Commit: 77432ac45db59440af1aa75e36c93cd025e4e5fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=77432ac45db59440af1aa75e3… Author: Ken Thomases <ken(a)codeweavers.com> Date: Wed Mar 18 14:02:13 2015 -0500 winejoystick: Fix a crash on accessing a CFArray past its end due to an off-by-one error in the Mac code. --- dlls/winejoystick.drv/joystick_osx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winejoystick.drv/joystick_osx.c b/dlls/winejoystick.drv/joystick_osx.c index c8850af..cb66c47 100644 --- a/dlls/winejoystick.drv/joystick_osx.c +++ b/dlls/winejoystick.drv/joystick_osx.c @@ -528,7 +528,7 @@ static BOOL open_joystick(joystick_t* joystick) } index = joystick - joysticks; - if (index > CFArrayGetCount(device_main_elements)) + if (index >= CFArrayGetCount(device_main_elements)) return FALSE; joystick->element = (IOHIDElementRef)CFArrayGetValueAtIndex(device_main_elements, index);

1 0

Vincent Povirk : gdiplus: GdipGetDC doesn' t set the alpha channel for a 32-bit dib.
by Alexandre Julliard March 19, 2015

March 19, 2015

Module: wine Branch: master Commit: e9d9ef591b490a8b4eb173df34b10a6977f45b6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9d9ef591b490a8b4eb173df3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Mar 18 15:52:18 2015 -0500 gdiplus: GdipGetDC doesn't set the alpha channel for a 32-bit dib. --- dlls/gdiplus/graphics.c | 2 +- dlls/gdiplus/tests/graphics.c | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 6d86e3a..5284b99 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -5713,7 +5713,7 @@ GpStatus WINGDIPAPI GdipGetDC(GpGraphics *graphics, HDC *hdc) { stat = METAFILE_GetDC((GpMetafile*)graphics->image, hdc); } - else if (!graphics->hdc || graphics->alpha_hdc || + else if (!graphics->hdc || (graphics->image && graphics->image->type == ImageTypeBitmap && ((GpBitmap*)graphics->image)->format & PixelFormatAlpha)) { /* Create a fake HDC and fill it with a constant color. */ diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index e0bd615..77de9e4 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -4445,12 +4445,13 @@ static void test_measured_extra_space(void) static void test_alpha_hdc(void) { GpStatus status; - HDC hdc; + HDC hdc, gp_hdc; HBITMAP hbm, old_hbm; GpGraphics *graphics; ULONG *bits; BITMAPINFO bmi; GpRectF bounds; + COLORREF colorref; hdc = CreateCompatibleDC(0); ok(hdc != NULL, "CreateCompatibleDC failed\n"); @@ -4484,6 +4485,21 @@ static void test_alpha_hdc(void) expect(0xffaaaaaa, bits[0]); + bits[0] = 0xdeadbeef; + + status = GdipGetDC(graphics, &gp_hdc); + expect(Ok, status); + + colorref = GetPixel(gp_hdc, 0, 4); + expect(0xefbead, colorref); + + SetPixel(gp_hdc, 0, 4, 0xffffff); + + expect(0xffffff, bits[0]); + + status = GdipReleaseDC(graphics, gp_hdc); + expect(Ok, status); + SelectObject(hdc, old_hbm); bits[0] = 0xdeadbeef;

1 0

Sebastian Lackner : ntdll: Handle write watches in virtual_uninterrupted_write_memory.
by Alexandre Julliard March 19, 2015

March 19, 2015

Module: wine Branch: master Commit: 5f49f07d49d0c0c40a577332274b8d6ec85567cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f49f07d49d0c0c40a5773322… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Sat Jan 3 19:11:40 2015 +0100 ntdll: Handle write watches in virtual_uninterrupted_write_memory. --- dlls/ntdll/virtual.c | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index ab6bf9b..9d29c33 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -1729,12 +1729,31 @@ SIZE_T virtual_uninterrupted_write_memory( void *addr, const void *buffer, SIZE_ { if (!(view->protect & VPROT_SYSTEM)) { - void *page = ROUND_ADDR( addr, page_mask ); - BYTE *p = view->prot + (((const char *)page - (const char *)view->base) >> page_shift); - - while (bytes_written < size && (VIRTUAL_GetUnixProt( *p++ ) & PROT_WRITE)) + while (bytes_written < size) { - SIZE_T block_size = min( size, page_size - ((UINT_PTR)addr & page_mask) ); + void *page = ROUND_ADDR( addr, page_mask ); + BYTE *p = view->prot + (((const char *)page - (const char *)view->base) >> page_shift); + SIZE_T block_size; + + /* If the page is not writeable then check for write watches + * before giving up. This can be done without raising a real + * exception. Similar to virtual_handle_fault. */ + if (!(VIRTUAL_GetUnixProt( *p ) & PROT_WRITE)) + { + if (!(view->protect & VPROT_WRITEWATCH)) + break; + + if (*p & VPROT_WRITEWATCH) + { + *p &= ~VPROT_WRITEWATCH; + VIRTUAL_SetProt( view, page, page_size, *p ); + } + /* ignore fault if page is writable now */ + if (!(VIRTUAL_GetUnixProt( *p ) & PROT_WRITE)) + break; + } + + block_size = min( size, page_size - ((UINT_PTR)addr & page_mask) ); memcpy( addr, buffer, block_size ); addr = (void *)((char *)addr + block_size);

1 0

Stefan Leichter : msctf: Add TF_InitMlngInfo stub.
by Alexandre Julliard March 19, 2015

March 19, 2015

Module: wine Branch: master Commit: e269444f3ae295d6ff0b8f8becc15b96b2113629 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e269444f3ae295d6ff0b8f8be… Author: Stefan Leichter <Stefan.Leichter(a)camLine.com> Date: Sun Feb 22 22:42:35 2015 -0600 msctf: Add TF_InitMlngInfo stub. --- dlls/msctf/msctf.c | 9 +++++++++ dlls/msctf/msctf.spec | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/msctf/msctf.c b/dlls/msctf/msctf.c index 231246a..1ce3b8e 100644 --- a/dlls/msctf/msctf.c +++ b/dlls/msctf/msctf.c @@ -660,3 +660,12 @@ HRESULT WINAPI TF_CreateLangBarItemMgr(ITfLangBarItemMgr **pplbim) return E_NOTIMPL; } + +/*********************************************************************** + * TF_InitMlngInfo (MSCTF.@) + */ +HRESULT WINAPI TF_InitMlngInfo(void) +{ + FIXME("stub\n"); + return S_OK; +} diff --git a/dlls/msctf/msctf.spec b/dlls/msctf/msctf.spec index 4dbfb92..c3d909c 100644 --- a/dlls/msctf/msctf.spec +++ b/dlls/msctf/msctf.spec @@ -24,7 +24,7 @@ @ stub TF_GetThreadFlags @ stdcall TF_GetThreadMgr(ptr) @ stub TF_InatExtractIcon -@ stub TF_InitMlngInfo +@ stdcall TF_InitMlngInfo() @ stub TF_InitSystem @ stub TF_InvalidAssemblyListCache @ stdcall TF_InvalidAssemblyListCacheIfExist()

1 0

Matteo Bruni : wined3d: Introduce a get_identity_matrix() function.
by Alexandre Julliard March 19, 2015

March 19, 2015

Module: wine Branch: master Commit: fe4a226bfa405a46a0cf40eb2f6bb5addbf06990 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe4a226bfa405a46a0cf40eb2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 18 21:07:34 2015 +0100 wined3d: Introduce a get_identity_matrix() function. --- dlls/wined3d/stateblock.c | 9 ++------- dlls/wined3d/utils.c | 13 +++++++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index dc146fc..62b1841 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1121,16 +1121,11 @@ static void state_init_default(struct wined3d_state *state, const struct wined3d DWORD d; } tmpfloat; unsigned int i; - static const struct wined3d_matrix identity = - {{{ - 1.0f, 0.0f, 0.0f, 0.0f, - 0.0f, 1.0f, 0.0f, 0.0f, - 0.0f, 0.0f, 1.0f, 0.0f, - 0.0f, 0.0f, 0.0f, 1.0f, - }}}; + struct wined3d_matrix identity; TRACE("state %p, gl_info %p.\n", state, gl_info); + get_identity_matrix(&identity); state->gl_primitive_type = ~0u; /* Set some of the defaults for lights, transforms etc */ diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 725318f..551dca8 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3117,6 +3117,19 @@ BOOL is_invalid_op(const struct wined3d_state *state, int stage, return FALSE; } +void get_identity_matrix(struct wined3d_matrix *mat) +{ + static const struct wined3d_matrix identity = + {{{ + 1.0f, 0.0f, 0.0f, 0.0f, + 0.0f, 1.0f, 0.0f, 0.0f, + 0.0f, 0.0f, 1.0f, 0.0f, + 0.0f, 0.0f, 0.0f, 1.0f, + }}}; + + *mat = identity; +} + /* Setup this textures matrix according to the texture flags. */ /* Context activation is done by the caller (state handler). */ void set_texture_matrix(const struct wined3d_gl_info *gl_info, const float *smat, DWORD flags, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b0c7a53..4f03b1b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3037,6 +3037,8 @@ static inline BOOL shader_constant_is_local(const struct wined3d_shader *shader, return FALSE; } +void get_identity_matrix(struct wined3d_matrix *mat) DECLSPEC_HIDDEN; + /* Using additional shader constants (uniforms in GLSL / program environment * or local parameters in ARB) is costly: * ARB only knows float4 parameters and GLSL compiler are not really smart

1 0

Matteo Bruni : wined3d: Introduce a get_modelview_matrix() function.
by Alexandre Julliard March 19, 2015

March 19, 2015

Module: wine Branch: master Commit: 50861156e25467b84406e01e70513e85d0b7b791 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50861156e25467b84406e01e7… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 18 21:07:35 2015 +0100 wined3d: Introduce a get_modelview_matrix() function. --- dlls/wined3d/state.c | 17 +++++------------ dlls/wined3d/utils.c | 8 ++++++++ dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 67570d5..f434a99 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3844,6 +3844,7 @@ static void shader_bumpenv(struct wined3d_context *context, const struct wined3d void transform_world(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; + struct wined3d_matrix mat; /* This function is called by transform_view below if the view matrix was changed too * @@ -3855,18 +3856,10 @@ void transform_world(struct wined3d_context *context, const struct wined3d_state gl_info->gl_ops.gl.p_glMatrixMode(GL_MODELVIEW); checkGLcall("glMatrixMode"); - if (context->last_was_rhw) - { - gl_info->gl_ops.gl.p_glLoadIdentity(); - checkGLcall("glLoadIdentity()"); - } - else - { - gl_info->gl_ops.gl.p_glLoadMatrixf(&state->transforms[WINED3D_TS_VIEW].u.m[0][0]); - checkGLcall("glLoadMatrixf"); - gl_info->gl_ops.gl.p_glMultMatrixf(&state->transforms[WINED3D_TS_WORLD_MATRIX(0)].u.m[0][0]); - checkGLcall("glMultMatrixf"); - } + get_modelview_matrix(context, state, &mat); + + gl_info->gl_ops.gl.p_glLoadMatrixf((GLfloat *)&mat); + checkGLcall("glLoadMatrixf"); } void clipplane(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 551dca8..116ab9a 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3130,6 +3130,14 @@ void get_identity_matrix(struct wined3d_matrix *mat) *mat = identity; } +void get_modelview_matrix(const struct wined3d_context *context, const struct wined3d_state *state, struct wined3d_matrix *mat) +{ + if (context->last_was_rhw) + get_identity_matrix(mat); + else + multiply_matrix(mat, &state->transforms[WINED3D_TS_VIEW], &state->transforms[WINED3D_TS_WORLD_MATRIX(0)]); +} + /* Setup this textures matrix according to the texture flags. */ /* Context activation is done by the caller (state handler). */ void set_texture_matrix(const struct wined3d_gl_info *gl_info, const float *smat, DWORD flags, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4f03b1b..8d000e8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3038,6 +3038,8 @@ static inline BOOL shader_constant_is_local(const struct wined3d_shader *shader, } void get_identity_matrix(struct wined3d_matrix *mat) DECLSPEC_HIDDEN; +void get_modelview_matrix(const struct wined3d_context *context, const struct wined3d_state *state, + struct wined3d_matrix *mat) DECLSPEC_HIDDEN; /* Using additional shader constants (uniforms in GLSL / program environment * or local parameters in ARB) is costly:

1 0

Matteo Bruni : wined3d: Use a separate STATE_VDECL state handler in the GLSL pipeline.
by Alexandre Julliard March 19, 2015

March 19, 2015

Module: wine Branch: master Commit: 99f3e835ac0c3fd873b127e8c227b9e44fa98ae2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99f3e835ac0c3fd873b127e8c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 18 21:07:36 2015 +0100 wined3d: Use a separate STATE_VDECL state handler in the GLSL pipeline. It's mostly a copy of vertexdeclaration() from state.c, with a few differences due to the new function being private to the GLSL backend (e.g. d3d_info.vs_clipping is known to be TRUE) and the fragment fog update part being split out. --- dlls/wined3d/glsl_shader.c | 89 ++++++++++++++++++++++++++++++++++++++++-- dlls/wined3d/state.c | 6 +-- dlls/wined3d/wined3d_private.h | 6 ++- 3 files changed, 93 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b6d3156..00c7318 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6951,6 +6951,81 @@ static void glsl_vertex_pipe_shader(struct wined3d_context *context, context->shader_update_mask |= 1 << WINED3D_SHADER_TYPE_VERTEX; } +static void glsl_vertex_pipe_vdecl(struct wined3d_context *context, + const struct wined3d_state *state, DWORD state_id) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + BOOL transformed = context->stream_info.position_transformed; + BOOL wasrhw = context->last_was_rhw; + unsigned int i; + + context->last_was_rhw = transformed; + + if (!use_vs(state)) + { + if (context->last_was_vshader) + { + for (i = 0; i < gl_info->limits.clipplanes; ++i) + clipplane(context, state, STATE_CLIPPLANE(i)); + } + + if (transformed != wasrhw) + { + if (!isStateDirty(context, STATE_TRANSFORM(WINED3D_TS_WORLD_MATRIX(0))) + && !isStateDirty(context, STATE_TRANSFORM(WINED3D_TS_VIEW))) + transform_world(context, state, STATE_TRANSFORM(WINED3D_TS_WORLD_MATRIX(0))); + if (!isStateDirty(context, STATE_TRANSFORM(WINED3D_TS_PROJECTION)) + && !isStateDirty(context, STATE_VIEWPORT)) + transform_projection(context, state, STATE_TRANSFORM(WINED3D_TS_PROJECTION)); + } + + for (i = 0; i < MAX_TEXTURES; ++i) + { + if (!isStateDirty(context, STATE_TRANSFORM(WINED3D_TS_TEXTURE0 + i))) + transform_texture(context, state, STATE_TEXTURESTAGE(i, WINED3D_TSS_TEXTURE_TRANSFORM_FLAGS)); + } + + if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_LIGHTING))) + state_lighting(context, state, STATE_RENDER(WINED3D_RS_LIGHTING)); + if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_NORMALIZENORMALS))) + state_normalize(context, state, STATE_RENDER(WINED3D_RS_NORMALIZENORMALS)); + + /* Because of settings->texcoords, we have to always regenerate the + * vertex shader on a vdecl change. + * TODO: Just always output all the texcoords when there are enough + * varyings available to drop the dependency. */ + context->shader_update_mask |= 1 << WINED3D_SHADER_TYPE_VERTEX; + + if (use_ps(state) + && state->shader[WINED3D_SHADER_TYPE_PIXEL]->reg_maps.shader_version.major == 1 + && state->shader[WINED3D_SHADER_TYPE_PIXEL]->reg_maps.shader_version.minor <= 3) + context->shader_update_mask |= 1 << WINED3D_SHADER_TYPE_PIXEL; + } + else + { + if (!context->last_was_vshader) + { + /* Vertex shader clipping ignores the view matrix. Update all clipplanes. */ + for (i = 0; i < gl_info->limits.clipplanes; ++i) + clipplane(context, state, STATE_CLIPPLANE(i)); + } + } + + if (transformed != wasrhw && !isStateDirty(context, STATE_RENDER(WINED3D_RS_ZENABLE))) + context_apply_state(context, state, STATE_RENDER(WINED3D_RS_ZENABLE)); + + context->last_was_vshader = use_vs(state); +} + +static void glsl_vertex_pipe_vs(struct wined3d_context *context, + const struct wined3d_state *state, DWORD state_id) +{ + context->shader_update_mask |= 1 << WINED3D_SHADER_TYPE_VERTEX; + /* Different vertex shaders potentially require a different vertex attributes setup. */ + if (!isStateDirty(context, STATE_VDECL)) + context_apply_state(context, state, STATE_VDECL); +} + static void glsl_vertex_pipe_projection(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { @@ -6963,8 +7038,8 @@ static void glsl_vertex_pipe_projection(struct wined3d_context *context, static const struct StateEntryTemplate glsl_vertex_pipe_vp_states[] = { - {STATE_VDECL, {STATE_VDECL, vertexdeclaration }, WINED3D_GL_EXT_NONE }, - {STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), {STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), vertexdeclaration }, WINED3D_GL_EXT_NONE }, + {STATE_VDECL, {STATE_VDECL, glsl_vertex_pipe_vdecl }, WINED3D_GL_EXT_NONE }, + {STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), {STATE_SHADER(WINED3D_SHADER_TYPE_VERTEX), glsl_vertex_pipe_vs }, WINED3D_GL_EXT_NONE }, {STATE_MATERIAL, {STATE_RENDER(WINED3D_RS_SPECULARENABLE), NULL }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_SPECULARENABLE), {STATE_RENDER(WINED3D_RS_SPECULARENABLE), state_specularenable }, WINED3D_GL_EXT_NONE }, /* Clip planes */ @@ -7242,7 +7317,7 @@ static void glsl_fragment_pipe_fog(struct wined3d_context *context, { if (use_vshader) new_source = FOGSOURCE_VS; - else if (state->render_states[WINED3D_RS_FOGVERTEXMODE] == WINED3D_FOG_NONE || context->last_was_rhw) + else if (state->render_states[WINED3D_RS_FOGVERTEXMODE] == WINED3D_FOG_NONE || context->stream_info.position_transformed) new_source = FOGSOURCE_COORD; else new_source = FOGSOURCE_FFP; @@ -7259,6 +7334,13 @@ static void glsl_fragment_pipe_fog(struct wined3d_context *context, } } +static void glsl_fragment_pipe_vdecl(struct wined3d_context *context, + const struct wined3d_state *state, DWORD state_id) +{ + if (!isStateDirty(context, STATE_RENDER(WINED3D_RS_FOGENABLE))) + glsl_fragment_pipe_fog(context, state, state_id); +} + static void glsl_fragment_pipe_tex_transform(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { @@ -7273,6 +7355,7 @@ static void glsl_fragment_pipe_invalidate_constants(struct wined3d_context *cont static const struct StateEntryTemplate glsl_fragment_pipe_state_template[] = { + {STATE_VDECL, {STATE_VDECL, glsl_fragment_pipe_vdecl }, WINED3D_GL_EXT_NONE }, {STATE_RENDER(WINED3D_RS_TEXTUREFACTOR), {STATE_RENDER(WINED3D_RS_TEXTUREFACTOR), glsl_fragment_pipe_invalidate_constants}, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_OP), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, {STATE_TEXTURESTAGE(0, WINED3D_TSS_COLOR_ARG1), {STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL), NULL }, WINED3D_GL_EXT_NONE }, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index f434a99..e5d6ca9 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -74,7 +74,7 @@ static void state_fillmode(struct wined3d_context *context, const struct wined3d } } -static void state_lighting(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +void state_lighting(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; @@ -1392,7 +1392,7 @@ static void state_linepattern(struct wined3d_context *context, const struct wine } } -static void state_normalize(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +void state_normalize(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; @@ -4627,7 +4627,7 @@ static void vdecl_miscpart(struct wined3d_context *context, const struct wined3d streamsrc(context, state, STATE_STREAMSRC); } -void vertexdeclaration(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) +static void vertexdeclaration(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info; BOOL useVertexShaderFunction = use_vs(state); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8d000e8..f6c83a5 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2823,8 +2823,6 @@ void state_clipping(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; void light(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; -void vertexdeclaration(struct wined3d_context *context, - const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; void clipplane(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; void state_psizemin_w(struct wined3d_context *context, @@ -2839,6 +2837,10 @@ void state_pointsprite(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; void state_pscale(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; +void state_lighting(struct wined3d_context *context, + const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; +void state_normalize(struct wined3d_context *context, + const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN; BOOL getColorBits(const struct wined3d_format *format, BYTE *redSize, BYTE *greenSize, BYTE *blueSize, BYTE *alphaSize, BYTE *totalSize) DECLSPEC_HIDDEN;

1 0