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

Henri Verbeet : wined3d: Only translate coordinates for swapchain surfaces in surface_translate_drawable_coords ().
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: e091c6e81c310efbd4b533ae8b3f7eb7f8ff2c70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e091c6e81c310efbd4b533ae8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun May 21 17:53:40 2017 +0200 wined3d: Only translate coordinates for swapchain surfaces in surface_translate_drawable_coords(). This fixes a regression introduced by commit dbd8c89ea8cd1d887e9999d203da3e79c4ffbd1a. When using ORM_BACKBUFFER, off-screen surfaces may be loaded into WINED3D_LOCATION_DRAWABLE. They shouldn't be flipped in that case. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 25 ++++++++++--------------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 08bf156..abdeb9c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1911,27 +1911,22 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st void surface_translate_drawable_coords(const struct wined3d_surface *surface, HWND window, RECT *rect) { struct wined3d_texture *texture = surface->container; + POINT offset = {0, 0}; UINT drawable_height; + RECT windowsize; - if (texture->swapchain) - { - POINT offset = {0, 0}; - RECT windowsize; - - if (texture == texture->swapchain->front_buffer) - { - ScreenToClient(window, &offset); - OffsetRect(rect, offset.x, offset.y); - } + if (!texture->swapchain) + return; - GetClientRect(window, &windowsize); - drawable_height = windowsize.bottom - windowsize.top; - } - else + if (texture == texture->swapchain->front_buffer) { - drawable_height = wined3d_texture_get_level_height(texture, surface->texture_level); + ScreenToClient(window, &offset); + OffsetRect(rect, offset.x, offset.y); } + GetClientRect(window, &windowsize); + drawable_height = windowsize.bottom - windowsize.top; + rect->top = drawable_height - rect->top; rect->bottom = drawable_height - rect->bottom; }

1 0

Henri Verbeet : wined3d: Clarify the status of ORM_BACKBUFFER.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: 0f8b0d9d0afdb2b9dec3fea5a63de47230af40ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=0f8b0d9d0afdb2b9dec3fea5a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun May 21 17:53:41 2017 +0200 wined3d: Clarify the status of ORM_BACKBUFFER. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 4 ++++ dlls/wined3d/wined3d_main.c | 16 +++------------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 535ea7d..4115453 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -6547,6 +6547,10 @@ static BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, UINT ordinal, return FALSE; } + if (wined3d_settings.offscreen_rendering_mode == ORM_BACKBUFFER) + ERR_(winediag)("You are using the backbuffer for offscreen rendering. " + "This is unsupported, and will be removed in a future version.\n"); + wined3d_adapter_init_fb_cfgs(adapter, caps_gl_ctx.dc); /* We haven't found any suitable formats. This should only happen in * case of GDI software rendering, which is pretty useless anyway. */ diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 8f5da3c..9ff2c9c 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -231,19 +231,9 @@ static BOOL wined3d_dll_init(HINSTANCE hInstDLL) wined3d_settings.glslRequested = FALSE; } } - if ( !get_config_key( hkey, appkey, "OffscreenRenderingMode", buffer, size) ) - { - if (!strcmp(buffer,"backbuffer")) - { - ERR_(winediag)("Using the backbuffer for offscreen rendering.\n"); - wined3d_settings.offscreen_rendering_mode = ORM_BACKBUFFER; - } - else if (!strcmp(buffer,"fbo")) - { - TRACE("Using FBOs for offscreen rendering\n"); - wined3d_settings.offscreen_rendering_mode = ORM_FBO; - } - } + if (!get_config_key(hkey, appkey, "OffscreenRenderingMode", buffer, size) + && !strcmp(buffer,"backbuffer")) + wined3d_settings.offscreen_rendering_mode = ORM_BACKBUFFER; if ( !get_config_key_dword( hkey, appkey, "VideoPciDeviceID", &tmpvalue) ) { int pci_device_id = tmpvalue;

1 0

Henri Verbeet : wined3d: Introduce a separate CS queue for resource maps.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: 22bdde479fabcbc5e1f1f090d986c3377c294deb URL: http://source.winehq.org/git/wine.git/?a=commit;h=22bdde479fabcbc5e1f1f090d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun May 21 17:53:42 2017 +0200 wined3d: Introduce a separate CS queue for resource maps. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 255 ++++++++++++++++++++++------------------- dlls/wined3d/device.c | 8 +- dlls/wined3d/resource.c | 1 + dlls/wined3d/swapchain.c | 10 +- dlls/wined3d/texture.c | 10 +- dlls/wined3d/wined3d_private.h | 15 ++- 6 files changed, 162 insertions(+), 137 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=22bdde479fabcbc5e1f1f…

1 0

Henri Verbeet : d2d1: Implement initial support for quadratic bezier outlines.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: bd2141e5211ac8ac2fdc3637c0427ecb787e2728 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd2141e5211ac8ac2fdc3637c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun May 21 17:53:43 2017 +0200 d2d1: Implement initial support for quadratic bezier outlines. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/d2d1_private.h | 16 +++ dlls/d2d1/geometry.c | 102 ++++++++++++++ dlls/d2d1/render_target.c | 270 +++++++++++++++++++++++++++++++++++- dlls/d2d1/tests/d2d1.c | 339 +++++++++++++++++++++++++++++++++++++++++++++- 4 files changed, 725 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bd2141e5211ac8ac2fdc3…

1 0

Ken Thomases : winemac: Fall back to the null driver for common device capabilities.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: 416180a85684be1ec3bb1f0b65230ceab15e6894 URL: http://source.winehq.org/git/wine.git/?a=commit;h=416180a85684be1ec3bb1f0b6… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun May 21 12:20:04 2017 -0500 winemac: Fall back to the null driver for common device capabilities. Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/gdi.c | 171 +------------------------------------------------ 1 file changed, 3 insertions(+), 168 deletions(-) diff --git a/dlls/winemac.drv/gdi.c b/dlls/winemac.drv/gdi.c index a0f4ee9..896016b 100644 --- a/dlls/winemac.drv/gdi.c +++ b/dlls/winemac.drv/gdi.c @@ -40,8 +40,6 @@ static inline MACDRV_PDEVICE *get_macdrv_dev(PHYSDEV dev) /* a few dynamic device caps */ static CGRect desktop_rect; /* virtual desktop rectangle */ -static int log_pixels_x; /* pixels per logical inch in x direction */ -static int log_pixels_y; /* pixels per logical inch in y direction */ static int horz_size; /* horz. size of screen in millimeters */ static int vert_size; /* vert. size of screen in millimeters */ static int horz_res; /* width in pixels of screen */ @@ -63,52 +61,8 @@ static CRITICAL_SECTION_DEBUG critsect_debug = static CRITICAL_SECTION device_data_section = { &critsect_debug, -1, 0, 0, 0, 0 }; -static const WCHAR dpi_key_name[] = {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p','\0'}; -static const WCHAR def_dpi_key_name[] = {'S','o','f','t','w','a','r','e','\\','F','o','n','t','s','\0'}; -static const WCHAR dpi_value_name[] = {'L','o','g','P','i','x','e','l','s','\0'}; - static const struct gdi_dc_funcs macdrv_funcs; -/****************************************************************************** - * get_reg_dword - * - * Read a DWORD value from the registry - */ -static BOOL get_reg_dword(HKEY base, const WCHAR *key_name, const WCHAR *value_name, DWORD *value) -{ - HKEY key; - DWORD type, data, size = sizeof(data); - BOOL ret = FALSE; - - if (RegOpenKeyW(base, key_name, &key) == ERROR_SUCCESS) - { - if (RegQueryValueExW(key, value_name, NULL, &type, (void *)&data, &size) == ERROR_SUCCESS && - type == REG_DWORD) - { - *value = data; - ret = TRUE; - } - RegCloseKey(key); - } - return ret; -} - -/****************************************************************************** - * get_dpi - * - * get the dpi from the registry - */ -static DWORD get_dpi(void) -{ - DWORD dpi; - - if (get_reg_dword(HKEY_CURRENT_USER, dpi_key_name, dpi_value_name, &dpi)) - return dpi; - if (get_reg_dword(HKEY_CURRENT_CONFIG, def_dpi_key_name, dpi_value_name, &dpi)) - return dpi; - return 0; -} - /*********************************************************************** * compute_desktop_rect */ @@ -172,24 +126,6 @@ static void device_init(void) check_retina_status(); /* Initialize device caps */ - log_pixels_x = log_pixels_y = get_dpi(); - if (!log_pixels_x) - { - size_t width = CGDisplayPixelsWide(mainDisplay); - size_t height = CGDisplayPixelsHigh(mainDisplay); - - if (retina_on) - { - /* Although CGDisplayPixelsWide/High() claim to report in pixels, they - actually report in points. */ - width *= 2; - height *= 2; - } - - log_pixels_x = MulDiv(width, 254, size_mm.width * 10); - log_pixels_y = MulDiv(height, 254, size_mm.height * 10); - } - horz_size = size_mm.width; vert_size = size_mm.height; @@ -319,12 +255,6 @@ static INT macdrv_GetDeviceCaps(PHYSDEV dev, INT cap) switch(cap) { - case DRIVERVERSION: - ret = 0x300; - break; - case TECHNOLOGY: - ret = DT_RASDISPLAY; - break; case HORZSIZE: ret = horz_size; break; @@ -346,109 +276,14 @@ static INT macdrv_GetDeviceCaps(PHYSDEV dev, INT cap) case BITSPIXEL: ret = bits_per_pixel; break; - case PLANES: - ret = 1; - break; - case NUMBRUSHES: - ret = -1; - break; - case NUMPENS: - ret = -1; - break; - case NUMMARKERS: - ret = 0; - break; - case NUMFONTS: - ret = 0; - break; - case NUMCOLORS: - /* MSDN: Number of entries in the device's color table, if the device has - * a color depth of no more than 8 bits per pixel.For devices with greater - * color depths, -1 is returned. */ - ret = (bits_per_pixel > 8) ? -1 : (1 << bits_per_pixel); - break; - case PDEVICESIZE: - ret = sizeof(MACDRV_PDEVICE); - break; - case CURVECAPS: - ret = (CC_CIRCLES | CC_PIE | CC_CHORD | CC_ELLIPSES | CC_WIDE | - CC_STYLED | CC_WIDESTYLED | CC_INTERIORS | CC_ROUNDRECT); - break; - case LINECAPS: - ret = (LC_POLYLINE | LC_MARKER | LC_POLYMARKER | LC_WIDE | - LC_STYLED | LC_WIDESTYLED | LC_INTERIORS); - break; - case POLYGONALCAPS: - ret = (PC_POLYGON | PC_RECTANGLE | PC_WINDPOLYGON | PC_SCANLINE | - PC_WIDE | PC_STYLED | PC_WIDESTYLED | PC_INTERIORS); - break; - case TEXTCAPS: - ret = (TC_OP_CHARACTER | TC_OP_STROKE | TC_CP_STROKE | - TC_CR_ANY | TC_SF_X_YINDEP | TC_SA_DOUBLE | TC_SA_INTEGER | - TC_SA_CONTIN | TC_UA_ABLE | TC_SO_ABLE | TC_RA_ABLE | TC_VA_ABLE); - break; - case CLIPCAPS: - ret = CP_REGION; - break; - case COLORRES: - /* The observed correspondence between BITSPIXEL and COLORRES is: - * BITSPIXEL: 8 -> COLORRES: 18 - * BITSPIXEL: 16 -> COLORRES: 16 - * BITSPIXEL: 24 -> COLORRES: 24 - * (note that bits_per_pixel is never 24) - * BITSPIXEL: 32 -> COLORRES: 24 */ - ret = (bits_per_pixel <= 8) ? 18 : (bits_per_pixel == 32) ? 24 : bits_per_pixel; - break; - case RASTERCAPS: - ret = (RC_BITBLT | RC_BANDING | RC_SCALING | RC_BITMAP64 | RC_DI_BITMAP | - RC_DIBTODEV | RC_BIGFONT | RC_STRETCHBLT | RC_STRETCHDIB | RC_DEVBITS | - (bits_per_pixel <= 8 ? RC_PALETTE : 0)); - break; - case SHADEBLENDCAPS: - ret = (SB_GRAD_RECT | SB_GRAD_TRI | SB_CONST_ALPHA | SB_PIXEL_ALPHA); - break; - case ASPECTX: - case ASPECTY: - ret = 36; - break; - case ASPECTXY: - ret = 51; - break; - case LOGPIXELSX: - ret = log_pixels_x; - break; - case LOGPIXELSY: - ret = log_pixels_y; - break; - case CAPS1: - FIXME("(%p): CAPS1 is unimplemented, will return 0\n", dev->hdc); - /* please see wingdi.h for the possible bit-flag values that need - to be returned. */ - ret = 0; - break; - case SIZEPALETTE: - ret = bits_per_pixel <= 8 ? 1 << bits_per_pixel : 0; - break; - case NUMRESERVED: - case PHYSICALWIDTH: - case PHYSICALHEIGHT: - case PHYSICALOFFSETX: - case PHYSICALOFFSETY: - case SCALINGFACTORX: - case SCALINGFACTORY: - case VREFRESH: - case BLTALIGNMENT: - ret = 0; - break; default: - FIXME("(%p): unsupported capability %d, will return 0\n", dev->hdc, cap); - ret = 0; - goto done; + LeaveCriticalSection(&device_data_section); + dev = GET_NEXT_PHYSDEV( dev, pGetDeviceCaps ); + return dev->funcs->pGetDeviceCaps( dev, cap ); } TRACE("cap %d -> %d\n", cap, ret); -done: LeaveCriticalSection(&device_data_section); return ret; }

1 0

Nikolay Sivov : comctl32/listview: Search through all items in LVFI_NEARESTXY mode.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: 407a3c06fa5fc64d6bd1ddaa24d5692091dfde23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=407a3c06fa5fc64d6bd1ddaa2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 22 00:09:39 2017 +0300 comctl32/listview: Search through all items in LVFI_NEARESTXY mode. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index c681451..35c2453 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6392,6 +6392,8 @@ static INT LISTVIEW_FindItemW(const LISTVIEW_INFO *infoPtr, INT nStart, lvItem.mask &= ~LVIF_TEXT; } + nItem = bNearest ? -1 : nStart + 1; + again: for (; nItem < nLast; nItem++) {

1 0

Nikolay Sivov : comctl32/tests: A bit more tests for partial strings in LVM_FINDITEM.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: d05b351fe0d7ad57549dd6df8220f6ebb612fb12 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d05b351fe0d7ad57549dd6df8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 22 00:09:40 2017 +0300 comctl32/tests: A bit more tests for partial strings in LVM_FINDITEM. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/listview.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 471f9f7..4bc95bb 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -5055,12 +5055,30 @@ static void test_finditem(void) fi.psz = f; r = SendMessageA(hwnd, LVM_FINDITEMA, -1, (LPARAM)&fi); expect(0, r); + + fi.flags = LVFI_STRING | LVFI_PARTIAL; + r = SendMessageA(hwnd, LVM_FINDITEMA, -1, (LPARAM)&fi); + expect(0, r); + + fi.flags = LVFI_PARTIAL; + r = SendMessageA(hwnd, LVM_FINDITEMA, -1, (LPARAM)&fi); + expect(0, r); + /* partial string search, inserted text was "foo" */ strcpy(f, "fo"); fi.flags = LVFI_STRING | LVFI_PARTIAL; fi.psz = f; r = SendMessageA(hwnd, LVM_FINDITEMA, -1, (LPARAM)&fi); expect(0, r); + + fi.flags = LVFI_STRING; + r = SendMessageA(hwnd, LVM_FINDITEMA, -1, (LPARAM)&fi); + expect(-1, r); + + fi.flags = LVFI_PARTIAL; + r = SendMessageA(hwnd, LVM_FINDITEMA, -1, (LPARAM)&fi); + expect(0, r); + /* partial string search, part after start char */ strcpy(f, "oo"); fi.flags = LVFI_STRING | LVFI_PARTIAL; @@ -5091,12 +5109,22 @@ static void test_finditem(void) r = SendMessageA(hwnd, LVM_FINDITEMA, -1, (LPARAM)&fi); expect(-1, r); + strcpy(f, "o"); + fi.flags = LVFI_SUBSTRING | LVFI_PARTIAL; + fi.psz = f; + r = SendMessageA(hwnd, LVM_FINDITEMA, -1, (LPARAM)&fi); + expect(-1, r); + strcpy(f, "f"); fi.flags = LVFI_SUBSTRING | LVFI_STRING; fi.psz = f; r = SendMessageA(hwnd, LVM_FINDITEMA, -1, (LPARAM)&fi); expect(0, r); + fi.flags = LVFI_SUBSTRING | LVFI_PARTIAL; + r = SendMessageA(hwnd, LVM_FINDITEMA, -1, (LPARAM)&fi); + expect(0, r); + DestroyWindow(hwnd); }

1 0

Nikolay Sivov : comctl32/listview: Simplify a couple of conditions that are using LVFI_PARTIAL.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: 65d64e15c8c689c6693aba9a25f8847485f8732b URL: http://source.winehq.org/git/wine.git/?a=commit;h=65d64e15c8c689c6693aba9a2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon May 22 00:09:41 2017 +0300 comctl32/listview: Simplify a couple of conditions that are using LVFI_PARTIAL. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/listview.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 35c2453..459bb38 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6344,8 +6344,7 @@ static INT LISTVIEW_FindItemW(const LISTVIEW_INFO *infoPtr, INT nStart, if (!lpFindInfo || nItem < 0) return -1; lvItem.mask = 0; - if (lpFindInfo->flags & (LVFI_STRING | LVFI_PARTIAL) || - lpFindInfo->flags & LVFI_SUBSTRING) + if (lpFindInfo->flags & (LVFI_STRING | LVFI_PARTIAL | LVFI_SUBSTRING)) { lvItem.mask |= LVIF_TEXT; lvItem.pszText = szDispText; @@ -6469,14 +6468,13 @@ again: static INT LISTVIEW_FindItemA(const LISTVIEW_INFO *infoPtr, INT nStart, const LVFINDINFOA *lpFindInfo) { - BOOL hasText = lpFindInfo->flags & (LVFI_STRING | LVFI_PARTIAL) || - lpFindInfo->flags & LVFI_SUBSTRING; LVFINDINFOW fiw; INT res; LPWSTR strW = NULL; memcpy(&fiw, lpFindInfo, sizeof(fiw)); - if (hasText) fiw.psz = strW = textdupTtoW((LPCWSTR)lpFindInfo->psz, FALSE); + if (lpFindInfo->flags & (LVFI_STRING | LVFI_PARTIAL | LVFI_SUBSTRING)) + fiw.psz = strW = textdupTtoW((LPCWSTR)lpFindInfo->psz, FALSE); res = LISTVIEW_FindItemW(infoPtr, nStart, &fiw); textfreeT(strW, FALSE); return res;

1 0

Józef Kucia : wined3d: Update vertex shader when hull shader is changed.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: 32c8d11e97747967b759354e168c9998f4b54fcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=32c8d11e97747967b759354e1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat May 20 13:45:55 2017 +0200 wined3d: Update vertex shader when hull shader is changed. For vertex shader output count. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5d08a48..f2fde11 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -10676,10 +10676,13 @@ static void glsl_vertex_pipe_vs(struct wined3d_context *context, static void glsl_vertex_pipe_hs(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - /* In Direct3D tessellator options (e.g. output primitive type, primitive - * winding) are defined in Hull Shaders, while in GLSL those are - * specified in Tessellation Evaluation Shaders. */ + /* In Direct3D tessellator options (e.g. output primitive type, primitive + * winding) are defined in Hull Shaders, while in GLSL those are + * specified in Tessellation Evaluation Shaders. */ context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_DOMAIN; + + if (state->shader[WINED3D_SHADER_TYPE_VERTEX]) + context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_VERTEX; } static void glsl_vertex_pipe_geometry_shader(struct wined3d_context *context,

1 0

Józef Kucia : wined3d: Generate code for hull shaders.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: 007eb7d869cdab5a9c28ee41a98e88dc59b9e0d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=007eb7d869cdab5a9c28ee41a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat May 20 13:45:56 2017 +0200 wined3d: Generate code for hull shaders. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 4 +- dlls/wined3d/glsl_shader.c | 222 ++++++++++++++++++++++++++++++++++++-- dlls/wined3d/shader.c | 12 ++- dlls/wined3d/wined3d_private.h | 5 +- 4 files changed, 227 insertions(+), 16 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=007eb7d869cdab5a9c28e…

1 0