October 2016 - Wine-commits

Huw Davies : riched20: Allow selecting the final end-of-paragraph when using the mouse.
by Alexandre Julliard 04 Oct '16

04 Oct '16

Module: wine Branch: master Commit: 304c8320c9b86b770f98396b86499b200d20b92c URL: http://source.winehq.org/git/wine.git/?a=commit;h=304c8320c9b86b770f98396b8… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 4 13:07:35 2016 +0100 riched20: Allow selecting the final end-of-paragraph when using the mouse. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 74239af..1dacdfa 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -961,11 +961,13 @@ static BOOL ME_FindRunInRow(ME_TextEditor *editor, ME_DisplayItem *pRow, * x & y are pixel positions in virtual coordinates into the rich edit control, * so client coordinates must first be adjusted by the scroll position. * + * If final_eop is TRUE consider the final end-of-paragraph. + * * returns TRUE if the result was exactly under the cursor, otherwise returns * FALSE, and result is set to the closest position to the coordinates. */ static BOOL ME_FindPixelPos(ME_TextEditor *editor, int x, int y, - ME_Cursor *result, BOOL *is_eol) + ME_Cursor *result, BOOL *is_eol, BOOL final_eop) { ME_DisplayItem *p = editor->pBuffer->pFirst->member.para.next_para; BOOL isExact = TRUE; @@ -1001,7 +1003,7 @@ static BOOL ME_FindPixelPos(ME_TextEditor *editor, int x, int y, if (!pp) break; p = pp; } - if (p == editor->pBuffer->pLast) + if (p == editor->pBuffer->pLast && !final_eop) { /* The position is below the last paragraph, so the last row will be used * rather than the end of the text, so the x position will be used to @@ -1016,10 +1018,7 @@ static BOOL ME_FindPixelPos(ME_TextEditor *editor, int x, int y, if( p->type == diStartRow ) return ME_FindRunInRow( editor, p, x, result, is_eol ) && isExact; - result->pRun = ME_FindItemBack(p, diRun); - result->pPara = ME_GetParagraph(result->pRun); - result->nOffset = 0; - assert(result->pRun->member.run.nFlags & MERF_ENDPARA); + ME_SetCursorToEnd(editor, result, TRUE); return FALSE; } @@ -1047,7 +1046,7 @@ BOOL ME_CharFromPos(ME_TextEditor *editor, int x, int y, } x += editor->horz_si.nPos; y += editor->vert_si.nPos; - bResult = ME_FindPixelPos(editor, x, y, cursor, NULL); + bResult = ME_FindPixelPos(editor, x, y, cursor, NULL, FALSE); if (isExact) *isExact = bResult; return TRUE; } @@ -1130,7 +1129,7 @@ void ME_LButtonDown(ME_TextEditor *editor, int x, int y, int clickNum) is_selection = ME_IsSelection(editor); is_shift = GetKeyState(VK_SHIFT) < 0; - ME_FindPixelPos(editor, x, y, &editor->pCursors[0], &editor->bCaretAtEnd); + ME_FindPixelPos(editor, x, y, &editor->pCursors[0], &editor->bCaretAtEnd, FALSE); if (x >= editor->rcFormat.left || is_shift) { @@ -1190,7 +1189,7 @@ void ME_MouseMove(ME_TextEditor *editor, int x, int y) tmp_cursor = editor->pCursors[0]; /* FIXME: do something with the return value of ME_FindPixelPos */ - ME_FindPixelPos(editor, x, y, &tmp_cursor, &editor->bCaretAtEnd); + ME_FindPixelPos(editor, x, y, &tmp_cursor, &editor->bCaretAtEnd, TRUE); ME_InvalidateSelection(editor); editor->pCursors[0] = tmp_cursor;

1 0

Huw Davies : riched20: Clearing the insert style should not depend on the event mask.
by Alexandre Julliard 04 Oct '16

04 Oct '16

Module: wine Branch: master Commit: df1b51dfa48d14f4e3dfe776c73050e3ad42608e URL: http://source.winehq.org/git/wine.git/?a=commit;h=df1b51dfa48d14f4e3dfe776c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 4 13:07:36 2016 +0100 riched20: Clearing the insert style should not depend on the event mask. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 1dacdfa..a47930f 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -1515,9 +1515,6 @@ void ME_SendSelChange(ME_TextEditor *editor) { SELCHANGE sc; - if (!(editor->nEventMask & ENM_SELCHANGE)) - return; - sc.nmhdr.hwndFrom = NULL; sc.nmhdr.idFrom = 0; sc.nmhdr.code = EN_SELCHANGE; @@ -1527,16 +1524,21 @@ void ME_SendSelChange(ME_TextEditor *editor) sc.seltyp |= SEL_TEXT; if (sc.chrg.cpMin < sc.chrg.cpMax+1) /* what were RICHEDIT authors thinking ? */ sc.seltyp |= SEL_MULTICHAR; - TRACE("cpMin=%d cpMax=%d seltyp=%d (%s %s)\n", - sc.chrg.cpMin, sc.chrg.cpMax, sc.seltyp, - (sc.seltyp & SEL_TEXT) ? "SEL_TEXT" : "", - (sc.seltyp & SEL_MULTICHAR) ? "SEL_MULTICHAR" : ""); + if (sc.chrg.cpMin != editor->notified_cr.cpMin || sc.chrg.cpMax != editor->notified_cr.cpMax) { ME_ClearTempStyle(editor); editor->notified_cr = sc.chrg; - ITextHost_TxNotify(editor->texthost, sc.nmhdr.code, &sc); + + if (editor->nEventMask & ENM_SELCHANGE) + { + TRACE("cpMin=%d cpMax=%d seltyp=%d (%s %s)\n", + sc.chrg.cpMin, sc.chrg.cpMax, sc.seltyp, + (sc.seltyp & SEL_TEXT) ? "SEL_TEXT" : "", + (sc.seltyp & SEL_MULTICHAR) ? "SEL_MULTICHAR" : ""); + ITextHost_TxNotify(editor->texthost, sc.nmhdr.code, &sc); + } } }

1 0

Huw Davies : riched20: Move the wrap context struct into wrap.c .
by Alexandre Julliard 04 Oct '16

04 Oct '16

Module: wine Branch: master Commit: ef2e53f9813a959931aa9ac0cc42d5ba9686941a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef2e53f9813a959931aa9ac0c… Author: Huw Davies <huw(a)codeweavers.com> Date: Tue Oct 4 13:07:37 2016 +0100 riched20: Move the wrap context struct into wrap.c . Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editstr.h | 15 --------------- dlls/riched20/wrap.c | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index 261a701..35555a9 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -460,19 +460,4 @@ typedef struct tagME_Context ME_TextEditor *editor; } ME_Context; -typedef struct tagME_WrapContext -{ - ME_Style *style; - ME_Context *context; - int nLeftMargin, nRightMargin, nFirstMargin; - int nAvailWidth; - int nRow; - POINT pt; - BOOL bOverflown, bWordWrap; - ME_DisplayItem *pPara; - ME_DisplayItem *pRowStart; - - ME_DisplayItem *pLastSplittableRun; -} ME_WrapContext; - #endif diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 195eb8d..24a7b16 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -33,6 +33,20 @@ WINE_DECLARE_DEBUG_CHANNEL(richedit_check); * - no tabs */ +typedef struct tagME_WrapContext +{ + ME_Style *style; + ME_Context *context; + int nLeftMargin, nRightMargin, nFirstMargin; + int nAvailWidth; + int nRow; + POINT pt; + BOOL bOverflown, bWordWrap; + ME_DisplayItem *pPara; + ME_DisplayItem *pRowStart; + + ME_DisplayItem *pLastSplittableRun; +} ME_WrapContext; static BOOL get_run_glyph_buffers( ME_Run *run ) {

1 0

Aric Stewart : hidclass.sys: Minidriver handling for IRP_MN_REMOVE_DEVICE finished the IRP.
by Alexandre Julliard 04 Oct '16

04 Oct '16

Module: wine Branch: master Commit: 4163642b99166fad6fbfb97442577e9e7c605744 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4163642b99166fad6fbfb9744… Author: Aric Stewart <aric(a)codeweavers.com> Date: Tue Oct 4 05:35:35 2016 -0500 hidclass.sys: Minidriver handling for IRP_MN_REMOVE_DEVICE finished the IRP. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/pnp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 7df8374..81514c0 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -256,8 +256,7 @@ NTSTATUS WINAPI HID_PNP_Dispatch(DEVICE_OBJECT *device, IRP *irp) case IRP_MN_REMOVE_DEVICE: { HID_DeleteDevice(&minidriver->minidriver, device); - minidriver->PNPDispatch(device, irp); - break; + return minidriver->PNPDispatch(device, irp); } default: {

1 0

Hadrien Boizard : winemac.drv: Use EqualRect() instead of memcmp() to compare RECTs.
by Alexandre Julliard 04 Oct '16

04 Oct '16

Module: wine Branch: master Commit: 5d96ef42a58e09a2d6cf47a685abb3f42b513ceb URL: http://source.winehq.org/git/wine.git/?a=commit;h=5d96ef42a58e09a2d6cf47a68… Author: Hadrien Boizard <h.boizard(a)gmail.com> Date: Wed Sep 28 23:53:32 2016 +0200 winemac.drv: Use EqualRect() instead of memcmp() to compare RECTs. Signed-off-by: Hadrien Boizard <h.boizard(a)gmail.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/opengl.c | 4 ++-- dlls/winemac.drv/window.c | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/winemac.drv/opengl.c b/dlls/winemac.drv/opengl.c index e1953dd..6e1f151 100644 --- a/dlls/winemac.drv/opengl.c +++ b/dlls/winemac.drv/opengl.c @@ -1652,7 +1652,7 @@ static BOOL sync_context_rect(struct wgl_context *context) { RECT rect = data->client_rect; OffsetRect(&rect, -data->whole_rect.left, -data->whole_rect.top); - if (memcmp(&context->draw_rect, &rect, sizeof(context->draw_rect))) + if (!EqualRect(&context->draw_rect, &rect)) { context->draw_rect = rect; ret = TRUE; @@ -4327,7 +4327,7 @@ void sync_gl_view(struct macdrv_win_data* data, const RECT* old_whole_rect, cons OffsetRect(&old, -old_whole_rect->left, -old_whole_rect->top); OffsetRect(&new, -data->whole_rect.left, -data->whole_rect.top); - if (memcmp(&old, &new, sizeof(old))) + if (!EqualRect(&old, &new)) { TRACE("GL view %p changed position; marking contexts\n", data->client_cocoa_view); mark_contexts_for_moved_view(data->client_cocoa_view); diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index f4be7ce..0359ef7 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -746,7 +746,7 @@ static void destroy_cocoa_window(struct macdrv_win_data *data) */ static void create_cocoa_view(struct macdrv_win_data *data) { - BOOL equal = !memcmp(&data->window_rect, &data->client_rect, sizeof(data->whole_rect)); + BOOL equal = EqualRect(&data->window_rect, &data->client_rect); CGRect frame = cgrect_from_rect(data->window_rect); data->shaped = FALSE; @@ -1055,7 +1055,7 @@ static void sync_window_position(struct macdrv_win_data *data, UINT swp_flags, c else { BOOL were_equal = (data->cocoa_view == data->client_cocoa_view); - BOOL now_equal = !memcmp(&data->whole_rect, &data->client_rect, sizeof(data->whole_rect)); + BOOL now_equal = EqualRect(&data->whole_rect, &data->client_rect); if (were_equal && !now_equal) { @@ -1781,7 +1781,7 @@ BOOL CDECL macdrv_UpdateLayeredWindow(HWND hwnd, const UPDATELAYEREDWINDOWINFO * OffsetRect(&rect, -window_rect->left, -window_rect->top); surface = data->surface; - if (!surface || memcmp(&surface->rect, &rect, sizeof(RECT))) + if (!surface || !EqualRect(&surface->rect, &rect)) { data->surface = create_surface(data->cocoa_window, &rect, NULL, TRUE); set_window_surface(data->cocoa_window, data->surface); @@ -1967,7 +1967,7 @@ void CDECL macdrv_WindowPosChanging(HWND hwnd, HWND insert_after, UINT swp_flags surface_rect = get_surface_rect(visible_rect); if (data->surface) { - if (!memcmp(&data->surface->rect, &surface_rect, sizeof(surface_rect))) + if (EqualRect(&data->surface->rect, &surface_rect)) { /* existing surface is good enough */ surface_clip_to_visible_rect(data->surface, visible_rect); @@ -2051,7 +2051,7 @@ void CDECL macdrv_WindowPosChanged(HWND hwnd, HWND insert_after, UINT swp_flags, old_client_rect.right - data->client_rect.right == x_offset && old_client_rect.top - data->client_rect.top == y_offset && old_client_rect.bottom - data->client_rect.bottom == y_offset && - !memcmp(&valid_rects[0], &data->client_rect, sizeof(RECT))) + EqualRect(&valid_rects[0], &data->client_rect)) { /* A Cocoa window's bits are moved automatically */ if (!window && (x_offset != 0 || y_offset != 0))

1 0

Nikolay Sivov : d2d1: Initial implementation of HWND render target.
by Alexandre Julliard 04 Oct '16

04 Oct '16

Module: wine Branch: master Commit: f4cacf774b4dc6a906a395fac1e667e06350848c URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4cacf774b4dc6a906a395fac… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 3 18:56:11 2016 +0300 d2d1: Initial implementation of HWND render target. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/Makefile.in | 3 +- dlls/d2d1/d2d1_private.h | 17 +- dlls/d2d1/dc_render_target.c | 2 +- dlls/d2d1/factory.c | 25 +- dlls/d2d1/hwnd_render_target.c | 869 +++++++++++++++++++++++++++++++++++++++++ dlls/d2d1/render_target.c | 9 +- dlls/d2d1/tests/d2d1.c | 51 +++ 7 files changed, 970 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f4cacf774b4dc6a906a39…

1 0

Matteo Bruni : wined3d: Add ARB_fragment_coord_conventions extension.
by Alexandre Julliard 04 Oct '16

04 Oct '16

Module: wine Branch: master Commit: d9a9e45a24c230eb420c630916f41bd19192d324 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d9a9e45a24c230eb420c63091… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Oct 3 23:46:51 2016 +0200 wined3d: Add ARB_fragment_coord_conventions extension. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 3 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 50083d1..00e8d63 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -120,6 +120,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_draw_instanced", ARB_DRAW_INSTANCED }, {"GL_ARB_ES2_compatibility", ARB_ES2_COMPATIBILITY }, {"GL_ARB_explicit_attrib_location", ARB_EXPLICIT_ATTRIB_LOCATION }, + {"GL_ARB_fragment_coord_conventions", ARB_FRAGMENT_COORD_CONVENTIONS}, {"GL_ARB_fragment_program", ARB_FRAGMENT_PROGRAM }, {"GL_ARB_fragment_shader", ARB_FRAGMENT_SHADER }, {"GL_ARB_framebuffer_object", ARB_FRAMEBUFFER_OBJECT }, @@ -3556,6 +3557,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD /* ARB_geometry_shader4 exposes a somewhat different API compared to 3.2 * core geometry shaders so it's not really correct to expose the * extension for core-only support. */ + {ARB_FRAGMENT_COORD_CONVENTIONS, MAKEDWORD_VERSION(3, 2)}, {ARB_PROVOKING_VERTEX, MAKEDWORD_VERSION(3, 2)}, {ARB_SYNC, MAKEDWORD_VERSION(3, 2)}, {ARB_VERTEX_ARRAY_BGRA, MAKEDWORD_VERSION(3, 2)}, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 67ab6f7..3757b02 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -55,6 +55,7 @@ enum wined3d_gl_extension ARB_DRAW_INSTANCED, ARB_ES2_COMPATIBILITY, ARB_EXPLICIT_ATTRIB_LOCATION, + ARB_FRAGMENT_COORD_CONVENTIONS, ARB_FRAGMENT_PROGRAM, ARB_FRAGMENT_SHADER, ARB_FRAMEBUFFER_OBJECT,

1 0

Matteo Bruni : wined3d: Avoid vpos fixups when ARB_fragment_coord_conventions is supported.
by Alexandre Julliard 04 Oct '16

04 Oct '16

Module: wine Branch: master Commit: a7f846b2ee82ae99b8a0ad6d1569b74e0198d639 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7f846b2ee82ae99b8a0ad6d1… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Oct 3 23:46:52 2016 +0200 wined3d: Avoid vpos fixups when ARB_fragment_coord_conventions is supported. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 2 ++ dlls/wined3d/glsl_shader.c | 26 ++++++++++++++++++++++---- dlls/wined3d/shader.c | 2 ++ dlls/wined3d/wined3d_private.h | 3 ++- 4 files changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index e09c6fd..8c08310 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2418,6 +2418,8 @@ static void context_set_render_offscreen(struct wined3d_context *context, BOOL o context_invalidate_state(context, STATE_VIEWPORT); context_invalidate_state(context, STATE_SCISSORRECT); context_invalidate_state(context, STATE_FRONTFACE); + if (context->gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS]) + context_invalidate_state(context, STATE_SHADER(WINED3D_SHADER_TYPE_PIXEL)); context->render_offscreen = offscreen; } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 55cbdcf..72740af 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2194,9 +2194,23 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont } if (reg_maps->vpos || reg_maps->usesdsy) { - ++extra_constants_needed; - shader_addline(buffer, "uniform vec4 ycorrection;\n"); - shader_addline(buffer, "vec4 vpos;\n"); + if (reg_maps->usesdsy || !gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS]) + { + ++extra_constants_needed; + shader_addline(buffer, "uniform vec4 ycorrection;\n"); + } + if (reg_maps->vpos) + { + if (gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS]) + { + if (shader->device->wined3d->flags & WINED3D_PIXEL_CENTER_INTEGER) + shader_addline(buffer, "layout(%spixel_center_integer) in vec4 gl_FragCoord;\n", + ps_args->render_offscreen ? "" : "origin_upper_left, "); + else if (!ps_args->render_offscreen) + shader_addline(buffer, "layout(origin_upper_left) in vec4 gl_FragCoord;\n"); + } + shader_addline(buffer, "vec4 vpos;\n"); + } } if (ps_args->alpha_test_func + 1 != WINED3D_CMP_ALWAYS) @@ -5899,6 +5913,8 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context shader_glsl_enable_extensions(buffer, gl_info); if (gl_info->supported[ARB_DERIVATIVE_CONTROL]) shader_addline(buffer, "#extension GL_ARB_derivative_control : enable\n"); + if (gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS]) + shader_addline(buffer, "#extension GL_ARB_fragment_coord_conventions : enable\n"); if (gl_info->supported[ARB_SHADER_TEXTURE_LOD]) shader_addline(buffer, "#extension GL_ARB_shader_texture_lod : enable\n"); /* The spec says that it doesn't have to be explicitly enabled, but the @@ -5929,7 +5945,9 @@ static GLuint shader_glsl_generate_pshader(const struct wined3d_context *context * on drivers that returns integer values. */ if (reg_maps->vpos) { - if (shader->device->wined3d->flags & WINED3D_PIXEL_CENTER_INTEGER) + if (gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS]) + shader_addline(buffer, "vpos = gl_FragCoord;\n"); + else if (shader->device->wined3d->flags & WINED3D_PIXEL_CENTER_INTEGER) shader_addline(buffer, "vpos = floor(vec4(0, ycorrection[0], 0, 0) + gl_FragCoord * vec4(1, ycorrection[1], 1, 1));\n"); else diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 1c48589..594520c 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3279,6 +3279,8 @@ void find_ps_compile_args(const struct wined3d_state *state, const struct wined3 if (d3d_info->emulated_flatshading) args->flatshading = state->render_states[WINED3D_RS_SHADEMODE] == WINED3D_SHADE_FLAT; + + args->render_offscreen = gl_info->supported[ARB_FRAGMENT_COORD_CONVENTIONS] ? context->render_offscreen : 0; } static HRESULT pixel_shader_init(struct wined3d_shader *shader, struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a968bda..851c914 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1107,7 +1107,8 @@ struct ps_compile_args { DWORD pointsprite : 1; DWORD flatshading : 1; DWORD alpha_test_func : 3; - DWORD padding : 27; + DWORD render_offscreen : 1; + DWORD padding : 26; }; enum fog_src_type {

1 0

Matteo Bruni : wined3d: Add core version of the functions introduced by EXT_draw_buffers2.
by Alexandre Julliard 04 Oct '16

04 Oct '16

Module: wine Branch: master Commit: d048003694eb6e1cd371afff88c8b59b24e1e851 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d048003694eb6e1cd371afff8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Oct 3 23:46:53 2016 +0200 wined3d: Add core version of the functions introduced by EXT_draw_buffers2. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 00e8d63..d658692 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -3056,10 +3056,12 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glDeleteShader) /* OpenGL 2.0 */ USE_GL_FUNC(glDeleteVertexArrays) /* OpenGL 3.0 */ USE_GL_FUNC(glDetachShader) /* OpenGL 2.0 */ + USE_GL_FUNC(glDisablei) /* OpenGL 3.0 */ USE_GL_FUNC(glDisableVertexAttribArray) /* OpenGL 2.0 */ USE_GL_FUNC(glDrawArraysInstanced) /* OpenGL 3.1 */ USE_GL_FUNC(glDrawBuffers) /* OpenGL 2.0 */ USE_GL_FUNC(glDrawElementsInstanced) /* OpenGL 3.1 */ + USE_GL_FUNC(glEnablei) /* OpenGL 3.0 */ USE_GL_FUNC(glEnableVertexAttribArray) /* OpenGL 2.0 */ USE_GL_FUNC(glEndQuery) /* OpenGL 1.5 */ USE_GL_FUNC(glGenBuffers) /* OpenGL 1.5 */ @@ -3068,9 +3070,11 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glGetActiveUniform) /* OpenGL 2.0 */ USE_GL_FUNC(glGetAttachedShaders) /* OpenGL 2.0 */ USE_GL_FUNC(glGetAttribLocation) /* OpenGL 2.0 */ + USE_GL_FUNC(glGetBooleani_v) /* OpenGL 3.0 */ USE_GL_FUNC(glGetBufferSubData) /* OpenGL 1.5 */ USE_GL_FUNC(glGetCompressedTexImage) /* OpenGL 1.3 */ USE_GL_FUNC(glGetDebugMessageLog) /* OpenGL 4.3 */ + USE_GL_FUNC(glGetIntegeri_v) /* OpenGL 3.0 */ USE_GL_FUNC(glGetProgramInfoLog) /* OpenGL 2.0 */ USE_GL_FUNC(glGetProgramiv) /* OpenGL 2.0 */ USE_GL_FUNC(glGetQueryiv) /* OpenGL 1.5 */ @@ -3082,6 +3086,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glGetUniformfv) /* OpenGL 2.0 */ USE_GL_FUNC(glGetUniformiv) /* OpenGL 2.0 */ USE_GL_FUNC(glGetUniformLocation) /* OpenGL 2.0 */ + USE_GL_FUNC(glIsEnabledi) /* OpenGL 3.0 */ USE_GL_FUNC(glLinkProgram) /* OpenGL 2.0 */ USE_GL_FUNC(glMapBuffer) /* OpenGL 1.5 */ USE_GL_FUNC(glPointParameteri) /* OpenGL 1.4 */ @@ -3178,10 +3183,12 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) MAP_GL_FUNCTION(glDeleteQueries, glDeleteQueriesARB); MAP_GL_FUNCTION(glDeleteShader, glDeleteObjectARB); MAP_GL_FUNCTION(glDetachShader, glDetachObjectARB); + MAP_GL_FUNCTION(glDisablei, glDisableIndexedEXT); MAP_GL_FUNCTION(glDisableVertexAttribArray, glDisableVertexAttribArrayARB); MAP_GL_FUNCTION(glDrawArraysInstanced, glDrawArraysInstancedARB); MAP_GL_FUNCTION(glDrawBuffers, glDrawBuffersARB); MAP_GL_FUNCTION(glDrawElementsInstanced, glDrawElementsInstancedARB); + MAP_GL_FUNCTION(glEnablei, glEnableIndexedEXT); MAP_GL_FUNCTION(glEnableVertexAttribArray, glEnableVertexAttribArrayARB); MAP_GL_FUNCTION(glEndQuery, glEndQueryARB); MAP_GL_FUNCTION(glGenBuffers, glGenBuffersARB); @@ -3189,9 +3196,11 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) MAP_GL_FUNCTION(glGetActiveUniform, glGetActiveUniformARB); MAP_GL_FUNCTION(glGetAttachedShaders, glGetAttachedObjectsARB); MAP_GL_FUNCTION(glGetAttribLocation, glGetAttribLocationARB); + MAP_GL_FUNCTION(glGetBooleani_v, glGetBooleanIndexedvEXT); MAP_GL_FUNCTION(glGetBufferSubData, glGetBufferSubDataARB); MAP_GL_FUNCTION(glGetCompressedTexImage, glGetCompressedTexImageARB); MAP_GL_FUNCTION(glGetDebugMessageLog, glGetDebugMessageLogARB); + MAP_GL_FUNCTION(glGetIntegeri_v, glGetIntegerIndexedvEXT); MAP_GL_FUNCTION(glGetProgramInfoLog, glGetInfoLogARB); MAP_GL_FUNCTION(glGetProgramiv, glGetObjectParameterivARB); MAP_GL_FUNCTION(glGetQueryiv, glGetQueryivARB); @@ -3202,6 +3211,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) MAP_GL_FUNCTION(glGetUniformfv, glGetUniformfvARB); MAP_GL_FUNCTION(glGetUniformiv, glGetUniformivARB); MAP_GL_FUNCTION(glGetUniformLocation, glGetUniformLocationARB); + MAP_GL_FUNCTION(glIsEnabledi, glIsEnabledIndexedEXT); MAP_GL_FUNCTION(glLinkProgram, glLinkProgramARB); MAP_GL_FUNCTION(glMapBuffer, glMapBufferARB); MAP_GL_FUNCTION_CAST(glShaderSource, glShaderSourceARB);

1 0

Matteo Bruni : wined3d: Add ARB_viewport_array extension.
by Alexandre Julliard 04 Oct '16

04 Oct '16

Module: wine Branch: master Commit: 86898c5c7b491450c9cfdc18c0df32e66fa73c67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86898c5c7b491450c9cfdc18c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Oct 3 23:46:54 2016 +0200 wined3d: Add ARB_viewport_array extension. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 13 +++++++++++++ dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 14 insertions(+) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d658692..b4394b8 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -172,6 +172,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_vertex_program", ARB_VERTEX_PROGRAM }, {"GL_ARB_vertex_shader", ARB_VERTEX_SHADER }, {"GL_ARB_vertex_type_2_10_10_10_rev", ARB_VERTEX_TYPE_2_10_10_10_REV}, + {"GL_ARB_viewport_array", ARB_VIEWPORT_ARRAY }, /* ATI */ {"GL_ATI_fragment_shader", ATI_FRAGMENT_SHADER }, @@ -2829,6 +2830,17 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glVertexAttrib4uivARB) USE_GL_FUNC(glVertexAttrib4usvARB) USE_GL_FUNC(glVertexAttribPointerARB) + /* GL_ARB_viewport_array */ + USE_GL_FUNC(glDepthRangeArrayv) + USE_GL_FUNC(glDepthRangeIndexed) + USE_GL_FUNC(glGetDoublei_v) + USE_GL_FUNC(glGetFloati_v) + USE_GL_FUNC(glScissorArrayv) + USE_GL_FUNC(glScissorIndexed) + USE_GL_FUNC(glScissorIndexedv) + USE_GL_FUNC(glViewportArrayv) + USE_GL_FUNC(glViewportIndexedf) + USE_GL_FUNC(glViewportIndexedfv) /* GL_ATI_fragment_shader */ USE_GL_FUNC(glAlphaFragmentOp1ATI) USE_GL_FUNC(glAlphaFragmentOp2ATI) @@ -3583,6 +3595,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, DWORD {ARB_VERTEX_TYPE_2_10_10_10_REV, MAKEDWORD_VERSION(3, 3)}, {ARB_ES2_COMPATIBILITY, MAKEDWORD_VERSION(4, 1)}, + {ARB_VIEWPORT_ARRAY, MAKEDWORD_VERSION(4, 1)}, {ARB_INTERNALFORMAT_QUERY, MAKEDWORD_VERSION(4, 2)}, {ARB_MAP_BUFFER_ALIGNMENT, MAKEDWORD_VERSION(4, 2)}, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 3757b02..57fbea4 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -107,6 +107,7 @@ enum wined3d_gl_extension ARB_VERTEX_PROGRAM, ARB_VERTEX_SHADER, ARB_VERTEX_TYPE_2_10_10_10_REV, + ARB_VIEWPORT_ARRAY, /* ATI */ ATI_FRAGMENT_SHADER, ATI_SEPARATE_STENCIL,

1 0