wine-commits October 2013

wine-commits@winehq.org

2 participants
757 discussions

Frédéric Delanoy : comctl32: Use BOOL type where appropriate.
by Alexandre Julliard 04 Oct '13

04 Oct '13

Module: wine Branch: master Commit: cf8efbd252d761551f3c0b91346c11d0ae1a59d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf8efbd252d761551f3c0b913… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Oct 4 11:43:21 2013 +0200 comctl32: Use BOOL type where appropriate. --- dlls/comctl32/imagelist.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/imagelist.c b/dlls/comctl32/imagelist.c index ec8d08a..6461df6 100644 --- a/dlls/comctl32/imagelist.c +++ b/dlls/comctl32/imagelist.c @@ -209,7 +209,7 @@ static void add_dib_bits( HIMAGELIST himl, int pos, int count, int width, int he for (n = 0; n < count; n++) { - int has_alpha = 0; + BOOL has_alpha = FALSE; imagelist_point_from_index( himl, pos + n, &pt );

1 0

Frédéric Delanoy : advapi32: Use BOOL type where appropriate.
by Alexandre Julliard 04 Oct '13

04 Oct '13

Module: wine Branch: master Commit: 6b6495e3cafc402bdf1231f6975966c0816366d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b6495e3cafc402bdf1231f69… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Fri Oct 4 11:43:20 2013 +0200 advapi32: Use BOOL type where appropriate. --- dlls/advapi32/registry.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/advapi32/registry.c b/dlls/advapi32/registry.c index e999ce6..11e7500 100644 --- a/dlls/advapi32/registry.c +++ b/dlls/advapi32/registry.c @@ -82,13 +82,13 @@ static BOOL hkcu_cache_disabled; static const BOOL is_win64 = (sizeof(void *) > sizeof(int)); /* check if value type needs string conversion (Ansi<->Unicode) */ -static inline int is_string( DWORD type ) +static inline BOOL is_string( DWORD type ) { return (type == REG_SZ) || (type == REG_EXPAND_SZ) || (type == REG_MULTI_SZ); } /* check if current version is NT or Win95 */ -static inline int is_version_nt(void) +static inline BOOL is_version_nt(void) { return !(GetVersion() & 0x80000000); }

1 0

Ken Thomases : winemac: Make clicking on the app' s dock icon unminimize a window if there are only minimized windows.
by Alexandre Julliard 04 Oct '13

04 Oct '13

Module: wine Branch: master Commit: 1186c36c89c74066d127ca52512c1196b1802ec9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1186c36c89c74066d127ca525… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Oct 4 00:17:24 2013 -0500 winemac: Make clicking on the app's dock icon unminimize a window if there are only minimized windows. Cocoa would automatically do this for a normal app. However, the Mac driver makes all of its windows inherit from NSPanel and Cocoa ignores panels for this feature. --- dlls/winemac.drv/cocoa_app.m | 36 +++++++++++++++++++++++++----------- 1 files changed, 25 insertions(+), 11 deletions(-) diff --git a/dlls/winemac.drv/cocoa_app.m b/dlls/winemac.drv/cocoa_app.m index 632a1bb..9d33e7f 100644 --- a/dlls/winemac.drv/cocoa_app.m +++ b/dlls/winemac.drv/cocoa_app.m @@ -1915,6 +1915,21 @@ int macdrv_err_on; } } + - (void) unminimizeWindowIfNoneVisible + { + if (![self frontWineWindow]) + { + for (WineWindow* window in [NSApp windows]) + { + if ([window isKindOfClass:[WineWindow class]] && [window isMiniaturized]) + { + [window deminiaturize:self]; + break; + } + } + } + } + /* * ---------- NSApplicationDelegate methods ---------- @@ -1935,17 +1950,8 @@ int macdrv_err_on; [self updateFullscreenWindows]; [self adjustWindowLevels:YES]; - if (beenActive && ![self frontWineWindow]) - { - for (WineWindow* window in [NSApp windows]) - { - if ([window isKindOfClass:[WineWindow class]] && [window isMiniaturized]) - { - [window deminiaturize:self]; - break; - } - } - } + if (beenActive) + [self unminimizeWindowIfNoneVisible]; beenActive = TRUE; // If a Wine process terminates abruptly while it has the display captured @@ -1997,6 +2003,14 @@ int macdrv_err_on; [self releaseMouseCapture]; } + - (BOOL) applicationShouldHandleReopen:(NSApplication*)theApplication hasVisibleWindows:(BOOL)flag + { + // Note that "flag" is often wrong. WineWindows are NSPanels and NSPanels + // don't count as "visible windows" for this purpose. + [self unminimizeWindowIfNoneVisible]; + return YES; + } + - (NSApplicationTerminateReply) applicationShouldTerminate:(NSApplication *)sender { NSApplicationTerminateReply ret = NSTerminateNow;

1 0

Ken Thomases : winemac: Allow zero-sized windows to be selected from the Mac Window menu.
by Alexandre Julliard 04 Oct '13

04 Oct '13

Module: wine Branch: master Commit: 63fe00eae7b3388d10a98ed0e99718fcbcb2905c URL: http://source.winehq.org/git/wine.git/?a=commit;h=63fe00eae7b3388d10a98ed0e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri Oct 4 00:17:17 2013 -0500 winemac: Allow zero-sized windows to be selected from the Mac Window menu. They show up in the taskbar on Windows 7. Selecting them from there is meaningful and useful, as is selecting them from the Window menu. In addition to just switching among windows from that menu, this is also important to recovering a minimized window if the user has configured their system preferences to minimize windows into the process's dock icon (rather than as separate dock icons). --- dlls/winemac.drv/window.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 98d8695..2c71a1e 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -89,13 +89,11 @@ static void get_cocoa_window_features(struct macdrv_win_data *data, static inline BOOL can_activate_window(HWND hwnd) { LONG style = GetWindowLongW(hwnd, GWL_STYLE); - RECT rect; if (!(style & WS_VISIBLE)) return FALSE; if ((style & (WS_POPUP|WS_CHILD)) == WS_CHILD) return FALSE; if (GetWindowLongW(hwnd, GWL_EXSTYLE) & WS_EX_NOACTIVATE) return FALSE; if (hwnd == GetDesktopWindow()) return FALSE; - if (GetWindowRect(hwnd, &rect) && IsRectEmpty(&rect)) return FALSE; return !(style & WS_DISABLED); } @@ -112,9 +110,10 @@ static void get_cocoa_window_state(struct macdrv_win_data *data, state->no_activate = !can_activate_window(data->hwnd); state->floating = (ex_style & WS_EX_TOPMOST) != 0; state->excluded_by_expose = state->excluded_by_cycle = - IsRectEmpty(&data->window_rect) || (!(ex_style & WS_EX_APPWINDOW) && (GetWindow(data->hwnd, GW_OWNER) || (ex_style & (WS_EX_TOOLWINDOW | WS_EX_NOACTIVATE)))); + if (IsRectEmpty(&data->window_rect)) + state->excluded_by_expose = TRUE; state->minimized = (style & WS_MINIMIZE) != 0; }

1 0

Henri Verbeet : d3drm: Get rid of the Header typedef.
by Alexandre Julliard 04 Oct '13

04 Oct '13

Module: wine Branch: master Commit: 13e3219c2f5df4efbd035bc1466a254ef5d2d95e URL: http://source.winehq.org/git/wine.git/?a=commit;h=13e3219c2f5df4efbd035bc14… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 3 23:31:48 2013 +0200 d3drm: Get rid of the Header typedef. --- dlls/d3drm/d3drm.c | 10 +++++----- dlls/d3drm/d3drm_private.h | 5 +++-- dlls/d3drm/meshbuilder.c | 9 +++++---- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index e1aa368..0ab62de 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1326,7 +1326,7 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3 *iface, void *source, v HRESULT hr; const GUID* pGuid; DWORD size; - Header* pHeader; + struct d3drm_file_header *header; HRESULT ret = D3DRMERR_BADOBJECT; DWORD i; @@ -1382,14 +1382,14 @@ static HRESULT WINAPI IDirect3DRM3Impl_Load(IDirect3DRM3 *iface, void *source, v goto end; } - hr = IDirectXFileData_GetData(data, NULL, &size, (void **)&pHeader); - if ((hr != DXFILE_OK) || (size != sizeof(Header))) + hr = IDirectXFileData_GetData(data, NULL, &size, (void **)&header); + if ((hr != DXFILE_OK) || (size != sizeof(*header))) goto end; - TRACE("Version is %d %d %d\n", pHeader->major, pHeader->minor, pHeader->flags); + TRACE("Version is %u.%u, flags %#x.\n", header->major, header->minor, header->flags); /* Version must be 1.0.x */ - if ((pHeader->major != 1) || (pHeader->minor != 0)) + if ((header->major != 1) || (header->minor != 0)) { ret = D3DRMERR_BADFILE; goto end; diff --git a/dlls/d3drm/d3drm_private.h b/dlls/d3drm/d3drm_private.h index d1f30be..3daf96a 100644 --- a/dlls/d3drm/d3drm_private.h +++ b/dlls/d3drm/d3drm_private.h @@ -37,11 +37,12 @@ HRESULT Direct3DRMTexture_create(REFIID riid, IUnknown** ret_iface) DECLSPEC_HID HRESULT load_mesh_data(IDirect3DRMMeshBuilder3 *iface, IDirectXFileData *data, D3DRMLOADTEXTURECALLBACK load_texture_proc, void *arg) DECLSPEC_HIDDEN; -typedef struct { +struct d3drm_file_header +{ WORD major; WORD minor; DWORD flags; -} Header; +}; extern char templates[]; diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index c198531..0262284 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1521,11 +1521,12 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_Load(IDirect3DRMMeshBuilder3* IDirectXFileData *data = NULL; const GUID* guid; DWORD size; - Header* header; + struct d3drm_file_header *header; HRESULT hr; HRESULT ret = D3DRMERR_BADOBJECT; - TRACE("(%p)->(%p,%p,%x,%p,%p)\n", This, filename, name, loadflags, cb, arg); + TRACE("iface %p, filename %p, name %p, loadflags %#x, cb %p, arg %p.\n", + iface, filename, name, loadflags, cb, arg); clean_mesh_builder_data(This); @@ -1573,10 +1574,10 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder3Impl_Load(IDirect3DRMMeshBuilder3* } hr = IDirectXFileData_GetData(data, NULL, &size, (void**)&header); - if ((hr != DXFILE_OK) || (size != sizeof(Header))) + if ((hr != DXFILE_OK) || (size != sizeof(*header))) goto end; - TRACE("Version is %d %d %d\n", header->major, header->minor, header->flags); + TRACE("Version is %u.%u, flags %#x.\n", header->major, header->minor, header->flags); /* Version must be 1.0.x */ if ((header->major != 1) || (header->minor != 0))

1 0

Henri Verbeet : d3dcompiler: Get rid of the BWRITERDECLUSAGE typedef.
by Alexandre Julliard 04 Oct '13

04 Oct '13

Module: wine Branch: master Commit: cc3cde5124bd4ebdced8ae2c849cf71db4adda57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cc3cde5124bd4ebdced8ae2c8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 3 23:31:47 2013 +0200 d3dcompiler: Get rid of the BWRITERDECLUSAGE typedef. --- dlls/d3dcompiler_43/d3dcompiler_private.h | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/d3dcompiler_private.h b/dlls/d3dcompiler_43/d3dcompiler_private.h index 7900858..1be52bc 100644 --- a/dlls/d3dcompiler_43/d3dcompiler_private.h +++ b/dlls/d3dcompiler_43/d3dcompiler_private.h @@ -568,7 +568,8 @@ enum bwritershader_param_srcmod_type #define BWRITERVS_SWIZZLE_Z (BWRITERVS_X_Z | BWRITERVS_Y_Z | BWRITERVS_Z_Z | BWRITERVS_W_Z) #define BWRITERVS_SWIZZLE_W (BWRITERVS_X_W | BWRITERVS_Y_W | BWRITERVS_Z_W | BWRITERVS_W_W) -typedef enum _BWRITERDECLUSAGE { +enum bwriterdeclusage +{ BWRITERDECLUSAGE_POSITION, BWRITERDECLUSAGE_BLENDWEIGHT, BWRITERDECLUSAGE_BLENDINDICES, @@ -583,7 +584,7 @@ typedef enum _BWRITERDECLUSAGE { BWRITERDECLUSAGE_FOG, BWRITERDECLUSAGE_DEPTH, BWRITERDECLUSAGE_SAMPLE -} BWRITERDECLUSAGE; +}; /* ps 1.x texture registers mappings */ #define T0_REG 2

1 0

Henri Verbeet : wined3d: Send pixel shader binding updates through the command stream.
by Alexandre Julliard 04 Oct '13

04 Oct '13

Module: wine Branch: master Commit: 82cf8b2066f1e1eef1603fa35895c29570b0f0ae URL: http://source.winehq.org/git/wine.git/?a=commit;h=82cf8b2066f1e1eef1603fa35… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 3 23:31:46 2013 +0200 wined3d: Send pixel shader binding updates through the command stream. --- dlls/wined3d/cs.c | 21 +++++++++++++++++++++ dlls/wined3d/device.c | 22 +++++++--------------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 29 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index e49ce3a..7f54ac9 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -40,6 +40,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_TEXTURE, WINED3D_CS_OP_SET_VERTEX_SHADER, WINED3D_CS_OP_SET_GEOMETRY_SHADER, + WINED3D_CS_OP_SET_PIXEL_SHADER, }; struct wined3d_cs_present @@ -551,6 +552,25 @@ void wined3d_cs_emit_set_geometry_shader(struct wined3d_cs *cs, struct wined3d_s cs->ops->submit(cs); } +static void wined3d_cs_exec_set_pixel_shader(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_shader *op = data; + + cs->state.pixel_shader = op->shader; + device_invalidate_state(cs->device, STATE_PIXELSHADER); +} + +void wined3d_cs_emit_set_pixel_shader(struct wined3d_cs *cs, struct wined3d_shader *shader) +{ + struct wined3d_cs_set_shader *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_PIXEL_SHADER; + op->shader = shader; + + cs->ops->submit(cs); +} + static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, @@ -567,6 +587,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_SET_TEXTURE */ wined3d_cs_exec_set_texture, /* WINED3D_CS_OP_SET_VERTEX_SHADER */ wined3d_cs_exec_set_vertex_shader, /* WINED3D_CS_OP_SET_GEOMETRY_SHADER */ wined3d_cs_exec_set_geometry_shader, + /* WINED3D_CS_OP_SET_PIXEL_SHADER */ wined3d_cs_exec_set_pixel_shader, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b2f10cf..49f39d7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2345,27 +2345,19 @@ void CDECL wined3d_device_set_pixel_shader(struct wined3d_device *device, struct TRACE("device %p, shader %p.\n", device, shader); - if (shader) - wined3d_shader_incref(shader); - if (prev) - wined3d_shader_decref(prev); - - device->update_state->pixel_shader = shader; - if (device->recording) - { - TRACE("Recording... not performing anything.\n"); device->recording->changed.pixelShader = TRUE; - return; - } if (shader == prev) - { - TRACE("Application is setting the old shader over, nothing to do.\n"); return; - } - device_invalidate_state(device, STATE_PIXELSHADER); + if (shader) + wined3d_shader_incref(shader); + device->update_state->pixel_shader = shader; + if (!device->recording) + wined3d_cs_emit_set_pixel_shader(device->cs, shader); + if (prev) + wined3d_shader_decref(prev); } struct wined3d_shader * CDECL wined3d_device_get_pixel_shader(const struct wined3d_device *device) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 545c8d3..a1112ef 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2490,6 +2490,7 @@ void wined3d_cs_emit_set_depth_stencil(struct wined3d_cs *cs, struct wined3d_sur void wined3d_cs_emit_set_geometry_shader(struct wined3d_cs *cs, struct wined3d_shader *shader) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_index_buffer(struct wined3d_cs *cs, struct wined3d_buffer *buffer, enum wined3d_format_id format_id) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_pixel_shader(struct wined3d_cs *cs, struct wined3d_shader *shader) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_render_target(struct wined3d_cs *cs, UINT render_target_idx, struct wined3d_surface *render_target) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_scissor_rect(struct wined3d_cs *cs, const RECT *rect) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Send geometry shader binding updates through the command stream.
by Alexandre Julliard 04 Oct '13

04 Oct '13

Module: wine Branch: master Commit: 819e9dda28abb33a09b9ffcf0a23760539e2f3a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=819e9dda28abb33a09b9ffcf0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 3 23:31:45 2013 +0200 wined3d: Send geometry shader binding updates through the command stream. --- dlls/wined3d/cs.c | 21 +++++++++++++++++++++ dlls/wined3d/device.c | 11 ++++------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 26 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 44a8285d..e49ce3a 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -39,6 +39,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_INDEX_BUFFER, WINED3D_CS_OP_SET_TEXTURE, WINED3D_CS_OP_SET_VERTEX_SHADER, + WINED3D_CS_OP_SET_GEOMETRY_SHADER, }; struct wined3d_cs_present @@ -531,6 +532,25 @@ void wined3d_cs_emit_set_vertex_shader(struct wined3d_cs *cs, struct wined3d_sha cs->ops->submit(cs); } +static void wined3d_cs_exec_set_geometry_shader(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_shader *op = data; + + cs->state.geometry_shader = op->shader; + device_invalidate_state(cs->device, STATE_GEOMETRY_SHADER); +} + +void wined3d_cs_emit_set_geometry_shader(struct wined3d_cs *cs, struct wined3d_shader *shader) +{ + struct wined3d_cs_set_shader *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_GEOMETRY_SHADER; + op->shader = shader; + + cs->ops->submit(cs); +} + static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, @@ -546,6 +566,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_SET_INDEX_BUFFER */ wined3d_cs_exec_set_index_buffer, /* WINED3D_CS_OP_SET_TEXTURE */ wined3d_cs_exec_set_texture, /* WINED3D_CS_OP_SET_VERTEX_SHADER */ wined3d_cs_exec_set_vertex_shader, + /* WINED3D_CS_OP_SET_GEOMETRY_SHADER */ wined3d_cs_exec_set_geometry_shader, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 77bd452..b2f10cf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2611,17 +2611,14 @@ void CDECL wined3d_device_set_geometry_shader(struct wined3d_device *device, str TRACE("device %p, shader %p.\n", device, shader); + if (device->recording || shader == prev) + return; if (shader) wined3d_shader_incref(shader); + device->update_state->geometry_shader = shader; + wined3d_cs_emit_set_geometry_shader(device->cs, shader); if (prev) wined3d_shader_decref(prev); - - device->update_state->geometry_shader = shader; - - if (device->recording || shader == prev) - return; - - device_invalidate_state(device, STATE_GEOMETRY_SHADER); } struct wined3d_shader * CDECL wined3d_device_get_geometry_shader(const struct wined3d_device *device) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 13a3aa2..545c8d3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2487,6 +2487,7 @@ void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *sw const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, const RGNDATA *dirty_region, DWORD flags) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_depth_stencil(struct wined3d_cs *cs, struct wined3d_surface *depth_stencil) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_geometry_shader(struct wined3d_cs *cs, struct wined3d_shader *shader) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_index_buffer(struct wined3d_cs *cs, struct wined3d_buffer *buffer, enum wined3d_format_id format_id) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_render_target(struct wined3d_cs *cs, UINT render_target_idx,

1 0

Henri Verbeet : wined3d: Send vertex shader binding updates through the command stream.
by Alexandre Julliard 04 Oct '13

04 Oct '13

Module: wine Branch: master Commit: 368fcab2e8ae2c6188a62bcea4cb3e505140b381 URL: http://source.winehq.org/git/wine.git/?a=commit;h=368fcab2e8ae2c6188a62bcea… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 3 23:31:44 2013 +0200 wined3d: Send vertex shader binding updates through the command stream. --- dlls/wined3d/cs.c | 27 +++++++++++++++++++++++++++ dlls/wined3d/device.c | 22 +++++++--------------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 35 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index e4ec0e8..44a8285d 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -38,6 +38,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_STREAM_SOURCE_FREQ, WINED3D_CS_OP_SET_INDEX_BUFFER, WINED3D_CS_OP_SET_TEXTURE, + WINED3D_CS_OP_SET_VERTEX_SHADER, }; struct wined3d_cs_present @@ -134,6 +135,12 @@ struct wined3d_cs_set_texture struct wined3d_texture *texture; }; +struct wined3d_cs_set_shader +{ + enum wined3d_cs_op opcode; + struct wined3d_shader *shader; +}; + static void wined3d_cs_exec_present(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_present *op = data; @@ -505,6 +512,25 @@ void wined3d_cs_emit_set_texture(struct wined3d_cs *cs, UINT stage, struct wined cs->ops->submit(cs); } +static void wined3d_cs_exec_set_vertex_shader(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_shader *op = data; + + cs->state.vertex_shader = op->shader; + device_invalidate_state(cs->device, STATE_VSHADER); +} + +void wined3d_cs_emit_set_vertex_shader(struct wined3d_cs *cs, struct wined3d_shader *shader) +{ + struct wined3d_cs_set_shader *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_VERTEX_SHADER; + op->shader = shader; + + cs->ops->submit(cs); +} + static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void *data) = { /* WINED3D_CS_OP_PRESENT */ wined3d_cs_exec_present, @@ -519,6 +545,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_SET_STREAM_SOURCE_FREQ */ wined3d_cs_exec_set_stream_source_freq, /* WINED3D_CS_OP_SET_INDEX_BUFFER */ wined3d_cs_exec_set_index_buffer, /* WINED3D_CS_OP_SET_TEXTURE */ wined3d_cs_exec_set_texture, + /* WINED3D_CS_OP_SET_VERTEX_SHADER */ wined3d_cs_exec_set_vertex_shader, }; static void *wined3d_cs_st_require_space(struct wined3d_cs *cs, size_t size) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 0c2f3e8..77bd452 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2077,27 +2077,19 @@ void CDECL wined3d_device_set_vertex_shader(struct wined3d_device *device, struc TRACE("device %p, shader %p.\n", device, shader); - if (shader) - wined3d_shader_incref(shader); - if (prev) - wined3d_shader_decref(prev); - - device->update_state->vertex_shader = shader; - if (device->recording) - { - TRACE("Recording... not performing anything.\n"); device->recording->changed.vertexShader = TRUE; - return; - } if (shader == prev) - { - TRACE("Application is setting the old shader over, nothing to do.\n"); return; - } - device_invalidate_state(device, STATE_VSHADER); + if (shader) + wined3d_shader_incref(shader); + device->update_state->vertex_shader = shader; + if (!device->recording) + wined3d_cs_emit_set_vertex_shader(device->cs, shader); + if (prev) + wined3d_shader_decref(prev); } struct wined3d_shader * CDECL wined3d_device_get_vertex_shader(const struct wined3d_device *device) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6cde5b0..13a3aa2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2499,6 +2499,7 @@ void wined3d_cs_emit_set_stream_source_freq(struct wined3d_cs *cs, UINT stream_i void wined3d_cs_emit_set_texture(struct wined3d_cs *cs, UINT stage, struct wined3d_texture *texture) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_vertex_declaration(struct wined3d_cs *cs, struct wined3d_vertex_declaration *declaration) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_vertex_shader(struct wined3d_cs *cs, struct wined3d_shader *shader) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_viewport(struct wined3d_cs *cs, const struct wined3d_viewport *viewport) DECLSPEC_HIDDEN; /* Direct3D terminology with little modifications. We do not have an issued state

1 0

Alexandre Julliard : configure: Use the correct strip program when installing.
by Alexandre Julliard 03 Oct '13

03 Oct '13

Module: wine Branch: master Commit: 4732b2f4ea6f550d6c942161972573ca5ace7629 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4732b2f4ea6f550d6c9421619… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Oct 3 21:35:33 2013 +0200 configure: Use the correct strip program when installing. --- Make.vars.in | 1 + configure | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 4 ++ 3 files changed, 100 insertions(+), 0 deletions(-) diff --git a/Make.vars.in b/Make.vars.in index ea3869d..d10e70e 100644 --- a/Make.vars.in +++ b/Make.vars.in @@ -39,6 +39,7 @@ DLLTOOL = @DLLTOOL@ AR = @AR@ ARFLAGS = @ARFLAGS@ RANLIB = @RANLIB@ +STRIP = @STRIP@ LN_S = @LN_S@ TOOLSDIR = @TOOLSDIR@ LDFLAGS = @LDFLAGS@ diff --git a/configure b/configure index e0e3320..4154b43 100755 --- a/configure +++ b/configure @@ -737,6 +737,7 @@ GREP LN_S RANLIB ARFLAGS +STRIP ac_ct_AR AR BISON @@ -4544,6 +4545,98 @@ esac fi fi +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5 +$as_echo "$STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +set dummy strip; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_STRIP+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_STRIP="strip" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5 +$as_echo "$ac_ct_STRIP" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_STRIP" = x; then + STRIP="strip" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi +else + STRIP="$ac_cv_prog_STRIP" +fi + ARFLAGS=rc if test -n "$ac_tool_prefix"; then @@ -4820,6 +4913,8 @@ $as_echo "no" >&6; } fi + +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM="env STRIPPROG=\"\$(STRIP)\" \$(top_srcdir)/tools/install-sh" # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: diff --git a/configure.ac b/configure.ac index 00dc50d..708197a 100644 --- a/configure.ac +++ b/configure.ac @@ -257,11 +257,15 @@ then fi AC_CHECK_TOOLS(AR,[ar gar],ar) +AC_CHECK_TOOL(STRIP,strip,strip) AC_SUBST(ARFLAGS,rc) AC_PROG_RANLIB AC_PROG_LN_S AC_PROG_EGREP AC_PATH_PROG(LDCONFIG, ldconfig, true, [/sbin /usr/sbin $PATH]) + +dnl Use the correct strip to install programs +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM="env STRIPPROG=\"\$(STRIP)\" \$(top_srcdir)/tools/install-sh" AC_PROG_INSTALL dnl Prepend src dir to install path dir if it's a relative path case "$INSTALL" in

1 0

← Newer
1
...
64
65
66
67
68
69
70
...
76
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2013