June 2011 - Wine-Commits - list.winehq.org

Stefan Dösinger : wined3d: Invalidate STATE_STREAMSRC in wined3d_device_draw_indexed_primitive_up.
by Alexandre Julliard June 14, 2011

June 14, 2011

Module: wine Branch: master Commit: a4212786250b5609f1b5f5a6d46d329c7252f18d URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4212786250b5609f1b5f5a6d… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jun 11 16:19:45 2011 +0200 wined3d: Invalidate STATE_STREAMSRC in wined3d_device_draw_indexed_primitive_up. --- dlls/wined3d/device.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 6a1e639..529f5ce 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4231,8 +4231,8 @@ HRESULT CDECL wined3d_device_draw_indexed_primitive_up(struct wined3d_device *de device->stateBlock->state.load_base_vertex_index = 0; device_invalidate_state(device, STATE_BASEVERTEXINDEX); } - /* Mark the state dirty until we have nicer tracking of the stream source pointers */ - device_invalidate_state(device, STATE_VDECL); + /* Invalidate the state until we have nicer tracking of the stream source pointers */ + device_invalidate_state(device, STATE_STREAMSRC); device_invalidate_state(device, STATE_INDEXBUFFER); drawPrimitive(device, index_count, 0, index_size, index_data);

1 0

Marcus Meissner : ddraw: Removed superflous NULL check (Coverity).
by Alexandre Julliard June 14, 2011

June 14, 2011

Module: wine Branch: master Commit: 7e1ccdef71edf78b51e067d65cbcff642f6b06f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e1ccdef71edf78b51e067d65… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jun 14 13:02:32 2011 +0200 ddraw: Removed superflous NULL check (Coverity). --- dlls/ddraw/surface.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 504e107..38be89c 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -3482,7 +3482,7 @@ static HRESULT WINAPI ddraw_surface7_BltFast(IDirectDrawSurface7 *iface, DWORD d EnterCriticalSection(&ddraw_cs); hr = wined3d_surface_bltfast(This->wined3d_surface, dstx, dsty, - src ? src->wined3d_surface : NULL, rsrc, trans); + src->wined3d_surface, rsrc, trans); LeaveCriticalSection(&ddraw_cs); switch(hr) {

1 0

Marcus Meissner : server: Remove superflous NULL check (Coverity).
by Alexandre Julliard June 14, 2011

June 14, 2011

Module: wine Branch: master Commit: 27c9a61e15cc6e6038fab12faf37430c6c913870 URL: http://source.winehq.org/git/wine.git/?a=commit;h=27c9a61e15cc6e6038fab12fa… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jun 14 13:38:45 2011 +0200 server: Remove superflous NULL check (Coverity). --- server/sock.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/server/sock.c b/server/sock.c index b0efc16..9f62da2 100644 --- a/server/sock.c +++ b/server/sock.c @@ -777,7 +777,7 @@ static int accept_into_socket( struct sock *sock, struct sock *acceptsock ) acceptsock->family = sock->family; acceptsock->wparam = 0; acceptsock->deferred = NULL; - if (acceptsock->fd) release_object( acceptsock->fd ); + release_object( acceptsock->fd ); acceptsock->fd = newfd; clear_error();

1 0

Marcus Meissner : mscvrt: Do not shadow fmt (Coverity).
by Alexandre Julliard June 14, 2011

June 14, 2011

Module: wine Branch: master Commit: 034c2cb3fdb1150c83448cdf68ed439e64946d09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=034c2cb3fdb1150c83448cdf6… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jun 14 13:06:08 2011 +0200 mscvrt: Do not shadow fmt (Coverity). --- dlls/msvcrt/printf.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index eefecd1..ca7870c 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -533,7 +533,7 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API if(tmp != buf) HeapFree(GetProcessHeap(), 0, tmp); } else if(flags.Format && strchr("aeEfgG", flags.Format)) { - char fmt[20], buf_a[32], *tmp = buf_a, *decimal_point; + char float_fmt[20], buf_a[32], *tmp = buf_a, *decimal_point; int max_len = (flags.FieldLength>flags.Precision ? flags.FieldLength : flags.Precision) + 10; if(max_len > sizeof(buf_a)) @@ -541,9 +541,9 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API if(!tmp) return -1; - FUNC_NAME(pf_rebuild_format_string)(fmt, &flags); + FUNC_NAME(pf_rebuild_format_string)(float_fmt, &flags); - sprintf(tmp, fmt, pf_args(args_ctx, pos, VT_R8, valist).get_double); + sprintf(tmp, float_fmt, pf_args(args_ctx, pos, VT_R8, valist).get_double); if(toupper(flags.Format)=='E' || toupper(flags.Format)=='G') FUNC_NAME(pf_fixup_exponent)(tmp);

1 0

Marcus Meissner : strmbase: Removed superflous NULL check (Coverity).
by Alexandre Julliard June 14, 2011

June 14, 2011

Module: wine Branch: master Commit: 8377e274a25c4a3205f7297155c9e8ce8989e67d URL: http://source.winehq.org/git/wine.git/?a=commit;h=8377e274a25c4a3205f729715… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jun 14 13:00:07 2011 +0200 strmbase: Removed superflous NULL check (Coverity). --- dlls/strmbase/outputqueue.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/strmbase/outputqueue.c b/dlls/strmbase/outputqueue.c index 200e2da..4f4ecf8 100644 --- a/dlls/strmbase/outputqueue.c +++ b/dlls/strmbase/outputqueue.c @@ -130,8 +130,7 @@ HRESULT WINAPI OutputQueue_Destroy(OutputQueue *pOutputQueue) DeleteCriticalSection(&pOutputQueue->csQueue); CloseHandle(pOutputQueue->hProcessQueue); - if (pOutputQueue->SampleList) - HeapFree(GetProcessHeap(),0,pOutputQueue->SampleList); + HeapFree(GetProcessHeap(),0,pOutputQueue->SampleList); IPin_Release((IPin*)pOutputQueue->pInputPin); HeapFree(GetProcessHeap(),0,pOutputQueue);

1 0

Stefan Dösinger : wined3d: Add GL_ARB_draw_elements_base_vertex.
by Alexandre Julliard June 14, 2011

June 14, 2011

Module: wine Branch: master Commit: 7de2fa267048bdb25f5b36fca957030f65f556d3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7de2fa267048bdb25f5b36fca… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jun 11 15:39:30 2011 +0200 wined3d: Add GL_ARB_draw_elements_base_vertex. --- dlls/wined3d/directx.c | 1 + dlls/wined3d/wined3d_gl.h | 23 +++++++++++++++++++++++ 2 files changed, 24 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1dd2cba..34eea82 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -55,6 +55,7 @@ static const struct { {"GL_ARB_depth_clamp", ARB_DEPTH_CLAMP, 0 }, {"GL_ARB_depth_texture", ARB_DEPTH_TEXTURE, 0 }, {"GL_ARB_draw_buffers", ARB_DRAW_BUFFERS, 0 }, + {"GL_ARB_draw_elements_base_vertex", ARB_DRAW_ELEMENTS_BASE_VERTEX, 0 }, {"GL_ARB_fragment_program", ARB_FRAGMENT_PROGRAM, 0 }, {"GL_ARB_fragment_shader", ARB_FRAGMENT_SHADER, 0 }, {"GL_ARB_framebuffer_object", ARB_FRAMEBUFFER_OBJECT, 0 }, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index be50b2f..85e5fea 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -1738,6 +1738,7 @@ typedef enum wined3d_gl_extension ARB_DEPTH_CLAMP, ARB_DEPTH_TEXTURE, ARB_DRAW_BUFFERS, + ARB_DRAW_ELEMENTS_BASE_VERTEX, ARB_FRAGMENT_PROGRAM, ARB_FRAGMENT_SHADER, ARB_FRAMEBUFFER_OBJECT, @@ -1965,6 +1966,19 @@ typedef void (WINE_GLAPI *PGLFNCLAMPCOLORARBPROC)(GLenum target, GLenum clamp); #endif typedef void (WINE_GLAPI *PGLFNDRAWBUFFERSARBPROC)(GLsizei n, const GLenum *bufs); +/* GL_ARB_draw_elements_base_vertex */ +#ifndef GL_ARB_draw_elements_base_vertex +#define GL_ARB_draw_elements_base_vertex 1 +typedef void (WINE_GLAPI *PGLFNDRAWELEMENTSBASEVERTEXPROC)(GLenum mode, GLsizei count, GLenum type, + const GLvoid *indices, GLint basevertex); +typedef void (WINE_GLAPI *PGLFNDRAWRANGEELEMENTSBASEVERTEXPROC)(GLenum mode, GLuint start, GLuint end, + GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex); +typedef void (WINE_GLAPI *PGLFNDRAWELEMENTSINSTANCEDBASEVERTEXPROC)(GLenum mode, GLsizei count, + GLenum type, const GLvoid *indices, GLsizei primcount, GLint basevertex); +typedef void (WINE_GLAPI *PGLFNMULTIDRAWELEMENTSBASEVERTEXPROC)(GLenum mode, GLsizei *count, GLenum type, + const GLvoid **indices, GLsizei primcount, GLint *basevertex); +#endif + /* GL_ARB_fragment_program */ #ifndef GL_ARB_fragment_program #define GL_ARB_fragment_program 1 @@ -3789,6 +3803,15 @@ typedef BOOL (WINAPI *WINED3D_PFNWGLSWAPINTERVALEXTPROC)(int interval); /* GL_ARB_draw_buffers */ \ USE_GL_FUNC(PGLFNDRAWBUFFERSARBPROC, \ glDrawBuffersARB, ARB_DRAW_BUFFERS, NULL) \ + /* GL_ARB_draw_elements_base_vertex */ \ + USE_GL_FUNC(PGLFNDRAWELEMENTSBASEVERTEXPROC, \ + glDrawElementsBaseVertex, ARB_DRAW_ELEMENTS_BASE_VERTEX, NULL) \ + USE_GL_FUNC(PGLFNDRAWRANGEELEMENTSBASEVERTEXPROC, \ + glDrawRangeElementsBaseVertex, ARB_DRAW_ELEMENTS_BASE_VERTEX, NULL) \ + USE_GL_FUNC(PGLFNDRAWELEMENTSINSTANCEDBASEVERTEXPROC, \ + glDrawElementsInstancedBaseVertex, ARB_DRAW_ELEMENTS_BASE_VERTEX, NULL) \ + USE_GL_FUNC(PGLFNMULTIDRAWELEMENTSBASEVERTEXPROC, \ + glMultiDrawElementsBaseVertex, ARB_DRAW_ELEMENTS_BASE_VERTEX, NULL) \ /* GL_ARB_framebuffer_object */ \ USE_GL_FUNC(PGLFNGLISRENDERBUFFERPROC, \ glIsRenderbuffer, ARB_FRAMEBUFFER_OBJECT, NULL) \

1 0

Vincent Povirk : user32: Ignore painting messages in the hotkey test using a wndproc.
by Alexandre Julliard June 14, 2011

June 14, 2011

Module: wine Branch: master Commit: 9eb6af791f9ff687815dc42ccc6f5f2db64cb00d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9eb6af791f9ff687815dc42cc… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Mon Jun 13 12:20:31 2011 -0500 user32: Ignore painting messages in the hotkey test using a wndproc. --- dlls/user32/tests/msg.c | 61 +++++++++++++++++++++++++++++++++------------- 1 files changed, 44 insertions(+), 17 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 8c23da2..2d993e2 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -7712,6 +7712,37 @@ static LRESULT WINAPI PaintLoopProcA(HWND hWnd, UINT msg, WPARAM wParam, LPARAM return DefWindowProcA(hWnd,msg,wParam,lParam); } +static LRESULT WINAPI HotkeyMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + static LONG defwndproc_counter = 0; + LRESULT ret; + struct recvd_message msg; + + if (ignore_message( message )) return 0; + + if ((message >= WM_KEYFIRST && message <= WM_KEYLAST) || + message == WM_HOTKEY || message >= WM_APP) + { + msg.hwnd = hwnd; + msg.message = message; + msg.flags = sent|wparam|lparam; + if (defwndproc_counter) msg.flags |= defwinproc; + msg.wParam = wParam; + msg.lParam = lParam; + msg.descr = "HotkeyMsgCheckProcA"; + add_message(&msg); + } + + defwndproc_counter++; + ret = DefWindowProcA(hwnd, message, wParam, lParam); + defwndproc_counter--; + + if (message == WM_APP) + PostMessageA(hwnd, WM_APP+1, 0, 0); + + return ret; +} + static BOOL RegisterWindowClasses(void) { WNDCLASSA cls; @@ -7729,6 +7760,10 @@ static BOOL RegisterWindowClasses(void) cls.lpszClassName = "TestWindowClass"; if(!RegisterClassA(&cls)) return FALSE; + cls.lpfnWndProc = HotkeyMsgCheckProcA; + cls.lpszClassName = "HotkeyWindowClass"; + if(!RegisterClassA(&cls)) return FALSE; + cls.lpfnWndProc = ShowWindowProcA; cls.lpszClassName = "ShowWindowClass"; if(!RegisterClassA(&cls)) return FALSE; @@ -13090,7 +13125,7 @@ static void test_hotkey(void) return; } - test_window = CreateWindowEx(0, "TestWindowClass", NULL, WS_OVERLAPPEDWINDOW | WS_VISIBLE, + test_window = CreateWindowEx(0, "HotkeyWindowClass", NULL, WS_OVERLAPPEDWINDOW | WS_VISIBLE, 100, 100, 200, 200, 0, 0, 0, NULL); flush_sequence(); @@ -13159,14 +13194,12 @@ static void test_hotkey(void) /* Inject the appropriate key sequence */ keybd_event(VK_LWIN, 0, 0, 0); - while (PeekMessage(&msg, NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE) || - PeekMessage(&msg, NULL, WM_HOTKEY, WM_HOTKEY, PM_REMOVE)) + while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessage(&msg); ok_sequence(WmHotkeyPressLWIN, "window hotkey press LWIN", FALSE); keybd_event(hotkey_letter, 0, 0, 0); - while (PeekMessage(&msg, NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE) || - PeekMessage(&msg, NULL, WM_HOTKEY, WM_HOTKEY, PM_REMOVE)) + while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) { if (msg.message == WM_HOTKEY) { @@ -13181,14 +13214,12 @@ static void test_hotkey(void) ok((key_state & 0x8000) == 0x8000, "unexpected key state %x\n", key_state); keybd_event(hotkey_letter, 0, KEYEVENTF_KEYUP, 0); - while (PeekMessage(&msg, NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE) || - PeekMessage(&msg, NULL, WM_HOTKEY, WM_HOTKEY, PM_REMOVE)) + while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessage(&msg); ok_sequence(WmHotkeyRelease, "window hotkey release", FALSE); keybd_event(VK_LWIN, 0, KEYEVENTF_KEYUP, 0); - while (PeekMessage(&msg, NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE) || - PeekMessage(&msg, NULL, WM_HOTKEY, WM_HOTKEY, PM_REMOVE)) + while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessage(&msg); ok_sequence(WmHotkeyReleaseLWIN, "window hotkey release LWIN", FALSE); @@ -13212,8 +13243,7 @@ static void test_hotkey(void) /* Inject the appropriate key sequence */ keybd_event(VK_LWIN, 0, 0, 0); - while (PeekMessage(&msg, NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE) || - PeekMessage(&msg, NULL, WM_HOTKEY, WM_HOTKEY, PM_REMOVE)) + while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) { ok(msg.hwnd != NULL, "unexpected thread message %x\n", msg.message); DispatchMessage(&msg); @@ -13221,8 +13251,7 @@ static void test_hotkey(void) ok_sequence(WmHotkeyPressLWIN, "thread hotkey press LWIN", FALSE); keybd_event(hotkey_letter, 0, 0, 0); - while (PeekMessage(&msg, NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE) || - PeekMessage(&msg, NULL, WM_HOTKEY, WM_HOTKEY, PM_REMOVE)) + while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) { if (msg.message == WM_HOTKEY) { @@ -13243,8 +13272,7 @@ static void test_hotkey(void) ok_sequence(WmHotkeyPress, "thread hotkey press", FALSE); keybd_event(hotkey_letter, 0, KEYEVENTF_KEYUP, 0); - while (PeekMessage(&msg, NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE) || - PeekMessage(&msg, NULL, WM_HOTKEY, WM_HOTKEY, PM_REMOVE)) + while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) { ok(msg.hwnd != NULL, "unexpected thread message %x\n", msg.message); DispatchMessage(&msg); @@ -13252,8 +13280,7 @@ static void test_hotkey(void) ok_sequence(WmHotkeyRelease, "thread hotkey release", FALSE); keybd_event(VK_LWIN, 0, KEYEVENTF_KEYUP, 0); - while (PeekMessage(&msg, NULL, WM_KEYFIRST, WM_KEYLAST, PM_REMOVE) || - PeekMessage(&msg, NULL, WM_HOTKEY, WM_HOTKEY, PM_REMOVE)) + while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) { ok(msg.hwnd != NULL, "unexpected thread message %x\n", msg.message); DispatchMessage(&msg);

1 0

Stefan Dösinger : wined3d: Use GL_ARB_draw_elements_base_vertex if available.
by Alexandre Julliard June 14, 2011

June 14, 2011

Module: wine Branch: master Commit: dafd31861ae6e86745ee61de2674528845af983b URL: http://source.winehq.org/git/wine.git/?a=commit;h=dafd31861ae6e86745ee61de2… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Jun 11 16:18:45 2011 +0200 wined3d: Use GL_ARB_draw_elements_base_vertex if available. --- dlls/wined3d/device.c | 24 ++++++++++++++-------- dlls/wined3d/drawprim.c | 43 +++++++++++++++++++++++++++++---------- dlls/wined3d/state.c | 2 + dlls/wined3d/wined3d_private.h | 5 +++- 4 files changed, 53 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 30d5b95..6a1e639 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2391,10 +2391,6 @@ HRESULT CDECL wined3d_device_set_base_vertex_index(struct wined3d_device *device TRACE("Recording... not performing anything\n"); return WINED3D_OK; } - - /* The base vertex index affects the stream sources */ - device_invalidate_state(device, STATE_STREAMSRC); - return WINED3D_OK; } @@ -4092,7 +4088,7 @@ HRESULT CDECL wined3d_device_draw_primitive(struct wined3d_device *device, UINT if (device->stateBlock->state.load_base_vertex_index) { device->stateBlock->state.load_base_vertex_index = 0; - device_invalidate_state(device, STATE_STREAMSRC); + device_invalidate_state(device, STATE_BASEVERTEXINDEX); } /* Account for the loading offset due to index buffers. Instead of @@ -4106,6 +4102,7 @@ HRESULT CDECL wined3d_device_draw_indexed_primitive(struct wined3d_device *devic struct wined3d_buffer *index_buffer; UINT index_size = 2; GLuint vbo; + const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; TRACE("device %p, start_idx %u, index_count %u.\n", device, start_idx, index_count); @@ -4138,10 +4135,11 @@ HRESULT CDECL wined3d_device_draw_indexed_primitive(struct wined3d_device *devic else index_size = 4; - if (device->stateBlock->state.load_base_vertex_index != device->stateBlock->state.base_vertex_index) + if (!gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX] && + device->stateBlock->state.load_base_vertex_index != device->stateBlock->state.base_vertex_index) { device->stateBlock->state.load_base_vertex_index = device->stateBlock->state.base_vertex_index; - device_invalidate_state(device, STATE_STREAMSRC); + device_invalidate_state(device, STATE_BASEVERTEXINDEX); } drawPrimitive(device, index_count, start_idx, index_size, @@ -4174,7 +4172,11 @@ HRESULT CDECL wined3d_device_draw_primitive_up(struct wined3d_device *device, UI stream->offset = 0; stream->stride = stream_stride; device->stateBlock->state.user_stream = TRUE; - device->stateBlock->state.load_base_vertex_index = 0; + if (device->stateBlock->state.load_base_vertex_index) + { + device->stateBlock->state.load_base_vertex_index = 0; + device_invalidate_state(device, STATE_BASEVERTEXINDEX); + } /* TODO: Only mark dirty if drawing from a different UP address */ device_invalidate_state(device, STATE_STREAMSRC); @@ -4224,7 +4226,11 @@ HRESULT CDECL wined3d_device_draw_indexed_primitive_up(struct wined3d_device *de /* Set to 0 as per msdn. Do it now due to the stream source loading during drawPrimitive */ device->stateBlock->state.base_vertex_index = 0; - device->stateBlock->state.load_base_vertex_index = 0; + if (device->stateBlock->state.load_base_vertex_index) + { + device->stateBlock->state.load_base_vertex_index = 0; + device_invalidate_state(device, STATE_BASEVERTEXINDEX); + } /* Mark the state dirty until we have nicer tracking of the stream source pointers */ device_invalidate_state(device, STATE_VDECL); device_invalidate_state(device, STATE_INDEXBUFFER); diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 45ee895..d5a656e 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -33,14 +33,24 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_draw); #include <math.h> /* GL locking is done by the caller */ -static void drawStridedFast(GLenum primitive_type, UINT count, UINT idx_size, const void *idx_data, UINT start_idx) +static void drawStridedFast(const struct wined3d_gl_info *gl_info, GLenum primitive_type, UINT count, UINT idx_size, + const void *idx_data, UINT start_idx, INT base_vertex_index) { if (idx_size) { - glDrawElements(primitive_type, count, - idx_size == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT, - (const char *)idx_data + (idx_size * start_idx)); - checkGLcall("glDrawElements"); + GLenum idxtype = idx_size == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT; + if (gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]) + { + GL_EXTCALL(glDrawElementsBaseVertex(primitive_type, count, idxtype, + (const char *)idx_data + (idx_size * start_idx), base_vertex_index)); + checkGLcall("glDrawElementsBaseVertex"); + } + else + { + glDrawElements(primitive_type, count, + idxtype, (const char *)idx_data + (idx_size * start_idx)); + checkGLcall("glDrawElements"); + } } else { @@ -469,11 +479,12 @@ static void drawStridedSlowVs(const struct wined3d_gl_info *gl_info, const struc /* GL locking is done by the caller */ static void drawStridedInstanced(const struct wined3d_gl_info *gl_info, const struct wined3d_state *state, const struct wined3d_stream_info *si, UINT numberOfVertices, GLenum glPrimitiveType, - const void *idxData, UINT idxSize, UINT startIdx) + const void *idxData, UINT idxSize, UINT startIdx, UINT base_vertex_index) { UINT numInstances = 0, i; int numInstancedAttribs = 0, j; UINT instancedData[sizeof(si->elements) / sizeof(*si->elements) /* 16 */]; + GLenum idxtype = idxSize == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT; if (!idxSize) { @@ -530,9 +541,18 @@ static void drawStridedInstanced(const struct wined3d_gl_info *gl_info, const st send_attribute(gl_info, si->elements[instancedData[j]].format->id, instancedData[j], ptr); } - glDrawElements(glPrimitiveType, numberOfVertices, idxSize == 2 ? GL_UNSIGNED_SHORT : GL_UNSIGNED_INT, - (const char *)idxData+(idxSize * startIdx)); - checkGLcall("glDrawElements"); + if (gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]) + { + GL_EXTCALL(glDrawElementsBaseVertex(glPrimitiveType, numberOfVertices, idxtype, + (const char *)idxData+(idxSize * startIdx), base_vertex_index)); + checkGLcall("glDrawElementsBaseVertex"); + } + else + { + glDrawElements(glPrimitiveType, numberOfVertices, idxtype, + (const char *)idxData+(idxSize * startIdx)); + checkGLcall("glDrawElements"); + } } } @@ -646,6 +666,7 @@ void drawPrimitive(struct wined3d_device *device, UINT index_count, UINT StartId ENTER_GL(); { GLenum glPrimType = state->gl_primitive_type; + INT base_vertex_index = state->base_vertex_index; BOOL emulation = FALSE; const struct wined3d_stream_info *stream_info = &device->strided_streams; struct wined3d_stream_info stridedlcl; @@ -711,11 +732,11 @@ void drawPrimitive(struct wined3d_device *device, UINT index_count, UINT StartId { /* Instancing emulation with mixing immediate mode and arrays */ drawStridedInstanced(context->gl_info, state, stream_info, - index_count, glPrimType, idxData, idxSize, StartIdx); + index_count, glPrimType, idxData, idxSize, StartIdx, base_vertex_index); } else { - drawStridedFast(glPrimType, index_count, idxSize, idxData, StartIdx); + drawStridedFast(context->gl_info, glPrimType, index_count, idxSize, idxData, StartIdx, base_vertex_index); } } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 6c6ae3a..632388c 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5062,6 +5062,8 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_SAMPLER(17), /* Vertex sampler 1 */ { STATE_SAMPLER(17), sampler }, WINED3D_GL_EXT_NONE }, { STATE_SAMPLER(18), /* Vertex sampler 2 */ { STATE_SAMPLER(18), sampler }, WINED3D_GL_EXT_NONE }, { STATE_SAMPLER(19), /* Vertex sampler 3 */ { STATE_SAMPLER(19), sampler }, WINED3D_GL_EXT_NONE }, + { STATE_BASEVERTEXINDEX, { 0, NULL, }, ARB_DRAW_ELEMENTS_BASE_VERTEX }, + { STATE_BASEVERTEXINDEX, { STATE_STREAMSRC, NULL, }, WINED3D_GL_EXT_NONE }, {0 /* Terminate */, { 0, 0 }, WINED3D_GL_EXT_NONE }, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 44efb85..83fa40f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -995,7 +995,10 @@ extern glMultiTexCoordFunc multi_texcoord_funcs[WINED3D_FFP_EMIT_COUNT] DECLSPEC #define STATE_POINTSPRITECOORDORIGIN (STATE_FRONTFACE + 1) #define STATE_IS_POINTSPRITECOORDORIGIN(a) ((a) == STATE_POINTSPRITECOORDORIGIN) -#define STATE_HIGHEST (STATE_POINTSPRITECOORDORIGIN) +#define STATE_BASEVERTEXINDEX (STATE_POINTSPRITECOORDORIGIN + 1) +#define STATE_IS_BASEVERTEXINDEX(a) ((a) == STATE_BASEVERTEXINDEX) + +#define STATE_HIGHEST (STATE_BASEVERTEXINDEX) enum fogsource { FOGSOURCE_FFP,

1 0

Austin English : configure: Remove some unused but set variables (LLVM/ Clang).
by Alexandre Julliard June 14, 2011

June 14, 2011

Module: wine Branch: master Commit: 8521ebe79df39730ee62d518fde3751f45606061 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8521ebe79df39730ee62d518f… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Jun 13 21:26:40 2011 -0700 configure: Remove some unused but set variables (LLVM/Clang). --- configure | 12 ++++++------ configure.ac | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/configure b/configure index 1bdae44..70d0202 100755 --- a/configure +++ b/configure @@ -10918,7 +10918,7 @@ if test "x$ac_cv_lib_asound_snd_pcm_hw_params_get_access_mask" = xyes; then : int main () { -int ret = snd_pcm_hw_params_get_access_mask(NULL, NULL) +snd_pcm_hw_params_get_access_mask(NULL, NULL) ; return 0; } @@ -13700,12 +13700,12 @@ main () struct hostent *result; char *buf=0; int bufsize=0; - int res,errnr; + int errnr; char *addr=0; int addrlen=0; int addrtype=0; - res=gethostbyname_r(name,&he,buf,bufsize,&result,&errnr); - res=gethostbyaddr_r(addr, addrlen, addrtype,&he,buf,bufsize,&result,&errnr); + gethostbyname_r(name,&he,buf,bufsize,&result,&errnr); + gethostbyaddr_r(addr, addrlen, addrtype,&he,buf,bufsize,&result,&errnr); ; return 0; @@ -14281,7 +14281,7 @@ else int main () { -float f = 0.0; int i=isinf(f) +float f = 0.0; return isinf(f) ; return 0; } @@ -14314,7 +14314,7 @@ else int main () { -float f = 0.0; int i=isnan(f) +float f = 0.0; return isnan(f) ; return 0; } diff --git a/configure.ac b/configure.ac index 9db37c7..ba36dda 100644 --- a/configure.ac +++ b/configure.ac @@ -1515,7 +1515,7 @@ then #include <alsa/asoundlib.h> #elif defined(HAVE_SYS_ASOUNDLIB_H) #include <sys/asoundlib.h> -#endif]], [[int ret = snd_pcm_hw_params_get_access_mask(NULL, NULL)]])], +#endif]], [[snd_pcm_hw_params_get_access_mask(NULL, NULL)]])], [ALSALIBS="-lasound"])]) fi @@ -2150,12 +2150,12 @@ AC_CACHE_CHECK([whether we can use re-entrant gethostbyname_r Linux style], struct hostent *result; char *buf=0; int bufsize=0; - int res,errnr; + int errnr; char *addr=0; int addrlen=0; int addrtype=0; - res=gethostbyname_r(name,&he,buf,bufsize,&result,&errnr); - res=gethostbyaddr_r(addr, addrlen, addrtype,&he,buf,bufsize,&result,&errnr); + gethostbyname_r(name,&he,buf,bufsize,&result,&errnr); + gethostbyaddr_r(addr, addrlen, addrtype,&he,buf,bufsize,&result,&errnr); ]])],[wine_cv_linux_gethostbyname_r_6=yes],[wine_cv_linux_gethostbyname_r_6=no ]) ) @@ -2328,7 +2328,7 @@ fi dnl Check for isinf AC_CACHE_CHECK([for isinf], ac_cv_have_isinf, - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <math.h>]], [[float f = 0.0; int i=isinf(f)]])],[ac_cv_have_isinf="yes"],[ac_cv_have_isinf="no"])) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <math.h>]], [[float f = 0.0; return isinf(f)]])],[ac_cv_have_isinf="yes"],[ac_cv_have_isinf="no"])) if test "$ac_cv_have_isinf" = "yes" then AC_DEFINE(HAVE_ISINF, 1, [Define to 1 if you have the `isinf' function.]) @@ -2336,7 +2336,7 @@ fi dnl Check for isnan AC_CACHE_CHECK([for isnan], ac_cv_have_isnan, - AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <math.h>]], [[float f = 0.0; int i=isnan(f)]])],[ac_cv_have_isnan="yes"],[ac_cv_have_isnan="no"])) + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <math.h>]], [[float f = 0.0; return isnan(f)]])],[ac_cv_have_isnan="yes"],[ac_cv_have_isnan="no"])) if test "$ac_cv_have_isnan" = "yes" then AC_DEFINE(HAVE_ISNAN, 1, [Define to 1 if you have the `isnan' function.])

1 0

Marcus Meissner : winebuild: Avoid a superflous null check (Coverity).
by Alexandre Julliard June 14, 2011

June 14, 2011

Module: wine Branch: master Commit: 0806f9a438f752ee88e07cad7c97c69ea9d1af2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0806f9a438f752ee88e07cad7… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Tue Jun 14 13:36:04 2011 +0200 winebuild: Avoid a superflous null check (Coverity). --- tools/winebuild/res32.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/tools/winebuild/res32.c b/tools/winebuild/res32.c index 0c2bd09..e3f46ee 100644 --- a/tools/winebuild/res32.c +++ b/tools/winebuild/res32.c @@ -626,6 +626,7 @@ void output_res_o_file( DLLSPEC *spec ) unsigned int i; char *res_file = NULL; int fd; + struct strarray *args; if (!spec->nb_resources) fatal_error( "--resources mode needs at least one resource file as input\n" ); if (!output_file_name) fatal_error( "No output file name specified\n" ); @@ -681,12 +682,10 @@ void output_res_o_file( DLLSPEC *spec ) close( fd ); free( output_buffer ); - if (res_file) - { - struct strarray *args = strarray_init(); - strarray_add( args, find_tool( "windres", NULL ), "-i", res_file, "-o", output_file_name, NULL ); - spawn( args ); - strarray_free( args ); - } + args = strarray_init(); + strarray_add( args, find_tool( "windres", NULL ), "-i", res_file, "-o", output_file_name, NULL ); + spawn( args ); + strarray_free( args ); + output_file_name = NULL; /* so we don't try to assemble it */ }

1 0