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

Vincent Povirk : gdiplus: Handle large input rect in GdipMeasureCharacterRanges.
by Alexandre Julliard 24 Mar '15

24 Mar '15

Module: wine Branch: master Commit: 6b97abf930ac40dd9a668ec1fed588fcefd192fb URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b97abf930ac40dd9a668ec1f… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Mar 23 15:12:06 2015 -0500 gdiplus: Handle large input rect in GdipMeasureCharacterRanges. --- dlls/gdiplus/graphics.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 34022cb..ae530a9 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -4739,6 +4739,9 @@ GpStatus WINGDIPAPI GdipMeasureCharacterRanges(GpGraphics* graphics, scaled_rect.Width = layoutRect->Width * args.rel_width; scaled_rect.Height = layoutRect->Height * args.rel_height; + if (scaled_rect.Width >= 1 << 23) scaled_rect.Width = 1 << 23; + if (scaled_rect.Height >= 1 << 23) scaled_rect.Height = 1 << 23; + get_font_hfont(graphics, font, stringFormat, &gdifont, NULL); oldfont = SelectObject(hdc, gdifont);

1 0

André Hentschel : include: Add more header guards.
by Alexandre Julliard 24 Mar '15

24 Mar '15

Module: wine Branch: master Commit: 75fc891340daa7c9a06e8c41e545c13989410ce8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75fc891340daa7c9a06e8c41e… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Mar 23 21:33:35 2015 +0100 include: Add more header guards. --- include/aviriff.h | 5 +++++ include/knownfolders.h | 5 +++++ include/rasdlg.h | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/include/aviriff.h b/include/aviriff.h index d2cfa41..9fea63a 100644 --- a/include/aviriff.h +++ b/include/aviriff.h @@ -17,6 +17,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef AVIRIFF_H +#define AVIRIFF_H + /* All definitions here are packed structures of on-disk formats */ #include <pshpack2.h> @@ -322,3 +325,5 @@ typedef struct _avifieldindex_chunk { } AVIFIELDINDEX, * PAVIFIELDINDEX; #include <poppack.h> + +#endif /* AVIRIFF_H */ diff --git a/include/knownfolders.h b/include/knownfolders.h index 2fa5664..28e867c 100644 --- a/include/knownfolders.h +++ b/include/knownfolders.h @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef __WINE_KNOWNFOLDERS_H +#define __WINE_KNOWNFOLDERS_H + #ifdef DEFINE_KNOWN_FOLDER #undef DEFINE_KNOWN_FOLDER #endif @@ -140,3 +143,5 @@ DEFINE_KNOWN_FOLDER(FOLDERID_UsersLibraries, 0xa302545d, 0xdeff, 0x464b, DEFINE_KNOWN_FOLDER(FOLDERID_Videos, 0x18989b1d, 0x99b5, 0x455b, 0x84, 0x1c, 0xab, 0x7c, 0x74, 0xe4, 0xdd, 0xfc); DEFINE_KNOWN_FOLDER(FOLDERID_VideosLibrary, 0x491e922f, 0x5643, 0x4af4, 0xa7, 0xeb, 0x4e, 0x7a, 0x13, 0x8d, 0x81, 0x74); DEFINE_KNOWN_FOLDER(FOLDERID_Windows, 0xf38bf404, 0x1d43, 0x42f2, 0x93, 0x05, 0x67, 0xde, 0x0b, 0x28, 0xfc, 0x23); + +#endif /* __WINE_KNOWNFOLDERS_H */ diff --git a/include/rasdlg.h b/include/rasdlg.h index 7f2a6d8..6d2aa85 100644 --- a/include/rasdlg.h +++ b/include/rasdlg.h @@ -16,6 +16,9 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#ifndef _RASDLG_H_ +#define _RASDLG_H_ + #include <ras.h> typedef struct tagRASENTRYDLGW @@ -30,3 +33,5 @@ typedef struct tagRASENTRYDLGW ULONG_PTR reserved; ULONG_PTR reserved2; } RASENTRYDLGW; + +#endif /* _RASDLG_H_ */

1 0

Nikolay Sivov : comctl32/tooltips: Allow NULL hinst value when fetching text from resources.
by Alexandre Julliard 24 Mar '15

24 Mar '15

Module: wine Branch: master Commit: 9d0ebc13ac7e0dad17ff104c38f8ebd7b9326aa6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d0ebc13ac7e0dad17ff104c3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Mar 24 00:10:06 2015 +0300 comctl32/tooltips: Allow NULL hinst value when fetching text from resources. --- dlls/comctl32/tests/tooltips.c | 26 ++++++++++++++++++++++++++ dlls/comctl32/tooltips.c | 6 +++--- 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index 271009d..a07a054 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -20,6 +20,8 @@ #include <windows.h> #include <commctrl.h> +#include "resources.h" + #include "wine/test.h" #define expect(expected, got) ok(got == expected, "Expected %d, got %d\n", expected, got) @@ -326,6 +328,30 @@ static void test_gettext(void) SendMessageA(hwnd, TTM_GETTOOLINFOA, 0, (LPARAM)&toolinfoA); ok(toolinfoA.lpszText == NULL, "expected NULL, got %p\n", toolinfoA.lpszText); + + /* NULL hinst, valid resource id for text */ + toolinfoA.cbSize = sizeof(TTTOOLINFOA); + toolinfoA.hwnd = NULL; + toolinfoA.hinst = NULL; + toolinfoA.uFlags = 0; + toolinfoA.uId = 0x1233ABCD; + toolinfoA.lpszText = MAKEINTRESOURCEA(IDS_TBADD1); + toolinfoA.lParam = 0xdeadbeef; + GetClientRect(hwnd, &toolinfoA.rect); + r = SendMessageA(hwnd, TTM_ADDTOOLA, 0, (LPARAM)&toolinfoA); + ok(r, "failed to add a tool\n"); + + toolinfoA.hwnd = NULL; + toolinfoA.uId = 0x1233ABCD; + toolinfoA.lpszText = bufA; + SendMessageA(hwnd, TTM_GETTEXTA, 0, (LPARAM)&toolinfoA); + ok(strcmp(toolinfoA.lpszText, "abc") == 0, "lpszText should be an empty string\n"); + + toolinfoA.hinst = (HINSTANCE)0xdeadbee; + SendMessageA(hwnd, TTM_GETTOOLINFOA, 0, (LPARAM)&toolinfoA); + ok(toolinfoA.hinst == NULL, "expected NULL, got %p\n", toolinfoA.hinst); + + SendMessageA(hwnd, TTM_DELTOOLA, 0, (LPARAM)&toolinfoA); } else { diff --git a/dlls/comctl32/tooltips.c b/dlls/comctl32/tooltips.c index 7564c3f..5423ca5 100644 --- a/dlls/comctl32/tooltips.c +++ b/dlls/comctl32/tooltips.c @@ -484,12 +484,12 @@ TOOLTIPS_GetTipText (const TOOLTIPS_INFO *infoPtr, INT nTool, WCHAR *buffer) { TTTOOL_INFO *toolPtr = &infoPtr->tools[nTool]; - if (IS_INTRESOURCE(toolPtr->lpszText) && toolPtr->hinst) { + if (IS_INTRESOURCE(toolPtr->lpszText)) { /* load a resource */ TRACE("load res string %p %x\n", toolPtr->hinst, LOWORD(toolPtr->lpszText)); - LoadStringW (toolPtr->hinst, LOWORD(toolPtr->lpszText), - buffer, INFOTIPSIZE); + if (!LoadStringW (toolPtr->hinst, LOWORD(toolPtr->lpszText), buffer, INFOTIPSIZE)) + buffer[0] = '\0'; } else if (toolPtr->lpszText) { if (toolPtr->lpszText == LPSTR_TEXTCALLBACKW) {

1 0

David Naylor : configure: Recognise host starting in 'amd64'.
by Alexandre Julliard 24 Mar '15

24 Mar '15

Module: wine Branch: master Commit: aec36fe2d5a723da618ac90cbb208582d8f8b79f URL: http://source.winehq.org/git/wine.git/?a=commit;h=aec36fe2d5a723da618ac90cb… Author: David Naylor <dbn(a)freebsd.org> Date: Sun Mar 22 20:20:59 2015 +0200 configure: Recognise host starting in 'amd64'. --- configure | 2 +- configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 5f5e9d5..af78958 100755 --- a/configure +++ b/configure @@ -4864,7 +4864,7 @@ case $host in fi with_fontconfig=${with_fontconfig:-no} ;; - x86_64*) + x86_64*|amd64*) if test "x$enable_win64" != "xyes" -a "$cross_compiling" != "yes" then CC="$CC -m32" diff --git a/configure.ac b/configure.ac index d23227a..d04780c 100644 --- a/configure.ac +++ b/configure.ac @@ -143,7 +143,7 @@ case $host in fi with_fontconfig=${with_fontconfig:-no} ;; - x86_64*) + x86_64*|amd64*) if test "x$enable_win64" != "xyes" -a "$cross_compiling" != "yes" then CC="$CC -m32"

1 0

David Naylor : configure: Explicitly set host_cpu for 'amd64'.
by Alexandre Julliard 24 Mar '15

24 Mar '15

Module: wine Branch: master Commit: 9a3fdffe9d8ebfce4791767dcfa14b59c020694b URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a3fdffe9d8ebfce4791767dc… Author: David Naylor <dbn(a)freebsd.org> Date: Sun Mar 22 20:21:04 2015 +0200 configure: Explicitly set host_cpu for 'amd64'. --- configure | 1 + configure.ac | 1 + 2 files changed, 2 insertions(+) diff --git a/configure b/configure index af78958..4596844 100755 --- a/configure +++ b/configure @@ -4924,6 +4924,7 @@ $as_echo "no" >&6; } fi rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi + host_cpu="x86_64" TARGETFLAGS="-m64" fi diff --git a/configure.ac b/configure.ac index d04780c..1fc7873 100644 --- a/configure.ac +++ b/configure.ac @@ -165,6 +165,7 @@ case $host in [AC_MSG_RESULT([no]) AC_MSG_ERROR([You need gcc >= 4.4 to build Wine as 64-bit.])]) fi + host_cpu="x86_64" AC_SUBST(TARGETFLAGS,"-m64") fi ;;

1 0

Mark Harmstone : comctl32: Use correct font for themed headers.
by Alexandre Julliard 24 Mar '15

24 Mar '15

Module: wine Branch: master Commit: e7116725ff6bd082ffd97ad0b3813ab2104ea618 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7116725ff6bd082ffd97ad0b… Author: Mark Harmstone <hellas(a)burntcomma.com> Date: Tue Mar 24 07:40:59 2015 +0000 comctl32: Use correct font for themed headers. --- dlls/comctl32/header.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/header.c b/dlls/comctl32/header.c index 59f2c12..7c632f3 100644 --- a/dlls/comctl32/header.c +++ b/dlls/comctl32/header.c @@ -333,6 +333,7 @@ HEADER_DrawItem (HEADER_INFO *infoPtr, HDC hdc, INT iItem, BOOL bHotTrack, LRESU INT oldBkMode; HTHEME theme = GetWindowTheme (infoPtr->hwndSelf); NMCUSTOMDRAW nmcd; + int state = 0; TRACE("DrawItem(iItem %d bHotTrack %d unicode flag %d)\n", iItem, bHotTrack, (infoPtr->nNotifyFormat == NFR_UNICODE)); @@ -340,6 +341,9 @@ HEADER_DrawItem (HEADER_INFO *infoPtr, HDC hdc, INT iItem, BOOL bHotTrack, LRESU if (r.right - r.left == 0) return phdi->rect.right; + if (theme) + state = (phdi->bDown) ? HIS_PRESSED : (bHotTrack ? HIS_HOT : HIS_NORMAL); + /* Set the colors before sending NM_CUSTOMDRAW so that it can change them */ SetTextColor(hdc, (bHotTrack && !theme) ? COLOR_HIGHLIGHT : COLOR_BTNTEXT); SetBkColor(hdc, comctl32_color.clr3dFace); @@ -418,8 +422,14 @@ HEADER_DrawItem (HEADER_INFO *infoPtr, HDC hdc, INT iItem, BOOL bHotTrack, LRESU RECT textRect; SetRectEmpty(&textRect); - DrawTextW (hdc, phdi->pszText, -1, - &textRect, DT_LEFT|DT_VCENTER|DT_SINGLELINE|DT_CALCRECT); + + if (theme) { + GetThemeTextExtent(theme, hdc, HP_HEADERITEM, state, phdi->pszText, -1, + DT_LEFT|DT_VCENTER|DT_SINGLELINE, NULL, &textRect); + } else { + DrawTextW (hdc, phdi->pszText, -1, + &textRect, DT_LEFT|DT_VCENTER|DT_SINGLELINE|DT_CALCRECT); + } cw = textRect.right - textRect.left + 2 * infoPtr->iMargin; } @@ -512,8 +522,14 @@ HEADER_DrawItem (HEADER_INFO *infoPtr, HDC hdc, INT iItem, BOOL bHotTrack, LRESU oldBkMode = SetBkMode(hdc, TRANSPARENT); r.left = tx; r.right = tx + tw; - DrawTextW (hdc, phdi->pszText, -1, - &r, DT_LEFT|DT_END_ELLIPSIS|DT_VCENTER|DT_SINGLELINE); + if (theme) { + DrawThemeText(theme, hdc, HP_HEADERITEM, state, phdi->pszText, + -1, DT_LEFT|DT_END_ELLIPSIS|DT_VCENTER|DT_SINGLELINE, + 0, &r); + } else { + DrawTextW (hdc, phdi->pszText, -1, + &r, DT_LEFT|DT_END_ELLIPSIS|DT_VCENTER|DT_SINGLELINE); + } if (oldBkMode != TRANSPARENT) SetBkMode(hdc, oldBkMode); }

1 0

Henri Verbeet : wined3d: Implement d3d10 style instance data step rates.
by Alexandre Julliard 24 Mar '15

24 Mar '15

Module: wine Branch: master Commit: 1b08196c5a1046a3bdecd383e3811de6aa85fbdf URL: http://source.winehq.org/git/wine.git/?a=commit;h=1b08196c5a1046a3bdecd383e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 24 09:38:23 2015 +0100 wined3d: Implement d3d10 style instance data step rates. --- dlls/d3d10core/inputlayout.c | 7 ++----- dlls/d3d8/vertexdeclaration.c | 2 ++ dlls/d3d9/vertexdeclaration.c | 2 ++ dlls/wined3d/context.c | 19 +++++++++++++++++-- dlls/wined3d/state.c | 27 +++++++++++---------------- dlls/wined3d/utils.c | 14 ++++++++++++++ dlls/wined3d/vertexdeclaration.c | 20 +++++++++++++------- dlls/wined3d/wined3d_private.h | 8 ++++++-- include/wine/wined3d.h | 10 +++++++++- 9 files changed, 76 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=1b08196c5a1046a3bdecd…

1 0

Henri Verbeet : wined3d: Use the "sysval_semantic" field instead of " semantic_name" to recognize SV_POSITION.
by Alexandre Julliard 24 Mar '15

24 Mar '15

Module: wine Branch: master Commit: f9fafb36864f8783f00e0e7164dcbf308231e1ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=f9fafb36864f8783f00e0e716… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 24 09:38:24 2015 +0100 wined3d: Use the "sysval_semantic" field instead of "semantic_name" to recognize SV_POSITION. --- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/shader.c | 2 +- include/wine/wined3d.h | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 0b307d3..a61d268 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4167,7 +4167,7 @@ static void shader_glsl_input_pack(const struct wined3d_shader *shader, struct w if (vertexprocessing == vertexshader) { - if (!strcmp(semantic_name, "SV_POSITION") && !semantic_idx) + if (input->sysval_semantic == WINED3D_SV_POSITION) shader_addline(buffer, "ps_in[%u]%s = vpos%s;\n", shader->u.ps.input_reg_map[input->register_idx], reg_mask, reg_mask); else diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index f162fb5..31b391b 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1045,7 +1045,7 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st { reg_maps->input_registers |= 1 << input_signature->elements[i].register_idx; if (shader_version.type == WINED3D_SHADER_TYPE_PIXEL - && !strcmp(input_signature->elements[i].semantic_name, "SV_POSITION")) + && input_signature->elements[i].sysval_semantic == WINED3D_SV_POSITION) reg_maps->vpos = 1; } } diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 2348be8..dcf7212 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -767,6 +767,8 @@ enum wined3d_decl_usage enum wined3d_sysval_semantic { + WINED3D_SV_POSITION = 1, + WINED3D_SV_DEPTH = 0xffffffff, WINED3D_SV_TARGET0 = 0, WINED3D_SV_TARGET1 = 1,

1 0

Henri Verbeet : wined3d: Add support for SV_InstanceID.
by Alexandre Julliard 24 Mar '15

24 Mar '15

Module: wine Branch: master Commit: a33d3ad41bcbf3637fdb5506946c932856f8c07a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a33d3ad41bcbf3637fdb55069… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 24 09:38:25 2015 +0100 wined3d: Add support for SV_InstanceID. --- dlls/wined3d/glsl_shader.c | 13 +++++++++---- include/wine/wined3d.h | 1 + 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a61d268..6e3b535 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1182,11 +1182,14 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont if (version->type == WINED3D_SHADER_TYPE_VERTEX) { - /* Declare attributes. */ - for (i = 0, map = reg_maps->input_registers; map; map >>= 1, ++i) + for (i = 0; i < shader->input_signature.element_count; ++i) { - if (map & 1) - shader_addline(buffer, "attribute vec4 %s_in%u;\n", prefix, i); + const struct wined3d_shader_signature_element *e = &shader->input_signature.elements[i]; + if (e->sysval_semantic == WINED3D_SV_INSTANCEID) + shader_addline(buffer, "vec4 %s_in%u = vec4(intBitsToFloat(gl_InstanceID), 0.0, 0.0, 0.0);\n", + prefix, e->register_idx); + else + shader_addline(buffer, "attribute vec4 %s_in%u;\n", prefix, e->register_idx); } shader_addline(buffer, "uniform vec4 posFixup;\n"); @@ -4588,6 +4591,8 @@ static GLuint shader_glsl_generate_vshader(const struct wined3d_context *context shader_addline(buffer, "#version 120\n"); + if (gl_info->supported[ARB_DRAW_INSTANCED]) + shader_addline(buffer, "#extension GL_ARB_draw_instanced : enable\n"); if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) shader_addline(buffer, "#extension GL_ARB_shader_bit_encoding : enable\n"); if (gl_info->supported[ARB_UNIFORM_BUFFER_OBJECT]) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index dcf7212..116918d 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -768,6 +768,7 @@ enum wined3d_decl_usage enum wined3d_sysval_semantic { WINED3D_SV_POSITION = 1, + WINED3D_SV_INSTANCEID = 8, WINED3D_SV_DEPTH = 0xffffffff, WINED3D_SV_TARGET0 = 0,

1 0

Henri Verbeet : d3d10core: Implement d3d10_device_DrawInstanced().
by Alexandre Julliard 24 Mar '15

24 Mar '15

Module: wine Branch: master Commit: 010ff106dd8b8eeb317d088ec86550f79c3c7857 URL: http://source.winehq.org/git/wine.git/?a=commit;h=010ff106dd8b8eeb317d088ec… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 24 09:38:26 2015 +0100 d3d10core: Implement d3d10_device_DrawInstanced(). --- dlls/d3d10core/device.c | 9 +++++++-- dlls/wined3d/device.c | 9 +++++++++ dlls/wined3d/directx.c | 1 + dlls/wined3d/drawprim.c | 14 ++++++++++++-- dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 6 files changed, 32 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10core/device.c b/dlls/d3d10core/device.c index ed59ee6..d8b3d7e 100644 --- a/dlls/d3d10core/device.c +++ b/dlls/d3d10core/device.c @@ -304,9 +304,14 @@ static void STDMETHODCALLTYPE d3d10_device_DrawInstanced(ID3D10Device1 *iface, UINT instance_vertex_count, UINT instance_count, UINT start_vertex_location, UINT start_instance_location) { - FIXME("iface %p, instance_vertex_count %u, instance_count %u, start_vertex_location %u,\n" - "\tstart_instance_location %u stub!\n", iface, instance_vertex_count, instance_count, + struct d3d10_device *device = impl_from_ID3D10Device(iface); + + TRACE("iface %p, instance_vertex_count %u, instance_count %u, start_vertex_location %u, " + "start_instance_location %u.\n", iface, instance_vertex_count, instance_count, start_vertex_location, start_instance_location); + + wined3d_device_draw_primitive_instanced(device->wined3d_device, start_vertex_location, + instance_vertex_count, start_instance_location, instance_count); } static void STDMETHODCALLTYPE d3d10_device_GSSetConstantBuffers(ID3D10Device1 *iface, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 631045a..870e384 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3427,6 +3427,15 @@ HRESULT CDECL wined3d_device_draw_primitive(struct wined3d_device *device, UINT return WINED3D_OK; } +void CDECL wined3d_device_draw_primitive_instanced(struct wined3d_device *device, + UINT start_vertex, UINT vertex_count, UINT start_instance, UINT instance_count) +{ + TRACE("device %p, start_vertex %u, vertex_count %u, start_instance %u, instance_count %u.\n", + device, start_vertex, vertex_count, start_instance, instance_count); + + wined3d_cs_emit_draw(device->cs, start_vertex, vertex_count, start_instance, instance_count, FALSE); +} + HRESULT CDECL wined3d_device_draw_indexed_primitive(struct wined3d_device *device, UINT start_idx, UINT index_count) { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3667840..13061f4 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2890,6 +2890,7 @@ static void load_gl_funcs(struct wined3d_gl_info *gl_info) USE_GL_FUNC(glDeleteShader) /* OpenGL 2.0 */ USE_GL_FUNC(glDetachShader) /* OpenGL 2.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(glEnableVertexAttribArray) /* OpenGL 2.0 */ diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 4916c05..c0654a6 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -74,8 +74,18 @@ static void drawStridedFast(const struct wined3d_gl_info *gl_info, GLenum primit } else { - gl_info->gl_ops.gl.p_glDrawArrays(primitive_type, start_idx, count); - checkGLcall("glDrawArrays"); + if (instance_count) + { + if (start_instance) + FIXME("Start instance (%u) not supported.\n", start_instance); + GL_EXTCALL(glDrawArraysInstanced(primitive_type, start_idx, count, instance_count)); + checkGLcall("glDrawArraysInstanced"); + } + else + { + gl_info->gl_ops.gl.p_glDrawArrays(primitive_type, start_idx, count); + checkGLcall("glDrawArrays"); + } } } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 9de0baf..a79d6a6 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -43,6 +43,7 @@ @ cdecl wined3d_device_draw_indexed_primitive(ptr long long) @ cdecl wined3d_device_draw_indexed_primitive_instanced(ptr long long long long) @ cdecl wined3d_device_draw_primitive(ptr long long) +@ cdecl wined3d_device_draw_primitive_instanced(ptr long long long long) @ cdecl wined3d_device_end_scene(ptr) @ cdecl wined3d_device_end_stateblock(ptr ptr) @ cdecl wined3d_device_evict_managed_resources(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 116918d..0f70848 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2143,6 +2143,8 @@ HRESULT __cdecl wined3d_device_draw_indexed_primitive(struct wined3d_device *dev void __cdecl wined3d_device_draw_indexed_primitive_instanced(struct wined3d_device *device, UINT start_idx, UINT index_count, UINT start_instance, UINT instance_count); HRESULT __cdecl wined3d_device_draw_primitive(struct wined3d_device *device, UINT start_vertex, UINT vertex_count); +void __cdecl wined3d_device_draw_primitive_instanced(struct wined3d_device *device, + UINT start_vertex, UINT vertex_count, UINT start_instance, UINT instance_count); HRESULT __cdecl wined3d_device_end_scene(struct wined3d_device *device); HRESULT __cdecl wined3d_device_end_stateblock(struct wined3d_device *device, struct wined3d_stateblock **stateblock); void __cdecl wined3d_device_evict_managed_resources(struct wined3d_device *device);

1 0