October 2013 - Wine-commits

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

11 Oct '13

Module: wine Branch: master Commit: 8e7abd00a85cc89d890878a447be0ae885d1ac52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e7abd00a85cc89d890878a44… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Oct 10 21:52:41 2013 +0200 comdlg32: Use BOOL type where appropriate. --- dlls/comdlg32/filedlg.c | 23 ++++++++++------------- 1 files changed, 10 insertions(+), 13 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index c08e8d4..850edad 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -1431,9 +1431,9 @@ static inline BOOL filename_is_edit( const FileOpenDlgInfos *info ) */ static LRESULT FILEDLG95_InitControls(HWND hwnd) { - int win2000plus = 0; - int win98plus = 0; - int handledPath = FALSE; + BOOL win2000plus = FALSE; + BOOL win98plus = FALSE; + BOOL handledPath = FALSE; OSVERSIONINFOW osVi; static const WCHAR szwSlash[] = { '\\', 0 }; static const WCHAR szwStar[] = { '*',0 }; @@ -1584,12 +1584,11 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) } /* 2. (All platforms) If initdir is not null, then use it */ - if ((handledPath == FALSE) && (fodInfos->initdir!=NULL) && - (*fodInfos->initdir!=0x00)) + if (!handledPath && fodInfos->initdir && *fodInfos->initdir) { /* Work out the proper path as supplied one might be relative */ /* (Here because supplying '.' as dir browses to My Computer) */ - if (handledPath==FALSE) { + if (!handledPath) { WCHAR tmpBuf[MAX_PATH]; WCHAR tmpBuf2[MAX_PATH]; WCHAR *nameBit; @@ -1624,8 +1623,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) } } - if ((handledPath == FALSE) && ((fodInfos->initdir==NULL) || - (*fodInfos->initdir==0x00))) + if (!handledPath && (!fodInfos->initdir || !*fodInfos->initdir)) { /* 3. All except w2k+: if filename contains a path use it */ if (!win2000plus && fodInfos->filename && @@ -1657,7 +1655,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) } /* 4. Win2000+: Recently used */ - if (handledPath == FALSE && win2000plus) { + if (!handledPath && win2000plus) { fodInfos->initdir = MemAlloc(MAX_PATH * sizeof(WCHAR)); fodInfos->initdir[0] = '\0'; @@ -1673,8 +1671,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) /* 5. win98+ and win2000+ if any files of specified filter types in current directory, use it */ - if ( win98plus && handledPath == FALSE && - fodInfos->filter && *fodInfos->filter) { + if (win98plus && !handledPath && fodInfos->filter && *fodInfos->filter) { LPCWSTR lpstrPos = fodInfos->filter; WIN32_FIND_DATAW FindFileData; @@ -1713,7 +1710,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) } /* 6. Win98+ and 2000+: Use personal files dir, others use current dir */ - if (handledPath == FALSE && (win2000plus || win98plus)) { + if (!handledPath && (win2000plus || win98plus)) { fodInfos->initdir = MemAlloc(MAX_PATH*sizeof(WCHAR)); if(!COMDLG32_SHGetFolderPathW(hwnd, CSIDL_PERSONAL, 0, 0, fodInfos->initdir)) @@ -1730,7 +1727,7 @@ static LRESULT FILEDLG95_InitControls(HWND hwnd) TRACE("No initial dir specified, using personal files dir of %s\n", debugstr_w(fodInfos->initdir)); } handledPath = TRUE; - } else if (handledPath==FALSE) { + } else if (!handledPath) { fodInfos->initdir = MemAlloc(MAX_PATH*sizeof(WCHAR)); GetCurrentDirectoryW(MAX_PATH, fodInfos->initdir); handledPath = TRUE;

1 0

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

11 Oct '13

Module: wine Branch: master Commit: afc0803df728e588f3f97898aee7f9e7b762467b URL: http://source.winehq.org/git/wine.git/?a=commit;h=afc0803df728e588f3f97898a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Oct 10 21:52:43 2013 +0200 winegstreamer: Use BOOL type where appropriate. --- dlls/winegstreamer/gsttffilter.c | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/dlls/winegstreamer/gsttffilter.c b/dlls/winegstreamer/gsttffilter.c index 575d6e3..28f5d5d 100644 --- a/dlls/winegstreamer/gsttffilter.c +++ b/dlls/winegstreamer/gsttffilter.c @@ -291,7 +291,8 @@ static void Gstreamer_transform_pad_added(GstElement *filter, GstPad *pad, GstTf static HRESULT Gstreamer_transform_ConnectInput(GstTfImpl *This, const AM_MEDIA_TYPE *amt, GstCaps *capsin, GstCaps *capsout) { GstIterator *it; - int done = 0, found = 0, ret; + BOOL done = FALSE, found = FALSE; + int ret; This->filter = gst_element_factory_make(This->gstreamer_name, NULL); if (!This->filter) { @@ -330,7 +331,7 @@ static HRESULT Gstreamer_transform_ConnectInput(GstTfImpl *This, const AM_MEDIA_ This->their_sink = item; case GST_ITERATOR_ERROR: case GST_ITERATOR_DONE: - done = 1; + done = TRUE; break; } } @@ -342,7 +343,7 @@ static HRESULT Gstreamer_transform_ConnectInput(GstTfImpl *This, const AM_MEDIA_ it = gst_element_iterate_src_pads(This->filter); gst_iterator_resync(it); - done = 0; + done = FALSE; while (!done) { gpointer item; @@ -354,7 +355,7 @@ static HRESULT Gstreamer_transform_ConnectInput(GstTfImpl *This, const AM_MEDIA_ This->their_src = item; case GST_ITERATOR_ERROR: case GST_ITERATOR_DONE: - done = 1; + done = TRUE; break; } } @@ -733,7 +734,8 @@ static HRESULT WINAPI Gstreamer_AudioConvert_SetMediaType(TransformFilter *tf, P WAVEFORMATEX *outwfe; WAVEFORMATEXTENSIBLE *outwfx; HRESULT hr; - int inisfloat = 0, indepth; + BOOL inisfloat = FALSE; + int indepth; if (dir != PINDIR_INPUT) return S_OK;

1 0

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

11 Oct '13

Module: wine Branch: master Commit: f6677602e32db5bca9a4ce57acb0af2995e1ccf8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6677602e32db5bca9a4ce57a… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Oct 10 21:52:44 2013 +0200 msvcrt: Use BOOL type where appropriate. --- dlls/msvcrt/time.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 4c21380..e227b84 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -41,7 +41,7 @@ static const int MonthLengths[2][12] = { 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 } }; -static inline int IsLeapYear(int Year) +static inline BOOL IsLeapYear(int Year) { return Year % 4 == 0 && (Year % 100 != 0 || Year % 400 == 0); }

1 0

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

11 Oct '13

Module: wine Branch: master Commit: d12c0d67ae652023b0f8fe1889c0612c2e6fc79f URL: http://source.winehq.org/git/wine.git/?a=commit;h=d12c0d67ae652023b0f8fe188… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Oct 10 21:52:45 2013 +0200 comctl32: Use BOOL type where appropriate. --- dlls/comctl32/commctrl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c index f08288d..d2ad28f 100644 --- a/dlls/comctl32/commctrl.c +++ b/dlls/comctl32/commctrl.c @@ -1541,7 +1541,7 @@ BOOL WINAPI MirrorIcon(HICON *phicon1, HICON *phicon2) return FALSE; } -static inline int IsDelimiter(WCHAR c) +static inline BOOL IsDelimiter(WCHAR c) { switch(c) {

1 0

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

11 Oct '13

Module: wine Branch: master Commit: bd961941e0b0edcf54ed51ca90fe475f0e447e97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd961941e0b0edcf54ed51ca9… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Oct 10 21:52:46 2013 +0200 quartz: Use BOOL type where appropriate. --- dlls/quartz/filtergraph.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 0bfef6d..862a0c4 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -117,7 +117,7 @@ static int EventsQueue_PutEvent(EventsQueue* omr, const Event* evt) return TRUE; } -static int EventsQueue_GetEvent(EventsQueue* omr, Event* evt, LONG msTimeOut) +static BOOL EventsQueue_GetEvent(EventsQueue* omr, Event* evt, LONG msTimeOut) { if (WaitForSingleObject(omr->msg_event, msTimeOut) != WAIT_OBJECT_0) return FALSE; @@ -377,7 +377,7 @@ static HRESULT WINAPI FilterGraph2_AddFilter(IFilterGraph2 *iface, IBaseFilter * HRESULT hr; int i,j; WCHAR* wszFilterName = NULL; - int duplicate_name = FALSE; + BOOL duplicate_name = FALSE; TRACE("(%p/%p)->(%p, %s (%p))\n", This, iface, pFilter, debugstr_w(pName), pName); @@ -490,7 +490,7 @@ static HRESULT WINAPI FilterGraph2_RemoveFilter(IFilterGraph2 *iface, IBaseFilte if (This->defaultclock && This->refClockProvider == pFilter) { IMediaFilter_SetSyncSource(&This->IMediaFilter_iface, NULL); - This->defaultclock = 1; + This->defaultclock = TRUE; } TRACE("Removing filter %s\n", debugstr_w(This->pFilterNames[i])); @@ -1502,7 +1502,7 @@ static HRESULT WINAPI FilterGraph2_RenderFile(IFilterGraph2 *iface, LPCWSTR lpcw IEnumPins* penumpins = NULL; HRESULT hr; BOOL partial = FALSE; - HRESULT any = FALSE; + BOOL any = FALSE; TRACE("(%p/%p)->(%s, %s)\n", This, iface, debugstr_w(lpcwstrFile), debugstr_w(lpcwstrPlayList));

1 0

Henri Verbeet : wined3d: Send constant buffer binding updates through the command stream.
by Alexandre Julliard 11 Oct '13

11 Oct '13

Module: wine Branch: master Commit: 738de80d0cbf5e284f2592b59f5c6cbbe817d140 URL: http://source.winehq.org/git/wine.git/?a=commit;h=738de80d0cbf5e284f2592b59… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 10 23:49:44 2013 +0200 wined3d: Send constant buffer binding updates through the command stream. --- dlls/wined3d/cs.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 30 ++++++++---------------------- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 48 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 12ab60e..7b33164 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -37,6 +37,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_STREAM_SOURCE, WINED3D_CS_OP_SET_STREAM_SOURCE_FREQ, WINED3D_CS_OP_SET_INDEX_BUFFER, + WINED3D_CS_OP_SET_CONSTANT_BUFFER, WINED3D_CS_OP_SET_TEXTURE, WINED3D_CS_OP_SET_SHADER, WINED3D_CS_OP_SET_RENDER_STATE, @@ -134,6 +135,14 @@ struct wined3d_cs_set_index_buffer enum wined3d_format_id format_id; }; +struct wined3d_cs_set_constant_buffer +{ + enum wined3d_cs_op opcode; + enum wined3d_shader_type type; + UINT cb_idx; + struct wined3d_buffer *buffer; +}; + struct wined3d_cs_set_texture { enum wined3d_cs_op opcode; @@ -493,6 +502,34 @@ void wined3d_cs_emit_set_index_buffer(struct wined3d_cs *cs, struct wined3d_buff cs->ops->submit(cs); } +static void wined3d_cs_exec_set_constant_buffer(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_constant_buffer *op = data; + struct wined3d_buffer *prev; + + prev = cs->state.cb[op->type][op->cb_idx]; + cs->state.cb[op->type][op->cb_idx] = op->buffer; + + if (op->buffer) + InterlockedIncrement(&op->buffer->resource.bind_count); + if (prev) + InterlockedDecrement(&prev->resource.bind_count); +} + +void wined3d_cs_emit_set_constant_buffer(struct wined3d_cs *cs, enum wined3d_shader_type type, + UINT cb_idx, struct wined3d_buffer *buffer) +{ + struct wined3d_cs_set_constant_buffer *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_CONSTANT_BUFFER; + op->type = type; + op->cb_idx = cb_idx; + op->buffer = buffer; + + cs->ops->submit(cs); +} + static void wined3d_cs_exec_set_texture(struct wined3d_cs *cs, const void *data) { const struct wined3d_d3d_info *d3d_info = &cs->device->adapter->d3d_info; @@ -720,6 +757,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_SET_STREAM_SOURCE */ wined3d_cs_exec_set_stream_source, /* 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_CONSTANT_BUFFER */ wined3d_cs_exec_set_constant_buffer, /* WINED3D_CS_OP_SET_TEXTURE */ wined3d_cs_exec_set_texture, /* WINED3D_CS_OP_SET_SHADER */ wined3d_cs_exec_set_shader, /* WINED3D_CS_OP_SET_RENDER_STATE */ wined3d_cs_exec_set_render_state, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 93aef9f..3fb11a8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2098,30 +2098,16 @@ static void wined3d_device_set_constant_buffer(struct wined3d_device *device, } prev = device->update_state->cb[type][idx]; - device->update_state->cb[type][idx] = buffer; - - if (device->recording) - { - if (buffer) - wined3d_buffer_incref(buffer); - if (prev) - wined3d_buffer_decref(prev); + if (buffer == prev) return; - } - if (prev != buffer) - { - if (buffer) - { - InterlockedIncrement(&buffer->resource.bind_count); - wined3d_buffer_incref(buffer); - } - if (prev) - { - InterlockedDecrement(&prev->resource.bind_count); - wined3d_buffer_decref(prev); - } - } + if (buffer) + wined3d_buffer_incref(buffer); + device->update_state->cb[type][idx] = buffer; + if (!device->recording) + wined3d_cs_emit_set_constant_buffer(device->cs, type, idx, buffer); + if (prev) + wined3d_buffer_decref(prev); } void CDECL wined3d_device_set_vs_cb(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bfd9995..890f1a8 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2475,6 +2475,8 @@ void wined3d_cs_emit_present(struct wined3d_cs *cs, struct wined3d_swapchain *sw const RGNDATA *dirty_region, DWORD flags) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_clip_plane(struct wined3d_cs *cs, UINT plane_idx, const struct wined3d_vec4 *plane) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_constant_buffer(struct wined3d_cs *cs, enum wined3d_shader_type type, + UINT cb_idx, struct wined3d_buffer *buffer) 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_index_buffer(struct wined3d_cs *cs, struct wined3d_buffer *buffer, enum wined3d_format_id format_id) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Send sampler binding updates through the command stream.
by Alexandre Julliard 11 Oct '13

11 Oct '13

Module: wine Branch: master Commit: f699b6da0bb83c00026208bef5a1eb086bc993c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f699b6da0bb83c00026208bef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 10 23:49:45 2013 +0200 wined3d: Send sampler binding updates through the command stream. --- dlls/wined3d/cs.c | 31 +++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 6 +++++- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 38 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 7b33164..bf682e5 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_CONSTANT_BUFFER, WINED3D_CS_OP_SET_TEXTURE, + WINED3D_CS_OP_SET_SAMPLER, WINED3D_CS_OP_SET_SHADER, WINED3D_CS_OP_SET_RENDER_STATE, WINED3D_CS_OP_SET_TEXTURE_STATE, @@ -150,6 +151,14 @@ struct wined3d_cs_set_texture struct wined3d_texture *texture; }; +struct wined3d_cs_set_sampler +{ + enum wined3d_cs_op opcode; + enum wined3d_shader_type type; + UINT sampler_idx; + struct wined3d_sampler *sampler; +}; + struct wined3d_cs_set_shader { enum wined3d_cs_op opcode; @@ -599,6 +608,27 @@ void wined3d_cs_emit_set_texture(struct wined3d_cs *cs, UINT stage, struct wined cs->ops->submit(cs); } +static void wined3d_cs_exec_set_sampler(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_sampler *op = data; + + cs->state.sampler[op->type][op->sampler_idx] = op->sampler; +} + +void wined3d_cs_emit_set_sampler(struct wined3d_cs *cs, enum wined3d_shader_type type, + UINT sampler_idx, struct wined3d_sampler *sampler) +{ + struct wined3d_cs_set_sampler *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_SAMPLER; + op->type = type; + op->sampler_idx = sampler_idx; + op->sampler = sampler; + + cs->ops->submit(cs); +} + static void wined3d_cs_exec_set_shader(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_set_shader *op = data; @@ -759,6 +789,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_CONSTANT_BUFFER */ wined3d_cs_exec_set_constant_buffer, /* WINED3D_CS_OP_SET_TEXTURE */ wined3d_cs_exec_set_texture, + /* WINED3D_CS_OP_SET_SAMPLER */ wined3d_cs_exec_set_sampler, /* WINED3D_CS_OP_SET_SHADER */ wined3d_cs_exec_set_shader, /* WINED3D_CS_OP_SET_RENDER_STATE */ wined3d_cs_exec_set_render_state, /* WINED3D_CS_OP_SET_TEXTURE_STATE */ wined3d_cs_exec_set_texture_state, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3fb11a8..cafb539 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2142,10 +2142,14 @@ static void wined3d_device_set_sampler(struct wined3d_device *device, } prev = device->update_state->sampler[type][idx]; - device->update_state->sampler[type][idx] = sampler; + if (sampler == prev) + return; if (sampler) wined3d_sampler_incref(sampler); + device->update_state->sampler[type][idx] = sampler; + if (!device->recording) + wined3d_cs_emit_set_sampler(device->cs, type, idx, sampler); if (prev) wined3d_sampler_decref(prev); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 890f1a8..7d160eb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2485,6 +2485,8 @@ void wined3d_cs_emit_set_render_state(struct wined3d_cs *cs, enum wined3d_render_state state, DWORD value) 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_sampler(struct wined3d_cs *cs, enum wined3d_shader_type type, + UINT sampler_idx, struct wined3d_sampler *sampler) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_sampler_state(struct wined3d_cs *cs, UINT sampler_idx, enum wined3d_sampler_state state, DWORD value) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_scissor_rect(struct wined3d_cs *cs, const RECT *rect) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Send stream output binding updates through the command stream.
by Alexandre Julliard 11 Oct '13

11 Oct '13

Module: wine Branch: master Commit: 1419d7389c20be9a23d9351afac27ebe4c7e5211 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1419d7389c20be9a23d9351af… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 10 23:49:46 2013 +0200 wined3d: Send stream output binding updates through the command stream. --- dlls/wined3d/cs.c | 41 ++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 38 +++++++++++------------------------- dlls/wined3d/wined3d_private.h | 2 + 3 files changed, 55 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index bf682e5..3d9a07c 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -36,6 +36,7 @@ enum wined3d_cs_op WINED3D_CS_OP_SET_VERTEX_DECLARATION, WINED3D_CS_OP_SET_STREAM_SOURCE, WINED3D_CS_OP_SET_STREAM_SOURCE_FREQ, + WINED3D_CS_OP_SET_STREAM_OUTPUT, WINED3D_CS_OP_SET_INDEX_BUFFER, WINED3D_CS_OP_SET_CONSTANT_BUFFER, WINED3D_CS_OP_SET_TEXTURE, @@ -129,6 +130,14 @@ struct wined3d_cs_set_stream_source_freq UINT flags; }; +struct wined3d_cs_set_stream_output +{ + enum wined3d_cs_op opcode; + UINT stream_idx; + struct wined3d_buffer *buffer; + UINT offset; +}; + struct wined3d_cs_set_index_buffer { enum wined3d_cs_op opcode; @@ -481,6 +490,37 @@ void wined3d_cs_emit_set_stream_source_freq(struct wined3d_cs *cs, UINT stream_i cs->ops->submit(cs); } +static void wined3d_cs_exec_set_stream_output(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_set_stream_output *op = data; + struct wined3d_stream_output *stream; + struct wined3d_buffer *prev; + + stream = &cs->state.stream_output[op->stream_idx]; + prev = stream->buffer; + stream->buffer = op->buffer; + stream->offset = op->offset; + + if (op->buffer) + InterlockedIncrement(&op->buffer->resource.bind_count); + if (prev) + InterlockedDecrement(&prev->resource.bind_count); +} + +void wined3d_cs_emit_set_stream_output(struct wined3d_cs *cs, UINT stream_idx, + struct wined3d_buffer *buffer, UINT offset) +{ + struct wined3d_cs_set_stream_output *op; + + op = cs->ops->require_space(cs, sizeof(*op)); + op->opcode = WINED3D_CS_OP_SET_STREAM_OUTPUT; + op->stream_idx = stream_idx; + op->buffer = buffer; + op->offset = offset; + + cs->ops->submit(cs); +} + static void wined3d_cs_exec_set_index_buffer(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_set_index_buffer *op = data; @@ -786,6 +826,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_SET_VERTEX_DECLARATION */ wined3d_cs_exec_set_vertex_declaration, /* WINED3D_CS_OP_SET_STREAM_SOURCE */ wined3d_cs_exec_set_stream_source, /* WINED3D_CS_OP_SET_STREAM_SOURCE_FREQ */ wined3d_cs_exec_set_stream_source_freq, + /* WINED3D_CS_OP_SET_STREAM_OUTPUT */ wined3d_cs_exec_set_stream_output, /* WINED3D_CS_OP_SET_INDEX_BUFFER */ wined3d_cs_exec_set_index_buffer, /* WINED3D_CS_OP_SET_CONSTANT_BUFFER */ wined3d_cs_exec_set_constant_buffer, /* WINED3D_CS_OP_SET_TEXTURE */ wined3d_cs_exec_set_texture, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index cafb539..8a1af6b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1145,6 +1145,7 @@ UINT CDECL wined3d_device_get_available_texture_mem(const struct wined3d_device void CDECL wined3d_device_set_stream_output(struct wined3d_device *device, UINT idx, struct wined3d_buffer *buffer, UINT offset) { + struct wined3d_stream_output *stream; struct wined3d_buffer *prev_buffer; TRACE("device %p, idx %u, buffer %p, offset %u.\n", device, idx, buffer, offset); @@ -1155,32 +1156,17 @@ void CDECL wined3d_device_set_stream_output(struct wined3d_device *device, UINT return; } - prev_buffer = device->update_state->stream_output[idx].buffer; - device->update_state->stream_output[idx].buffer = buffer; - device->update_state->stream_output[idx].offset = offset; - - if (device->recording) - { - if (buffer) - wined3d_buffer_incref(buffer); - if (prev_buffer) - wined3d_buffer_decref(prev_buffer); - return; - } + stream = &device->update_state->stream_output[idx]; + prev_buffer = stream->buffer; - if (prev_buffer != buffer) - { - if (buffer) - { - InterlockedIncrement(&buffer->resource.bind_count); - wined3d_buffer_incref(buffer); - } - if (prev_buffer) - { - InterlockedDecrement(&prev_buffer->resource.bind_count); - wined3d_buffer_decref(prev_buffer); - } - } + if (buffer) + wined3d_buffer_incref(buffer); + stream->buffer = buffer; + stream->offset = offset; + if (!device->recording) + wined3d_cs_emit_set_stream_output(device->cs, idx, buffer, offset); + if (prev_buffer) + wined3d_buffer_decref(prev_buffer); } struct wined3d_buffer * CDECL wined3d_device_get_stream_output(struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7d160eb..03c7353 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2492,6 +2492,8 @@ void wined3d_cs_emit_set_sampler_state(struct wined3d_cs *cs, UINT sampler_idx, void wined3d_cs_emit_set_scissor_rect(struct wined3d_cs *cs, const RECT *rect) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_shader(struct wined3d_cs *cs, enum wined3d_shader_type type, struct wined3d_shader *shader) DECLSPEC_HIDDEN; +void wined3d_cs_emit_set_stream_output(struct wined3d_cs *cs, UINT stream_idx, + struct wined3d_buffer *buffer, UINT offset) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_stream_source(struct wined3d_cs *cs, UINT stream_idx, struct wined3d_buffer *buffer, UINT offset, UINT stride) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_stream_source_freq(struct wined3d_cs *cs, UINT stream_idx,

1 0

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

11 Oct '13

Module: wine Branch: master Commit: 666c6b36f1a4bc7180d7a65a2b9e4ca2eda3071f URL: http://source.winehq.org/git/wine.git/?a=commit;h=666c6b36f1a4bc7180d7a65a2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 10 23:49:47 2013 +0200 d3drm: Get rid of the IDirect3DRMFrameArrayImpl typedef. --- dlls/d3drm/frame.c | 132 ++++++++++++++++++++++++--------------------------- 1 files changed, 62 insertions(+), 70 deletions(-) diff --git a/dlls/d3drm/frame.c b/dlls/d3drm/frame.c index 67ac6c5..952af42 100644 --- a/dlls/d3drm/frame.c +++ b/dlls/d3drm/frame.c @@ -58,12 +58,13 @@ struct IDirect3DRMFrameImpl { D3DCOLOR scenebackground; }; -typedef struct { +struct d3drm_frame_array +{ IDirect3DRMFrameArray IDirect3DRMFrameArray_iface; LONG ref; ULONG size; IDirect3DRMFrame **frames; -} IDirect3DRMFrameArrayImpl; +}; struct d3drm_visual_array { @@ -93,9 +94,9 @@ static inline IDirect3DRMFrameImpl *impl_from_IDirect3DRMFrame3(IDirect3DRMFrame static inline IDirect3DRMFrameImpl *unsafe_impl_from_IDirect3DRMFrame3(IDirect3DRMFrame3 *iface); -static inline IDirect3DRMFrameArrayImpl *impl_from_IDirect3DRMFrameArray(IDirect3DRMFrameArray *iface) +static inline struct d3drm_frame_array *impl_from_IDirect3DRMFrameArray(IDirect3DRMFrameArray *iface) { - return CONTAINING_RECORD(iface, IDirect3DRMFrameArrayImpl, IDirect3DRMFrameArray_iface); + return CONTAINING_RECORD(iface, struct d3drm_frame_array, IDirect3DRMFrameArray_iface); } static inline struct d3drm_visual_array *impl_from_IDirect3DRMVisualArray(IDirect3DRMVisualArray *iface) @@ -108,7 +109,7 @@ static inline struct d3drm_light_array *impl_from_IDirect3DRMLightArray(IDirect3 return CONTAINING_RECORD(iface, struct d3drm_light_array, IDirect3DRMLightArray_iface); } -static HRESULT WINAPI IDirect3DRMFrameArrayImpl_QueryInterface(IDirect3DRMFrameArray *iface, REFIID riid, void **out) +static HRESULT WINAPI d3drm_frame_array_QueryInterface(IDirect3DRMFrameArray *iface, REFIID riid, void **out) { TRACE("iface %p, riid %s, out %p.\n", iface, debugstr_guid(riid), out); @@ -126,97 +127,88 @@ static HRESULT WINAPI IDirect3DRMFrameArrayImpl_QueryInterface(IDirect3DRMFrameA return E_NOINTERFACE; } -static ULONG WINAPI IDirect3DRMFrameArrayImpl_AddRef(IDirect3DRMFrameArray* iface) +static ULONG WINAPI d3drm_frame_array_AddRef(IDirect3DRMFrameArray *iface) { - IDirect3DRMFrameArrayImpl *This = impl_from_IDirect3DRMFrameArray(iface); - ULONG ref = InterlockedIncrement(&This->ref); + struct d3drm_frame_array *array = impl_from_IDirect3DRMFrameArray(iface); + ULONG refcount = InterlockedIncrement(&array->ref); - TRACE("(%p)->(): new ref = %u\n", This, ref); + TRACE("%p increasing refcount to %u.\n", iface, refcount); - return ref; + return refcount; } -static ULONG WINAPI IDirect3DRMFrameArrayImpl_Release(IDirect3DRMFrameArray* iface) +static ULONG WINAPI d3drm_frame_array_Release(IDirect3DRMFrameArray *iface) { - IDirect3DRMFrameArrayImpl *This = impl_from_IDirect3DRMFrameArray(iface); - ULONG ref = InterlockedDecrement(&This->ref); + struct d3drm_frame_array *array = impl_from_IDirect3DRMFrameArray(iface); + ULONG refcount = InterlockedDecrement(&array->ref); ULONG i; - TRACE("(%p)->(): new ref = %u\n", This, ref); + TRACE("%p decreasing refcount to %u.\n", iface, refcount); - if (!ref) + if (!refcount) { - for (i = 0; i < This->size; i++) - IDirect3DRMFrame_Release(This->frames[i]); - HeapFree(GetProcessHeap(), 0, This->frames); - HeapFree(GetProcessHeap(), 0, This); + for (i = 0; i < array->size; ++i) + { + IDirect3DRMFrame_Release(array->frames[i]); + } + HeapFree(GetProcessHeap(), 0, array->frames); + HeapFree(GetProcessHeap(), 0, array); } - return ref; + return refcount; } -/*** IDirect3DRMArray methods ***/ -static DWORD WINAPI IDirect3DRMFrameArrayImpl_GetSize(IDirect3DRMFrameArray* iface) +static DWORD WINAPI d3drm_frame_array_GetSize(IDirect3DRMFrameArray *iface) { - IDirect3DRMFrameArrayImpl *This = impl_from_IDirect3DRMFrameArray(iface); + struct d3drm_frame_array *array = impl_from_IDirect3DRMFrameArray(iface); - TRACE("(%p)->() = %d\n", This, This->size); + TRACE("iface %p.\n", iface); - return This->size; + return array->size; } -/*** IDirect3DRMFrameArray methods ***/ -static HRESULT WINAPI IDirect3DRMFrameArrayImpl_GetElement(IDirect3DRMFrameArray *iface, +static HRESULT WINAPI d3drm_frame_array_GetElement(IDirect3DRMFrameArray *iface, DWORD index, IDirect3DRMFrame **frame) { - IDirect3DRMFrameArrayImpl *This = impl_from_IDirect3DRMFrameArray(iface); + struct d3drm_frame_array *array = impl_from_IDirect3DRMFrameArray(iface); - TRACE("(%p)->(%u, %p)\n", This, index, frame); + TRACE("iface %p, index %u, frame %p.\n", iface, index, frame); if (!frame) return D3DRMERR_BADVALUE; - *frame = NULL; - - if (index >= This->size) + if (index >= array->size) + { + *frame = NULL; return D3DRMERR_BADVALUE; + } - IDirect3DRMFrame_AddRef(This->frames[index]); - *frame = This->frames[index]; + IDirect3DRMFrame_AddRef(array->frames[index]); + *frame = array->frames[index]; return D3DRM_OK; } -static const struct IDirect3DRMFrameArrayVtbl Direct3DRMFrameArray_Vtbl = +static const struct IDirect3DRMFrameArrayVtbl d3drm_frame_array_vtbl = { - /*** IUnknown methods ***/ - IDirect3DRMFrameArrayImpl_QueryInterface, - IDirect3DRMFrameArrayImpl_AddRef, - IDirect3DRMFrameArrayImpl_Release, - /*** IDirect3DRMArray methods ***/ - IDirect3DRMFrameArrayImpl_GetSize, - /*** IDirect3DRMFrameArray methods ***/ - IDirect3DRMFrameArrayImpl_GetElement + d3drm_frame_array_QueryInterface, + d3drm_frame_array_AddRef, + d3drm_frame_array_Release, + d3drm_frame_array_GetSize, + d3drm_frame_array_GetElement, }; -static HRESULT Direct3DRMFrameArray_create(IDirect3DRMFrameArray** obj) +static struct d3drm_frame_array *d3drm_frame_array_create(void) { - IDirect3DRMFrameArrayImpl* object; - - TRACE("(%p)\n", obj); - - *obj = NULL; - - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirect3DRMFrameArrayImpl)); - if (!object) - return E_OUTOFMEMORY; + struct d3drm_frame_array *array; - object->IDirect3DRMFrameArray_iface.lpVtbl = &Direct3DRMFrameArray_Vtbl; - object->ref = 1; + if (!(array = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*array)))) + return NULL; - *obj = &object->IDirect3DRMFrameArray_iface; + array->IDirect3DRMFrameArray_iface.lpVtbl = &d3drm_frame_array_vtbl; + array->ref = 1; - return S_OK; + return array; } static HRESULT WINAPI d3drm_visual_array_QueryInterface(IDirect3DRMVisualArray *iface, REFIID riid, void **out) @@ -1614,31 +1606,31 @@ static HRESULT WINAPI IDirect3DRMFrame3Impl_AddVisual(IDirect3DRMFrame3 *iface, static HRESULT WINAPI IDirect3DRMFrame3Impl_GetChildren(IDirect3DRMFrame3 *iface, IDirect3DRMFrameArray **children) { IDirect3DRMFrameImpl *This = impl_from_IDirect3DRMFrame3(iface); - IDirect3DRMFrameArrayImpl* obj; - HRESULT hr; + struct d3drm_frame_array *array; - TRACE("(%p/%p)->(%p)\n", iface, This, children); + TRACE("iface %p, children %p.\n", iface, children); if (!children) return D3DRMERR_BADVALUE; - hr = Direct3DRMFrameArray_create(children); - - if (hr != D3DRM_OK) - return hr; - - obj = (IDirect3DRMFrameArrayImpl*)*children; + if (!(array = d3drm_frame_array_create())) + return E_OUTOFMEMORY; - obj->size = This->nb_children; + array->size = This->nb_children; if (This->nb_children) { ULONG i; - if (!(obj->frames = HeapAlloc(GetProcessHeap(), 0, This->nb_children * sizeof(*obj->frames)))) + + if (!(array->frames = HeapAlloc(GetProcessHeap(), 0, This->nb_children * sizeof(*array->frames)))) return E_OUTOFMEMORY; - for (i = 0; i < This->nb_children; i++) - IDirect3DRMFrame3_QueryInterface(This->children[i], &IID_IDirect3DRMFrame, (void**)&obj->frames[i]); + for (i = 0; i < This->nb_children; ++i) + { + IDirect3DRMFrame3_QueryInterface(This->children[i], &IID_IDirect3DRMFrame, (void **)&array->frames[i]); + } } + *children = &array->IDirect3DRMFrameArray_iface; + return D3DRM_OK; }

1 0

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

11 Oct '13

Module: wine Branch: master Commit: 34548b4dfe8916b240c9227156edd0792f50c478 URL: http://source.winehq.org/git/wine.git/?a=commit;h=34548b4dfe8916b240c922715… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Oct 10 23:49:48 2013 +0200 d3drm: Get rid of the IDirect3DRMFrameImpl typedef. --- dlls/d3drm/frame.c | 1511 ++++++++++++++++++++++------------------------------ 1 files changed, 650 insertions(+), 861 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=34548b4dfe8916b240c92…

1 0