May 2016 - Wine-commits - list.winehq.org

Michael Stefaniuc : wined3d: Initialize a RECT to avoid compiler warnings.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: f22be3afb1d9dfa4e517fe8dcd38aeb9716f5827 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f22be3afb1d9dfa4e517fe8dc… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 16 02:48:03 2016 +0200 wined3d: Initialize a RECT to avoid compiler warnings. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d1f77ca..fa33667 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -302,7 +302,7 @@ void device_clear_render_targets(struct wined3d_device *device, UINT rt_count, c GLbitfield clear_mask = 0; BOOL render_offscreen; unsigned int i; - RECT ds_rect; + RECT ds_rect = {0}; context = context_acquire(device, target); if (!context->valid)

1 0

Michael Stefaniuc : include: Use inline functions for common RECT helpers.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 5f494bfeb4df0ccec6f7853860de24b2eeab0670 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f494bfeb4df0ccec6f785386… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon May 16 02:49:34 2016 +0200 include: Use inline functions for common RECT helpers. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/uitools.c | 1 + dlls/user32/uitools.c | 1 + include/winuser.h | 38 +++++++++++++++++++++++++++++++++++--- 3 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/uitools.c b/dlls/user32/tests/uitools.c index e1ddf2b..1be709c 100644 --- a/dlls/user32/tests/uitools.c +++ b/dlls/user32/tests/uitools.c @@ -17,6 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#define WINE_NO_INLINE_RECT #include "wine/test.h" #include "winbase.h" #include "wingdi.h" diff --git a/dlls/user32/uitools.c b/dlls/user32/uitools.c index 68c3c8e..efaf356 100644 --- a/dlls/user32/uitools.c +++ b/dlls/user32/uitools.c @@ -21,6 +21,7 @@ #include <stdarg.h> +#define WINE_NO_INLINE_RECT #include "windef.h" #include "winbase.h" #include "wingdi.h" diff --git a/include/winuser.h b/include/winuser.h index 0c527fb..2b56a0c 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3771,7 +3771,6 @@ WINUSERAPI BOOL WINAPI IsGUIThread(BOOL); WINUSERAPI BOOL WINAPI IsHungAppWindow(HWND); WINUSERAPI BOOL WINAPI IsIconic(HWND); WINUSERAPI BOOL WINAPI IsMenu(HMENU); -WINUSERAPI BOOL WINAPI IsRectEmpty(const RECT*); WINUSERAPI BOOL WINAPI IsTouchWindow(HWND,PULONG); WINUSERAPI BOOL WINAPI IsWinEventHookInstalled(DWORD); WINUSERAPI BOOL WINAPI IsWindow(HWND); @@ -3982,8 +3981,6 @@ WINUSERAPI HWND WINAPI SetParent(HWND,HWND); WINUSERAPI BOOL WINAPI SetPropA(HWND,LPCSTR,HANDLE); WINUSERAPI BOOL WINAPI SetPropW(HWND,LPCWSTR,HANDLE); #define SetProp WINELIB_NAME_AW(SetProp) -WINUSERAPI BOOL WINAPI SetRect(LPRECT,INT,INT,INT,INT); -WINUSERAPI BOOL WINAPI SetRectEmpty(LPRECT); WINUSERAPI INT WINAPI SetScrollInfo(HWND,INT,const SCROLLINFO*,BOOL); WINUSERAPI INT WINAPI SetScrollPos(HWND,INT,INT,BOOL); WINUSERAPI BOOL WINAPI SetScrollRange(HWND,INT,INT,INT,BOOL); @@ -4092,6 +4089,41 @@ WINUSERAPI INT WINAPI wvsprintfA(LPSTR,LPCSTR,__ms_va_list); WINUSERAPI INT WINAPI wvsprintfW(LPWSTR,LPCWSTR,__ms_va_list); #define wvsprintf WINELIB_NAME_AW(wvsprintf) +#if !defined(__WINESRC__) || defined(WINE_NO_INLINE_RECT) + +WINUSERAPI BOOL WINAPI IsRectEmpty(const RECT*); +WINUSERAPI BOOL WINAPI SetRect(LPRECT,INT,INT,INT,INT); +WINUSERAPI BOOL WINAPI SetRectEmpty(LPRECT); + +#else + +/* Inline versions of common RECT helpers */ + +static inline BOOL WINAPI IsRectEmpty(const RECT *rect) +{ + if (!rect) return TRUE; + return ((rect->left >= rect->right) || (rect->top >= rect->bottom)); +} + +static inline BOOL WINAPI SetRect(LPRECT rect, INT left, INT top, INT right, INT bottom) +{ + if (!rect) return FALSE; + rect->left = left; + rect->right = right; + rect->top = top; + rect->bottom = bottom; + return TRUE; +} + +static inline BOOL WINAPI SetRectEmpty(LPRECT rect) +{ + if (!rect) return FALSE; + rect->left = rect->right = rect->top = rect->bottom = 0; + return TRUE; +} + +#endif /* !defined(__WINESRC__) || defined(WINE_NO_INLINE_RECT) */ + /* Undocumented functions */ /* NOTE: This is SYSTEM.3, not USER.182, which is also named KillSystemTimer */

1 0

Alexandre Julliard : winecfg: Keep metrics in DPI-relative format when saving the theme.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 5b8fdb97310f17396f496eea37bd5c0d27c7b337 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b8fdb97310f17396f496eea3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue May 17 21:19:22 2016 +0900 winecfg: Keep metrics in DPI-relative format when saving the theme. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winecfg/theme.c | 59 +++++++++++++++++++++++++++--------------------- 1 file changed, 33 insertions(+), 26 deletions(-) diff --git a/programs/winecfg/theme.c b/programs/winecfg/theme.c index 2b24dd9..1d915bc 100644 --- a/programs/winecfg/theme.c +++ b/programs/winecfg/theme.c @@ -1011,35 +1011,42 @@ static void read_sysparams(HWND hDlg) static void apply_sysparams(void) { - NONCLIENTMETRICSW nonclient_metrics; + NONCLIENTMETRICSW ncm; int i, cnt = 0; int colors_idx[sizeof(metrics) / sizeof(metrics[0])]; COLORREF colors[sizeof(metrics) / sizeof(metrics[0])]; - - nonclient_metrics.cbSize = sizeof(nonclient_metrics); - SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(nonclient_metrics), &nonclient_metrics, 0); - - nonclient_metrics.iMenuWidth = nonclient_metrics.iMenuHeight = - metrics[IDC_SYSPARAMS_MENU - IDC_SYSPARAMS_BUTTON].size; - nonclient_metrics.iCaptionWidth = nonclient_metrics.iCaptionHeight = - metrics[IDC_SYSPARAMS_ACTIVE_TITLE - IDC_SYSPARAMS_BUTTON].size; - nonclient_metrics.iScrollWidth = nonclient_metrics.iScrollHeight = - metrics[IDC_SYSPARAMS_SCROLLBAR - IDC_SYSPARAMS_BUTTON].size; - - memcpy(&(nonclient_metrics.lfMenuFont), - &(metrics[IDC_SYSPARAMS_MENU_TEXT - IDC_SYSPARAMS_BUTTON].lf), - sizeof(LOGFONTW)); - memcpy(&(nonclient_metrics.lfCaptionFont), - &(metrics[IDC_SYSPARAMS_ACTIVE_TITLE_TEXT - IDC_SYSPARAMS_BUTTON].lf), - sizeof(LOGFONTW)); - memcpy(&(nonclient_metrics.lfStatusFont), - &(metrics[IDC_SYSPARAMS_TOOLTIP_TEXT - IDC_SYSPARAMS_BUTTON].lf), - sizeof(LOGFONTW)); - memcpy(&(nonclient_metrics.lfMessageFont), - &(metrics[IDC_SYSPARAMS_MSGBOX_TEXT - IDC_SYSPARAMS_BUTTON].lf), - sizeof(LOGFONTW)); - - SystemParametersInfoW(SPI_SETNONCLIENTMETRICS, sizeof(nonclient_metrics), &nonclient_metrics, + HDC hdc; + int dpi; + + hdc = GetDC( 0 ); + dpi = GetDeviceCaps( hdc, LOGPIXELSY ); + ReleaseDC( 0, hdc ); + + ncm.cbSize = sizeof(ncm); + SystemParametersInfoW(SPI_GETNONCLIENTMETRICS, sizeof(ncm), &ncm, 0); + + /* convert metrics back to twips */ + ncm.iMenuWidth = ncm.iMenuHeight = + MulDiv( metrics[IDC_SYSPARAMS_MENU - IDC_SYSPARAMS_BUTTON].size, -1440, dpi ); + ncm.iCaptionWidth = ncm.iCaptionHeight = + MulDiv( metrics[IDC_SYSPARAMS_ACTIVE_TITLE - IDC_SYSPARAMS_BUTTON].size, -1440, dpi ); + ncm.iScrollWidth = ncm.iScrollHeight = + MulDiv( metrics[IDC_SYSPARAMS_SCROLLBAR - IDC_SYSPARAMS_BUTTON].size, -1440, dpi ); + ncm.iSmCaptionWidth = MulDiv( ncm.iSmCaptionWidth, -1440, dpi ); + ncm.iSmCaptionHeight = MulDiv( ncm.iSmCaptionHeight, -1440, dpi ); + + ncm.lfMenuFont = metrics[IDC_SYSPARAMS_MENU_TEXT - IDC_SYSPARAMS_BUTTON].lf; + ncm.lfCaptionFont = metrics[IDC_SYSPARAMS_ACTIVE_TITLE_TEXT - IDC_SYSPARAMS_BUTTON].lf; + ncm.lfStatusFont = metrics[IDC_SYSPARAMS_TOOLTIP_TEXT - IDC_SYSPARAMS_BUTTON].lf; + ncm.lfMessageFont = metrics[IDC_SYSPARAMS_MSGBOX_TEXT - IDC_SYSPARAMS_BUTTON].lf; + + ncm.lfMenuFont.lfHeight = MulDiv( ncm.lfMenuFont.lfHeight, -72, dpi ); + ncm.lfCaptionFont.lfHeight = MulDiv( ncm.lfCaptionFont.lfHeight, -72, dpi ); + ncm.lfStatusFont.lfHeight = MulDiv( ncm.lfStatusFont.lfHeight, -72, dpi ); + ncm.lfMessageFont.lfHeight = MulDiv( ncm.lfMessageFont.lfHeight, -72, dpi ); + ncm.lfSmCaptionFont.lfHeight = MulDiv( ncm.lfSmCaptionFont.lfHeight, -72, dpi ); + + SystemParametersInfoW(SPI_SETNONCLIENTMETRICS, sizeof(ncm), &ncm, SPIF_UPDATEINIFILE | SPIF_SENDCHANGE); for (i = 0; i < sizeof(metrics) / sizeof(metrics[0]); i++)

1 0

Henri Verbeet : wined3d: Only allow 256 vertex shader vec4's.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: aa5ccba8684bef5d7f6d409c68fdf39de22a22a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa5ccba8684bef5d7f6d409c6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 17 14:01:45 2016 +0200 wined3d: Only allow 256 vertex shader vec4's. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 11 +++-------- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/glsl_shader.c | 17 ++++++----------- dlls/wined3d/stateblock.c | 26 +++----------------------- dlls/wined3d/wined3d_private.h | 7 ++++--- 5 files changed, 18 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=aa5ccba8684bef5d7f6d4…

1 0

Henri Verbeet : wined3d: Only allow 224 pixel shader vec4's.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 25b907697a637561a5eac3c1eb92a52976550875 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25b907697a637561a5eac3c1e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 17 14:01:46 2016 +0200 wined3d: Only allow 224 pixel shader vec4's. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 24 +++++------------ dlls/wined3d/cs.c | 15 +++-------- dlls/wined3d/device.c | 17 +++++------- dlls/wined3d/glsl_shader.c | 16 +++++------- dlls/wined3d/stateblock.c | 54 ++++----------------------------------- dlls/wined3d/wined3d_private.h | 9 ++++--- 6 files changed, 33 insertions(+), 102 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=25b907697a637561a5eac…

1 0

Henri Verbeet : wined3d: Rename MAX_CONST_I to WINED3D_MAX_CONSTS_I.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 4f1acfebf5e730197449e3fa9d90c6197f6638fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f1acfebf5e730197449e3fa9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 17 14:01:47 2016 +0200 wined3d: Rename MAX_CONST_I to WINED3D_MAX_CONSTS_I. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 20 ++++++++++---------- dlls/wined3d/device.c | 16 ++++++++-------- dlls/wined3d/glsl_shader.c | 10 +++++----- dlls/wined3d/stateblock.c | 4 ++-- dlls/wined3d/wined3d_private.h | 18 +++++++++--------- 5 files changed, 34 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4f1acfebf5e730197449e…

1 0

Henri Verbeet : wined3d: Store vertex shader integer constants as wined3d_ivec4 structures.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 43c31e68bedace55d398bae9dd3dbfd0b2fa057e URL: http://source.winehq.org/git/wine.git/?a=commit;h=43c31e68bedace55d398bae9d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 17 14:01:48 2016 +0200 wined3d: Store vertex shader integer constants as wined3d_ivec4 structures. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 12 ++++++------ dlls/wined3d/device.c | 4 ++-- dlls/wined3d/glsl_shader.c | 14 +++++++------- dlls/wined3d/stateblock.c | 13 +++---------- dlls/wined3d/utils.c | 8 ++++++++ dlls/wined3d/wined3d_private.h | 3 ++- include/wine/wined3d.h | 8 ++++++++ 7 files changed, 36 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 8c23fe5..d75bffd 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -625,9 +625,9 @@ static void shader_arb_vs_local_constants(const struct arb_vs_compiled_shader *g if(gl_shader->int_consts[i] != WINED3D_CONST_NUM_UNUSED) { float val[4]; - val[0] = (float)state->vs_consts_i[4 * i]; - val[1] = (float)state->vs_consts_i[4 * i + 1]; - val[2] = (float)state->vs_consts_i[4 * i + 2]; + val[0] = (float)state->vs_consts_i[i].x; + val[1] = (float)state->vs_consts_i[i].y; + val[2] = (float)state->vs_consts_i[i].z; val[3] = -1.0f; GL_EXTCALL(glProgramLocalParameter4fvARB(GL_VERTEX_PROGRAM_ARB, gl_shader->int_consts[i], val)); @@ -4675,9 +4675,9 @@ static void find_arb_vs_compile_args(const struct wined3d_state *state, } else { - args->loop_ctrl[i][0] = state->vs_consts_i[i * 4]; - args->loop_ctrl[i][1] = state->vs_consts_i[i * 4 + 1]; - args->loop_ctrl[i][2] = state->vs_consts_i[i * 4 + 2]; + args->loop_ctrl[i][0] = state->vs_consts_i[i].x; + args->loop_ctrl[i][1] = state->vs_consts_i[i].y; + args->loop_ctrl[i][2] = state->vs_consts_i[i].z; } } } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d2d9fc3..ab87956 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2430,7 +2430,7 @@ HRESULT CDECL wined3d_device_set_vs_consts_i(struct wined3d_device *device, if (!constants || start_register >= WINED3D_MAX_CONSTS_I) return WINED3DERR_INVALIDCALL; - memcpy(&device->update_state->vs_consts_i[start_register * 4], constants, count * sizeof(int) * 4); + memcpy(&device->update_state->vs_consts_i[start_register], constants, count * sizeof(int) * 4); for (i = 0; i < count; ++i) TRACE("Set INT constant %u to {%d, %d, %d, %d}.\n", start_register + i, constants[i * 4], constants[i * 4 + 1], @@ -2460,7 +2460,7 @@ HRESULT CDECL wined3d_device_get_vs_consts_i(const struct wined3d_device *device if (!constants || start_register >= WINED3D_MAX_CONSTS_I) return WINED3DERR_INVALIDCALL; - memcpy(constants, &device->state.vs_consts_i[start_register * 4], count * sizeof(int) * 4); + memcpy(constants, &device->state.vs_consts_i[start_register], count * sizeof(int) * 4); return WINED3D_OK; } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c101c9f..9ff2c7b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -728,8 +728,8 @@ static void shader_glsl_load_constants_f(const struct wined3d_shader *shader, co } /* Context activation is done by the caller. */ -static void shader_glsl_load_constantsI(const struct wined3d_shader *shader, const struct wined3d_gl_info *gl_info, - const GLint locations[WINED3D_MAX_CONSTS_I], const int *constants, WORD constants_set) +static void shader_glsl_load_constants_i(const struct wined3d_shader *shader, const struct wined3d_gl_info *gl_info, + const struct wined3d_ivec4 *constants, const GLint locations[WINED3D_MAX_CONSTS_I], WORD constants_set) { unsigned int i; struct list* ptr; @@ -739,7 +739,7 @@ static void shader_glsl_load_constantsI(const struct wined3d_shader *shader, con if (!(constants_set & 1)) continue; /* We found this uniform name in the program - go ahead and send the data */ - GL_EXTCALL(glUniform4iv(locations[i], 1, &constants[i * 4])); + GL_EXTCALL(glUniform4iv(locations[i], 1, &constants[i].x)); } /* Load immediate constants */ @@ -1335,8 +1335,8 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context prog->vs.uniform_f_locations, &priv->vconst_heap, priv->stack, constant_version); if (update_mask & WINED3D_SHADER_CONST_VS_I) - shader_glsl_load_constantsI(vshader, gl_info, prog->vs.uniform_i_locations, state->vs_consts_i, - vshader->reg_maps.integer_constants); + shader_glsl_load_constants_i(vshader, gl_info, state->vs_consts_i, + prog->vs.uniform_i_locations, vshader->reg_maps.integer_constants); if (update_mask & WINED3D_SHADER_CONST_VS_B) shader_glsl_load_constantsB(vshader, gl_info, prog->vs.uniform_b_locations, state->vs_consts_b, @@ -1408,8 +1408,8 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context prog->ps.uniform_f_locations, &priv->pconst_heap, priv->stack, constant_version); if (update_mask & WINED3D_SHADER_CONST_PS_I) - shader_glsl_load_constantsI(pshader, gl_info, prog->ps.uniform_i_locations, state->ps_consts_i, - pshader->reg_maps.integer_constants); + shader_glsl_load_constants_i(pshader, gl_info, (const struct wined3d_ivec4 *)state->ps_consts_i, + prog->ps.uniform_i_locations, pshader->reg_maps.integer_constants); if (update_mask & WINED3D_SHADER_CONST_PS_B) shader_glsl_load_constantsB(pshader, gl_info, prog->ps.uniform_b_locations, state->ps_consts_b, diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index b29dee4..d9547ea 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -643,16 +643,9 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) { unsigned int idx = stateblock->contained_vs_consts_i[i]; - TRACE("Setting vs_consts[%u] to {%d, %d, %d, %d}.\n", idx, - src_state->vs_consts_i[idx * 4 + 0], - src_state->vs_consts_i[idx * 4 + 1], - src_state->vs_consts_i[idx * 4 + 2], - src_state->vs_consts_i[idx * 4 + 3]); + TRACE("Setting vs_consts[%u] to %s.\n", idx, debug_ivec4(&src_state->vs_consts_i[idx])); - stateblock->state.vs_consts_i[idx * 4 + 0] = src_state->vs_consts_i[idx * 4 + 0]; - stateblock->state.vs_consts_i[idx * 4 + 1] = src_state->vs_consts_i[idx * 4 + 1]; - stateblock->state.vs_consts_i[idx * 4 + 2] = src_state->vs_consts_i[idx * 4 + 2]; - stateblock->state.vs_consts_i[idx * 4 + 3] = src_state->vs_consts_i[idx * 4 + 3]; + stateblock->state.vs_consts_i[idx] = src_state->vs_consts_i[idx]; } /* Vertex shader boolean constants. */ @@ -919,7 +912,7 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) for (i = 0; i < stateblock->num_contained_vs_consts_i; ++i) { wined3d_device_set_vs_consts_i(device, stateblock->contained_vs_consts_i[i], - stateblock->state.vs_consts_i + stateblock->contained_vs_consts_i[i] * 4, 1); + &stateblock->state.vs_consts_i[stateblock->contained_vs_consts_i[i]].x, 1); } for (i = 0; i < stateblock->num_contained_vs_consts_b; ++i) { diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 70a4b03..cbfd368 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3365,6 +3365,14 @@ const char *debug_color(const struct wined3d_color *color) color->r, color->g, color->b, color->a); } +const char *debug_ivec4(const struct wined3d_ivec4 *v) +{ + if (!v) + return "(null)"; + return wine_dbg_sprintf("{%d, %d, %d, %d}", + v->x, v->y, v->z, v->w); +} + const char *debug_vec4(const struct wined3d_vec4 *v) { if (!v) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f753b81..b3e19ff 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2213,7 +2213,7 @@ struct wined3d_state struct wined3d_shader_resource_view *shader_resource_view[WINED3D_SHADER_TYPE_COUNT][MAX_SHADER_RESOURCE_VIEWS]; BOOL vs_consts_b[MAX_CONST_B]; - INT vs_consts_i[WINED3D_MAX_CONSTS_I * 4]; + struct wined3d_ivec4 vs_consts_i[WINED3D_MAX_CONSTS_I]; struct wined3d_vec4 vs_consts_f[WINED3D_MAX_VS_CONSTS_F]; BOOL ps_consts_b[MAX_CONST_B]; @@ -3103,6 +3103,7 @@ const char *debug_d3dpool(enum wined3d_pool pool) DECLSPEC_HIDDEN; const char *debug_fboattachment(GLenum attachment) DECLSPEC_HIDDEN; const char *debug_fbostatus(GLenum status) DECLSPEC_HIDDEN; const char *debug_glerror(GLenum error) DECLSPEC_HIDDEN; +const char *debug_ivec4(const struct wined3d_ivec4 *v) DECLSPEC_HIDDEN; const char *debug_shader_type(enum wined3d_shader_type shader_type) DECLSPEC_HIDDEN; const char *debug_vec4(const struct wined3d_vec4 *v) DECLSPEC_HIDDEN; void dump_color_fixup_desc(struct color_fixup_desc fixup) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 4cfe1e0..af5cd38 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1505,6 +1505,14 @@ struct wined3d_vec4 float w; }; +struct wined3d_ivec4 +{ + int x; + int y; + int z; + int w; +}; + struct wined3d_matrix { float _11, _12, _13, _14;

1 0

Henri Verbeet : wined3d: Store pixel shader integer constants as wined3d_ivec4 structures.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: e71a360fcd0a6005953e3ef9bd3633cb1e998b94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e71a360fcd0a6005953e3ef9b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 17 14:01:49 2016 +0200 wined3d: Store pixel shader integer constants as wined3d_ivec4 structures. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 12 ++++++------ dlls/wined3d/device.c | 4 ++-- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/stateblock.c | 14 ++++---------- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 14 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index d75bffd..3a81a17 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -595,9 +595,9 @@ static void shader_arb_ps_local_constants(const struct arb_ps_compiled_shader *g if(gl_shader->int_consts[i] != WINED3D_CONST_NUM_UNUSED) { float val[4]; - val[0] = (float)state->ps_consts_i[4 * i]; - val[1] = (float)state->ps_consts_i[4 * i + 1]; - val[2] = (float)state->ps_consts_i[4 * i + 2]; + val[0] = (float)state->ps_consts_i[i].x; + val[1] = (float)state->ps_consts_i[i].y; + val[2] = (float)state->ps_consts_i[i].z; val[3] = -1.0f; GL_EXTCALL(glProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, gl_shader->int_consts[i], val)); @@ -4598,9 +4598,9 @@ static void find_arb_ps_compile_args(const struct wined3d_state *state, } else { - args->loop_ctrl[i][0] = state->ps_consts_i[i * 4]; - args->loop_ctrl[i][1] = state->ps_consts_i[i * 4 + 1]; - args->loop_ctrl[i][2] = state->ps_consts_i[i * 4 + 2]; + args->loop_ctrl[i][0] = state->ps_consts_i[i].x; + args->loop_ctrl[i][1] = state->ps_consts_i[i].y; + args->loop_ctrl[i][2] = state->ps_consts_i[i].z; } } } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ab87956..a61e1f5 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2657,7 +2657,7 @@ HRESULT CDECL wined3d_device_set_ps_consts_i(struct wined3d_device *device, if (!constants || start_register >= WINED3D_MAX_CONSTS_I) return WINED3DERR_INVALIDCALL; - memcpy(&device->update_state->ps_consts_i[start_register * 4], constants, count * sizeof(int) * 4); + memcpy(&device->update_state->ps_consts_i[start_register], constants, count * sizeof(int) * 4); for (i = 0; i < count; ++i) TRACE("Set INT constant %u to {%d, %d, %d, %d}.\n", start_register + i, constants[i * 4], constants[i * 4 + 1], @@ -2687,7 +2687,7 @@ HRESULT CDECL wined3d_device_get_ps_consts_i(const struct wined3d_device *device if (!constants || start_register >= WINED3D_MAX_CONSTS_I) return WINED3DERR_INVALIDCALL; - memcpy(constants, &device->state.ps_consts_i[start_register * 4], count * sizeof(int) * 4); + memcpy(constants, &device->state.ps_consts_i[start_register], count * sizeof(int) * 4); return WINED3D_OK; } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 9ff2c7b..4075418 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1408,7 +1408,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context prog->ps.uniform_f_locations, &priv->pconst_heap, priv->stack, constant_version); if (update_mask & WINED3D_SHADER_CONST_PS_I) - shader_glsl_load_constants_i(pshader, gl_info, (const struct wined3d_ivec4 *)state->ps_consts_i, + shader_glsl_load_constants_i(pshader, gl_info, state->ps_consts_i, prog->ps.uniform_i_locations, pshader->reg_maps.integer_constants); if (update_mask & WINED3D_SHADER_CONST_PS_B) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index d9547ea..090faed 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -673,16 +673,10 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) for (i = 0; i < stateblock->num_contained_ps_consts_i; ++i) { unsigned int idx = stateblock->contained_ps_consts_i[i]; - TRACE("Setting ps_consts_i[%u] to {%d, %d, %d, %d}.\n", idx, - src_state->ps_consts_i[idx * 4 + 0], - src_state->ps_consts_i[idx * 4 + 1], - src_state->ps_consts_i[idx * 4 + 2], - src_state->ps_consts_i[idx * 4 + 3]); - stateblock->state.ps_consts_i[idx * 4 + 0] = src_state->ps_consts_i[idx * 4 + 0]; - stateblock->state.ps_consts_i[idx * 4 + 1] = src_state->ps_consts_i[idx * 4 + 1]; - stateblock->state.ps_consts_i[idx * 4 + 2] = src_state->ps_consts_i[idx * 4 + 2]; - stateblock->state.ps_consts_i[idx * 4 + 3] = src_state->ps_consts_i[idx * 4 + 3]; + TRACE("Setting ps_consts_i[%u] to %s.\n", idx, debug_ivec4(&src_state->ps_consts_i[idx])); + + stateblock->state.ps_consts_i[idx] = src_state->ps_consts_i[idx]; } /* Pixel shader boolean constants. */ @@ -934,7 +928,7 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) for (i = 0; i < stateblock->num_contained_ps_consts_i; ++i) { wined3d_device_set_ps_consts_i(device, stateblock->contained_ps_consts_i[i], - stateblock->state.ps_consts_i + stateblock->contained_ps_consts_i[i] * 4, 1); + &stateblock->state.ps_consts_i[stateblock->contained_ps_consts_i[i]].x, 1); } for (i = 0; i < stateblock->num_contained_ps_consts_b; ++i) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b3e19ff..c2f6471 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2217,7 +2217,7 @@ struct wined3d_state struct wined3d_vec4 vs_consts_f[WINED3D_MAX_VS_CONSTS_F]; BOOL ps_consts_b[MAX_CONST_B]; - INT ps_consts_i[WINED3D_MAX_CONSTS_I * 4]; + struct wined3d_ivec4 ps_consts_i[WINED3D_MAX_CONSTS_I]; struct wined3d_vec4 ps_consts_f[WINED3D_MAX_PS_CONSTS_F]; struct wined3d_texture *textures[MAX_COMBINED_SAMPLERS];

1 0

Henri Verbeet : wined3d: Pass wined3d_ivec4 structures to wined3d_device_set_vs_consts_i().
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: ba840a4c050554fd8f689d732e5fb8a4126dd641 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba840a4c050554fd8f689d732… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 17 14:01:50 2016 +0200 wined3d: Pass wined3d_ivec4 structures to wined3d_device_set_vs_consts_i(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 3 ++- dlls/wined3d/device.c | 26 ++++++++++++++------------ dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 5 files changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index b0ef724..0c099e0 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2852,7 +2852,8 @@ static HRESULT WINAPI d3d9_device_SetVertexShaderConstantI(IDirect3DDevice9Ex *i TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count); wined3d_mutex_lock(); - hr = wined3d_device_set_vs_consts_i(device->wined3d_device, reg_idx, data, count); + hr = wined3d_device_set_vs_consts_i(device->wined3d_device, + reg_idx, count, (const struct wined3d_ivec4 *)data); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a61e1f5..59a5c8c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2419,26 +2419,28 @@ HRESULT CDECL wined3d_device_get_vs_consts_b(const struct wined3d_device *device } HRESULT CDECL wined3d_device_set_vs_consts_i(struct wined3d_device *device, - UINT start_register, const int *constants, UINT vector4i_count) + unsigned int start_idx, unsigned int count, const struct wined3d_ivec4 *constants) { - UINT count = min(vector4i_count, WINED3D_MAX_CONSTS_I - start_register); - UINT i; + unsigned int i; - TRACE("device %p, start_register %u, constants %p, vector4i_count %u.\n", - device, start_register, constants, vector4i_count); + TRACE("device %p, start_idx %u, count %u, constants %p.\n", + device, start_idx, count, constants); - if (!constants || start_register >= WINED3D_MAX_CONSTS_I) + if (!constants || start_idx >= WINED3D_MAX_CONSTS_I) return WINED3DERR_INVALIDCALL; - memcpy(&device->update_state->vs_consts_i[start_register], constants, count * sizeof(int) * 4); - for (i = 0; i < count; ++i) - TRACE("Set INT constant %u to {%d, %d, %d, %d}.\n", start_register + i, - constants[i * 4], constants[i * 4 + 1], - constants[i * 4 + 2], constants[i * 4 + 3]); + if (count > WINED3D_MAX_CONSTS_I - start_idx) + count = WINED3D_MAX_CONSTS_I - start_idx; + memcpy(&device->update_state->vs_consts_i[start_idx], constants, count * sizeof(*constants)); + if (TRACE_ON(d3d)) + { + for (i = 0; i < count; ++i) + TRACE("Set ivec4 constant %u to %s.\n", start_idx + i, debug_ivec4(&constants[i])); + } if (device->recording) { - for (i = start_register; i < count + start_register; ++i) + for (i = start_idx; i < count + start_idx; ++i) device->recording->changed.vertexShaderConstantsI |= (1u << i); } else diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 090faed..b648034 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -906,7 +906,7 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) for (i = 0; i < stateblock->num_contained_vs_consts_i; ++i) { wined3d_device_set_vs_consts_i(device, stateblock->contained_vs_consts_i[i], - &stateblock->state.vs_consts_i[stateblock->contained_vs_consts_i[i]].x, 1); + 1, &stateblock->state.vs_consts_i[stateblock->contained_vs_consts_i[i]]); } for (i = 0; i < stateblock->num_contained_vs_consts_b; ++i) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 4eb2470..3831a65 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -151,7 +151,7 @@ @ cdecl wined3d_device_set_vs_cb(ptr long ptr) @ cdecl wined3d_device_set_vs_consts_b(ptr long ptr long) @ cdecl wined3d_device_set_vs_consts_f(ptr long long ptr) -@ cdecl wined3d_device_set_vs_consts_i(ptr long ptr long) +@ cdecl wined3d_device_set_vs_consts_i(ptr long long ptr) @ cdecl wined3d_device_set_vs_resource_view(ptr long ptr) @ cdecl wined3d_device_set_vs_sampler(ptr long ptr) @ cdecl wined3d_device_setup_fullscreen_window(ptr ptr long long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index af5cd38..31aba7a 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2251,7 +2251,7 @@ HRESULT __cdecl wined3d_device_set_vs_consts_b(struct wined3d_device *device, HRESULT __cdecl wined3d_device_set_vs_consts_f(struct wined3d_device *device, unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants); HRESULT __cdecl wined3d_device_set_vs_consts_i(struct wined3d_device *device, - UINT start_register, const int *constants, UINT vector4i_count); + unsigned int start_idx, unsigned int count, const struct wined3d_ivec4 *constants); void __cdecl wined3d_device_set_vs_resource_view(struct wined3d_device *device, UINT idx, struct wined3d_shader_resource_view *view); void __cdecl wined3d_device_set_vs_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler);

1 0

Henri Verbeet : wined3d: Pass wined3d_ivec4 structures to wined3d_device_get_vs_consts_i().
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 3ae7ab95838837a64b6226efc6778d271f2bed6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ae7ab95838837a64b6226efc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 17 14:01:51 2016 +0200 wined3d: Pass wined3d_ivec4 structures to wined3d_device_get_vs_consts_i(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 3 ++- dlls/wined3d/device.c | 14 +++++++------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 0c099e0..8f46fcd 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -2868,7 +2868,8 @@ static HRESULT WINAPI d3d9_device_GetVertexShaderConstantI(IDirect3DDevice9Ex *i TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count); wined3d_mutex_lock(); - hr = wined3d_device_get_vs_consts_i(device->wined3d_device, reg_idx, data, count); + hr = wined3d_device_get_vs_consts_i(device->wined3d_device, + reg_idx, count, (struct wined3d_ivec4 *)data); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 59a5c8c..19e819c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2452,17 +2452,17 @@ HRESULT CDECL wined3d_device_set_vs_consts_i(struct wined3d_device *device, } HRESULT CDECL wined3d_device_get_vs_consts_i(const struct wined3d_device *device, - UINT start_register, int *constants, UINT vector4i_count) + unsigned int start_idx, unsigned int count, struct wined3d_ivec4 *constants) { - UINT count = min(vector4i_count, WINED3D_MAX_CONSTS_I - start_register); - - TRACE("device %p, start_register %u, constants %p, vector4i_count %u.\n", - device, start_register, constants, vector4i_count); + TRACE("device %p, start_idx %u, count %u, constants %p.\n", + device, start_idx, count, constants); - if (!constants || start_register >= WINED3D_MAX_CONSTS_I) + if (!constants || start_idx >= WINED3D_MAX_CONSTS_I) return WINED3DERR_INVALIDCALL; - memcpy(constants, &device->state.vs_consts_i[start_register], count * sizeof(int) * 4); + if (count > WINED3D_MAX_CONSTS_I - start_idx) + count = WINED3D_MAX_CONSTS_I - start_idx; + memcpy(constants, &device->state.vs_consts_i[start_idx], count * sizeof(*constants)); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 3831a65..d81e065 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -95,7 +95,7 @@ @ cdecl wined3d_device_get_vs_cb(ptr long) @ cdecl wined3d_device_get_vs_consts_b(ptr long ptr long) @ cdecl wined3d_device_get_vs_consts_f(ptr long long ptr) -@ cdecl wined3d_device_get_vs_consts_i(ptr long ptr long) +@ cdecl wined3d_device_get_vs_consts_i(ptr long long ptr) @ cdecl wined3d_device_get_vs_resource_view(ptr long) @ cdecl wined3d_device_get_vs_sampler(ptr long) @ cdecl wined3d_device_get_wined3d(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 31aba7a..8ddf560 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2163,7 +2163,7 @@ HRESULT __cdecl wined3d_device_get_vs_consts_b(const struct wined3d_device *devi HRESULT __cdecl wined3d_device_get_vs_consts_f(const struct wined3d_device *device, unsigned int start_idx, unsigned int count, struct wined3d_vec4 *constants); HRESULT __cdecl wined3d_device_get_vs_consts_i(const struct wined3d_device *device, - UINT start_register, int *constants, UINT vector4i_count); + unsigned int start_idx, unsigned int count, struct wined3d_ivec4 *constants); struct wined3d_shader_resource_view * __cdecl wined3d_device_get_vs_resource_view(const struct wined3d_device *device, UINT idx); struct wined3d_sampler * __cdecl wined3d_device_get_vs_sampler(const struct wined3d_device *device, UINT idx);

1 0