wine-commits May 2009

wine-commits@winehq.org

4 participants
793 discussions

Jacek Caban : urlmon: Return E_FAIL in Binding::Switch implementation.
by Alexandre Julliard 12 May '09

12 May '09

Module: wine Branch: master Commit: 00376b5b72c89fb5cbf2a8e326f97bd5315c561c URL: http://source.winehq.org/git/wine.git/?a=commit;h=00376b5b72c89fb5cbf2a8e32… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 11 22:01:05 2009 +0200 urlmon: Return E_FAIL in Binding::Switch implementation. --- dlls/urlmon/binding.c | 27 ++------------------------- dlls/urlmon/tests/url.c | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 25 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index cd843b4..2e07f96 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -1127,37 +1127,14 @@ static ULONG WINAPI InternetProtocolSink_Release(IInternetProtocolSink *iface) return IBinding_Release(BINDING(This)); } -typedef struct { - task_header_t header; - PROTOCOLDATA data; -} switch_task_t; - -static void switch_proc(Binding *binding, task_header_t *t) -{ - switch_task_t *task = (switch_task_t*)t; - - IInternetProtocol_Continue(binding->protocol, &task->data); - - heap_free(task); -} - static HRESULT WINAPI InternetProtocolSink_Switch(IInternetProtocolSink *iface, PROTOCOLDATA *pProtocolData) { Binding *This = PROTSINK_THIS(iface); - switch_task_t *task; - - TRACE("(%p)->(%p)\n", This, pProtocolData); - task = heap_alloc(sizeof(switch_task_t)); - task->data = *pProtocolData; + WARN("(%p)->(%p)\n", This, pProtocolData); - push_task(This, &task->header, switch_proc); - - IBinding_AddRef(BINDING(This)); - PostMessageW(This->notif_hwnd, WM_MK_CONTINUE, 0, (LPARAM)This); - - return S_OK; + return E_FAIL; } typedef struct { diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c index 6d3832e..7b9c89f 100644 --- a/dlls/urlmon/tests/url.c +++ b/dlls/urlmon/tests/url.c @@ -324,6 +324,28 @@ static ULONG WINAPI Protocol_Release(IInternetProtocol *iface) return 1; } +static void test_switch_fail(void) +{ + IInternetProtocolSink *binding_sink; + PROTOCOLDATA protocoldata; + HRESULT hres; + + static BOOL tested_switch_fail; + + if(tested_switch_fail) + return; + + tested_switch_fail = TRUE; + + hres = IBinding_QueryInterface(current_binding, &IID_IInternetProtocolSink, (void**)&binding_sink); + ok(hres == S_OK, "Could not get IInternetProtocolSink iface: %08x\n", hres); + if(SUCCEEDED(hres)) { + hres = IInternetProtocolSink_Switch(binding_sink, &protocoldata); + ok(hres == E_FAIL, "Switch failed: %08x, expected E_FAIL\n", hres); + IInternetProtocolSink_Release(binding_sink); + } +} + static DWORD WINAPI thread_proc(PVOID arg) { PROTOCOLDATA protocoldata; @@ -368,6 +390,8 @@ static DWORD WINAPI thread_proc(PVOID arg) else CHECK_CALLED(OnProgress_SENDINGREQUEST); + test_switch_fail(); + SET_EXPECT(Continue); prot_state = 1; hres = IInternetProtocolSink_Switch(protocol_sink, &protocoldata);

1 0

Jacek Caban : urlmon: Use PI_APARTMENTTHREADED in Binding object.
by Alexandre Julliard 12 May '09

12 May '09

Module: wine Branch: master Commit: 2e75a84e17bb9305858ed54b30d377e8f7497533 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e75a84e17bb9305858ed54b3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 11 22:00:41 2009 +0200 urlmon: Use PI_APARTMENTTHREADED in Binding object. --- dlls/urlmon/binding.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index 4b8651c..cd843b4 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -1789,7 +1789,7 @@ static HRESULT start_binding(IMoniker *mon, Binding *binding_ctx, LPCWSTR url, I report_data(binding, 0, 0, 0); }else { hres = IInternetProtocol_Start(binding->protocol, url, PROTSINK(binding), - BINDINF(binding), 0, 0); + BINDINF(binding), PI_APARTMENTTHREADED, 0); TRACE("start ret %08x\n", hres);

1 0

Jacek Caban : urlmon: Added PI_APARTMENTTHREADED support to BindProtocol:: ReportResult.
by Alexandre Julliard 12 May '09

12 May '09

Module: wine Branch: master Commit: 7de802eb0f50e2739afa408158cc09fccbaec34d URL: http://source.winehq.org/git/wine.git/?a=commit;h=7de802eb0f50e2739afa40815… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 11 22:00:26 2009 +0200 urlmon: Added PI_APARTMENTTHREADED support to BindProtocol::ReportResult. --- dlls/urlmon/bindprot.c | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 13e9b98..9203755 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -711,6 +711,25 @@ static HRESULT WINAPI BPInternetProtocolSink_ReportData(IInternetProtocolSink *i return IInternetProtocolSink_ReportData(This->protocol_sink, grfBSCF, ulProgress, ulProgressMax); } +typedef struct { + task_header_t header; + + HRESULT hres; + DWORD err; + LPWSTR str; +} report_result_task_t; + +static void report_result_proc(BindProtocol *This, task_header_t *t) +{ + report_result_task_t *task = (report_result_task_t*)t; + + if(This->protocol_sink) + IInternetProtocolSink_ReportResult(This->protocol_sink, task->hres, task->err, task->str); + + heap_free(task->str); + heap_free(task); +} + static HRESULT WINAPI BPInternetProtocolSink_ReportResult(IInternetProtocolSink *iface, HRESULT hrResult, DWORD dwError, LPCWSTR szResult) { @@ -723,6 +742,21 @@ static HRESULT WINAPI BPInternetProtocolSink_ReportResult(IInternetProtocolSink This->reported_result = TRUE; + if(!do_direct_notif(This)) { + report_result_task_t *task; + + task = heap_alloc(sizeof(report_result_task_t)); + if(!task) + return E_OUTOFMEMORY; + + task->hres = hrResult; + task->err = dwError; + task->str = heap_strdupW(szResult); + + push_task(This, &task->header, report_result_proc); + return S_OK; + } + return IInternetProtocolSink_ReportResult(This->protocol_sink, hrResult, dwError, szResult); }

1 0

Jacek Caban : urlmon: Added PI_APARTMENTTHREADED support to BindProtocol:: ReportProgress.
by Alexandre Julliard 12 May '09

12 May '09

Module: wine Branch: master Commit: 8ca4a4a3a45194de1a7b54191e6f3b081c543521 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ca4a4a3a45194de1a7b54191… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 11 22:00:13 2009 +0200 urlmon: Added PI_APARTMENTTHREADED support to BindProtocol::ReportProgress. --- dlls/urlmon/bindprot.c | 32 ++++++++++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index de00e94..13e9b98 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -666,6 +666,23 @@ static HRESULT WINAPI BPInternetProtocolSink_ReportProgress(IInternetProtocolSin return S_OK; } +typedef struct { + task_header_t header; + DWORD bscf; + ULONG progress; + ULONG progress_max; +} report_data_task_t; + +static void report_data_proc(BindProtocol *This, task_header_t *t) +{ + report_data_task_t *task = (report_data_task_t*)t; + + if(This->protocol_sink) + IInternetProtocolSink_ReportData(This->protocol_sink, task->bscf, task->progress, task->progress_max); + + heap_free(task); +} + static HRESULT WINAPI BPInternetProtocolSink_ReportData(IInternetProtocolSink *iface, DWORD grfBSCF, ULONG ulProgress, ULONG ulProgressMax) { @@ -676,6 +693,21 @@ static HRESULT WINAPI BPInternetProtocolSink_ReportData(IInternetProtocolSink *i if(!This->protocol_sink) return S_OK; + if(!do_direct_notif(This)) { + report_data_task_t *task; + + task = heap_alloc(sizeof(report_data_task_t)); + if(!task) + return E_OUTOFMEMORY; + + task->bscf = grfBSCF; + task->progress = ulProgress; + task->progress_max = ulProgressMax; + + push_task(This, &task->header, report_data_proc); + return S_OK; + } + return IInternetProtocolSink_ReportData(This->protocol_sink, grfBSCF, ulProgress, ulProgressMax); }

1 0

Jacek Caban : urlmon: Added support for PI_APARTMENTTHREADED to BindProtocol::ReportProgress.
by Alexandre Julliard 12 May '09

12 May '09

Module: wine Branch: master Commit: 2dee8bb79d326d17ef5791112a4680e95f07eaa9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2dee8bb79d326d17ef5791112… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 11 21:59:54 2009 +0200 urlmon: Added support for PI_APARTMENTTHREADED to BindProtocol::ReportProgress. --- dlls/urlmon/bindprot.c | 46 +++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 41 insertions(+), 5 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index eaee9b6..de00e94 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -596,6 +596,39 @@ static HRESULT WINAPI BPInternetProtocolSink_Switch(IInternetProtocolSink *iface return IInternetProtocolSink_Switch(This->protocol_sink, pProtocolData); } +typedef struct { + task_header_t header; + + ULONG status_code; + LPWSTR status_text; +} on_progress_task_t; + +static void on_progress_proc(BindProtocol *This, task_header_t *t) +{ + on_progress_task_t *task = (on_progress_task_t*)t; + + IInternetProtocolSink_ReportProgress(This->protocol_sink, task->status_code, task->status_text); + + heap_free(task->status_text); + heap_free(task); +} + +static void report_progress(BindProtocol *This, ULONG status_code, LPCWSTR status_text) +{ + if(do_direct_notif(This)) { + IInternetProtocolSink_ReportProgress(This->protocol_sink, status_code, status_text); + }else { + on_progress_task_t *task; + + task = heap_alloc(sizeof(on_progress_task_t)); + + task->status_code = status_code; + task->status_text = heap_strdupW(status_text); + + push_task(This, &task->header, on_progress_proc); + } +} + static HRESULT WINAPI BPInternetProtocolSink_ReportProgress(IInternetProtocolSink *iface, ULONG ulStatusCode, LPCWSTR szStatusText) { @@ -614,20 +647,23 @@ static HRESULT WINAPI BPInternetProtocolSink_ReportProgress(IInternetProtocolSin case BINDSTATUS_MIMETYPEAVAILABLE: if(!This->protocol_sink) return S_OK; - return IInternetProtocolSink_ReportProgress(This->protocol_sink, - ulStatusCode, szStatusText); + report_progress(This, ulStatusCode, szStatusText); + break; case BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE: if(!This->protocol_sink) return S_OK; - return IInternetProtocolSink_ReportProgress(This->protocol_sink, + report_progress(This, This->from_urlmon ? BINDSTATUS_VERIFIEDMIMETYPEAVAILABLE : BINDSTATUS_MIMETYPEAVAILABLE, - szStatusText); + szStatusText); + break; + default: FIXME("unsupported ulStatusCode %u\n", ulStatusCode); + return E_NOTIMPL; } - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI BPInternetProtocolSink_ReportData(IInternetProtocolSink *iface,

1 0

Jacek Caban : urlmon: Added support for PI_APARTMENTTHREADED to BindProtocol::Switch.
by Alexandre Julliard 12 May '09

12 May '09

Module: wine Branch: master Commit: e487196dc2ec499ac11a0e99d9919db799a03f0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=e487196dc2ec499ac11a0e99d… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 11 21:59:31 2009 +0200 urlmon: Added support for PI_APARTMENTTHREADED to BindProtocol::Switch. --- dlls/urlmon/binding.c | 7 ++- dlls/urlmon/bindprot.c | 117 ++++++++++++++++++++++++++++++++++++++++++++- dlls/urlmon/urlmon_main.h | 6 ++ 3 files changed, 126 insertions(+), 4 deletions(-) diff --git a/dlls/urlmon/binding.c b/dlls/urlmon/binding.c index f8ad73a..4b8651c 100644 --- a/dlls/urlmon/binding.c +++ b/dlls/urlmon/binding.c @@ -192,6 +192,9 @@ static LRESULT WINAPI notif_wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM IBinding_Release(BINDING(binding)); return 0; } + case WM_MK_CONTINUE2: + handle_bindprot_task((void*)lParam); + return 0; case WM_MK_RELEASE: { tls_data_t *data = get_tls_data(); @@ -205,7 +208,7 @@ static LRESULT WINAPI notif_wnd_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM return DefWindowProcW(hwnd, msg, wParam, lParam); } -static HWND get_notif_hwnd(void) +HWND get_notif_hwnd(void) { static ATOM wnd_class = 0; tls_data_t *tls_data; @@ -250,7 +253,7 @@ static HWND get_notif_hwnd(void) return tls_data->notif_hwnd; } -static void release_notif_hwnd(HWND hwnd) +void release_notif_hwnd(HWND hwnd) { tls_data_t *data = get_tls_data(); diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 1f24594..eaee9b6 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -21,7 +21,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon); -typedef struct { +typedef struct BindProtocol BindProtocol; + +struct _task_header_t; + +typedef void (*task_proc_t)(BindProtocol*,struct _task_header_t*); + +typedef struct _task_header_t { + task_proc_t proc; + struct _task_header_t *next; +} task_header_t; + +struct BindProtocol { const IInternetProtocolVtbl *lpInternetProtocolVtbl; const IInternetBindInfoVtbl *lpInternetBindInfoVtbl; const IInternetPriorityVtbl *lpInternetPriorityVtbl; @@ -40,7 +51,15 @@ typedef struct { BOOL reported_result; BOOL from_urlmon; -} BindProtocol; + DWORD pi; + + DWORD apartment_thread; + HWND notif_hwnd; + DWORD continue_call; + + CRITICAL_SECTION section; + task_header_t *task_queue_head, *task_queue_tail; +}; #define PROTOCOL(x) ((IInternetProtocol*) &(x)->lpInternetProtocolVtbl) #define BINDINFO(x) ((IInternetBindInfo*) &(x)->lpInternetBindInfoVtbl) @@ -48,6 +67,64 @@ typedef struct { #define SERVPROV(x) ((IServiceProvider*) &(x)->lpServiceProviderVtbl) #define PROTSINK(x) ((IInternetProtocolSink*) &(x)->lpInternetProtocolSinkVtbl) +void handle_bindprot_task(void *v) +{ + BindProtocol *This = v; + task_header_t *task; + + while(1) { + EnterCriticalSection(&This->section); + + task = This->task_queue_head; + if(task) { + This->task_queue_head = task->next; + if(!This->task_queue_head) + This->task_queue_tail = NULL; + } + + LeaveCriticalSection(&This->section); + + if(!task) + break; + + This->continue_call++; + task->proc(This, task); + This->continue_call--; + } + + IInternetProtocol_Release(PROTOCOL(This)); +} + +static void push_task(BindProtocol *This, task_header_t *task, task_proc_t proc) +{ + BOOL do_post = FALSE; + + task->proc = proc; + task->next = NULL; + + EnterCriticalSection(&This->section); + + if(This->task_queue_tail) { + This->task_queue_tail->next = task; + This->task_queue_tail = task; + }else { + This->task_queue_tail = This->task_queue_head = task; + do_post = TRUE; + } + + LeaveCriticalSection(&This->section); + + if(do_post) { + IInternetProtocol_AddRef(PROTOCOL(This)); + PostMessageW(This->notif_hwnd, WM_MK_CONTINUE2, 0, (LPARAM)This); + } +} + +static BOOL inline do_direct_notif(BindProtocol *This) +{ + return !(This->pi & PI_APARTMENTTHREADED) || (This->apartment_thread == GetCurrentThreadId() && !This->continue_call); +} + #define PROTOCOL_THIS(iface) DEFINE_THIS(BindProtocol, InternetProtocol, iface) static HRESULT WINAPI BindProtocol_QueryInterface(IInternetProtocol *iface, REFIID riid, void **ppv) @@ -113,6 +190,10 @@ static ULONG WINAPI BindProtocol_Release(IInternetProtocol *iface) IInternetBindInfo_Release(This->bind_info); set_binding_sink(PROTOCOL(This), NULL); + + if(This->notif_hwnd) + release_notif_hwnd(This->notif_hwnd); + DeleteCriticalSection(&This->section); heap_free(This); URLMON_UnlockModule(); @@ -140,6 +221,8 @@ static HRESULT WINAPI BindProtocol_Start(IInternetProtocol *iface, LPCWSTR szUrl if(!szUrl || !pOIProtSink || !pOIBindInfo) return E_INVALIDARG; + This->pi = grfPI; + hres = IInternetProtocolSink_QueryInterface(pOIProtSink, &IID_IServiceProvider, (void**)&service_provider); if(SUCCEEDED(hres)) { @@ -468,6 +551,20 @@ static ULONG WINAPI BPInternetProtocolSink_Release(IInternetProtocolSink *iface) return IInternetProtocol_Release(PROTOCOL(This)); } +typedef struct { + task_header_t header; + PROTOCOLDATA data; +} switch_task_t; + +static void switch_proc(BindProtocol *bind, task_header_t *t) +{ + switch_task_t *task = (switch_task_t*)t; + + IInternetProtocol_Continue(bind->protocol, &task->data); + + heap_free(task); +} + static HRESULT WINAPI BPInternetProtocolSink_Switch(IInternetProtocolSink *iface, PROTOCOLDATA *pProtocolData) { @@ -478,6 +575,19 @@ static HRESULT WINAPI BPInternetProtocolSink_Switch(IInternetProtocolSink *iface TRACE("flags %x state %x data %p cb %u\n", pProtocolData->grfFlags, pProtocolData->dwState, pProtocolData->pData, pProtocolData->cbData); + if(!do_direct_notif(This)) { + switch_task_t *task; + + task = heap_alloc(sizeof(switch_task_t)); + if(!task) + return E_OUTOFMEMORY; + + task->data = *pProtocolData; + + push_task(This, &task->header, switch_proc); + return S_OK; + } + if(!This->protocol_sink) { IInternetProtocol_Continue(This->protocol, pProtocolData); return S_OK; @@ -615,6 +725,9 @@ HRESULT create_binding_protocol(LPCWSTR url, BOOL from_urlmon, IInternetProtocol ret->ref = 1; ret->from_urlmon = from_urlmon; + ret->apartment_thread = GetCurrentThreadId(); + ret->notif_hwnd = get_notif_hwnd(); + InitializeCriticalSection(&ret->section); URLMON_LockModule(); diff --git a/dlls/urlmon/urlmon_main.h b/dlls/urlmon/urlmon_main.h index aa2f276..13eb4f3 100644 --- a/dlls/urlmon/urlmon_main.h +++ b/dlls/urlmon/urlmon_main.h @@ -116,6 +116,12 @@ typedef struct { tls_data_t *get_tls_data(void); +HWND get_notif_hwnd(void); +void release_notif_hwnd(HWND); + +#define WM_MK_CONTINUE2 (WM_USER+103) +void handle_bindprot_task(void*); + static inline void *heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len);

1 0

Henri Verbeet : wined3d: Don' t create more than WINED3D_MAX_FBO_ENTRIES FBO entries.
by Alexandre Julliard 12 May '09

12 May '09

Module: wine Branch: master Commit: 0d446053da05567177da12371633336ed2add9d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d446053da05567177da12371… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 11 16:43:49 2009 +0200 wined3d: Don't create more than WINED3D_MAX_FBO_ENTRIES FBO entries. This essentially turns the FBO entry list into an LRU cache. --- dlls/wined3d/context.c | 44 +++++++++++++++++++++++++++++++++++---- dlls/wined3d/wined3d_private.h | 3 ++ 2 files changed, 42 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2c6703f..8a4296d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -53,12 +53,10 @@ void context_bind_fbo(IWineD3DDevice *iface, GLenum target, GLuint *fbo) checkGLcall("glBindFramebuffer()"); } -static void context_destroy_fbo(IWineD3DDeviceImpl *This, const GLuint *fbo) +static void context_clean_fbo_attachments(IWineD3DDeviceImpl *This) { unsigned int i; - GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, *fbo)); - checkGLcall("glBindFramebuffer()"); for (i = 0; i < GL_LIMITS(buffers); ++i) { GL_EXTCALL(glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT + i, GL_TEXTURE_2D, 0, 0)); @@ -66,6 +64,15 @@ static void context_destroy_fbo(IWineD3DDeviceImpl *This, const GLuint *fbo) } GL_EXTCALL(glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT, GL_TEXTURE_2D, 0, 0)); checkGLcall("glFramebufferTexture2D()"); +} + +static void context_destroy_fbo(IWineD3DDeviceImpl *This, const GLuint *fbo) +{ + GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, *fbo)); + checkGLcall("glBindFramebuffer()"); + + context_clean_fbo_attachments(This); + GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0)); checkGLcall("glBindFramebuffer()"); GL_EXTCALL(glDeleteFramebuffersEXT(1, fbo)); @@ -230,6 +237,19 @@ static struct fbo_entry *context_create_fbo_entry(IWineD3DDevice *iface) return entry; } +static void context_reuse_fbo_entry(IWineD3DDevice *iface, struct fbo_entry *entry) +{ + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + + GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, entry->id)); + checkGLcall("glBindFramebuffer()"); + context_clean_fbo_attachments(This); + + memcpy(entry->render_targets, This->render_targets, GL_LIMITS(buffers) * sizeof(*entry->render_targets)); + entry->depth_stencil = This->stencilBufferTarget; + entry->attached = FALSE; +} + static void context_destroy_fbo_entry(IWineD3DDeviceImpl *This, struct fbo_entry *entry) { if (entry->id) @@ -253,12 +273,26 @@ static struct fbo_entry *context_find_fbo_entry(IWineD3DDevice *iface, WineD3DCo if (!memcmp(entry->render_targets, This->render_targets, GL_LIMITS(buffers) * sizeof(*entry->render_targets)) && entry->depth_stencil == This->stencilBufferTarget) { + list_remove(&entry->entry); + list_add_head(&context->fbo_list, &entry->entry); return entry; } } - entry = context_create_fbo_entry(iface); - list_add_head(&context->fbo_list, &entry->entry); + if (context->fbo_entry_count < WINED3D_MAX_FBO_ENTRIES) + { + entry = context_create_fbo_entry(iface); + list_add_head(&context->fbo_list, &entry->entry); + ++context->fbo_entry_count; + } + else + { + entry = LIST_ENTRY(list_tail(&context->fbo_list), struct fbo_entry, entry); + context_reuse_fbo_entry(iface, entry); + list_remove(&entry->entry); + list_add_head(&context->fbo_list, &entry->entry); + } + return entry; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c227e9c..cbefa9a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1167,6 +1167,8 @@ enum fogsource { FOGSOURCE_COORD, }; +#define WINED3D_MAX_FBO_ENTRIES 64 + /* The new context manager that should deal with onscreen and offscreen rendering */ struct WineD3DContext { /* State dirtification @@ -1214,6 +1216,7 @@ struct WineD3DContext { GLint aux_buffers; /* FBOs */ + UINT fbo_entry_count; struct list fbo_list; struct fbo_entry *current_fbo; GLuint src_fbo;

1 0

Henri Verbeet : wined3d: Print the correct limit in a WARN().
by Alexandre Julliard 12 May '09

12 May '09

Module: wine Branch: master Commit: cad271f13d08dddc72f3faa6e5f44ad45d6c7d81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cad271f13d08dddc72f3faa6e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 11 16:43:49 2009 +0200 wined3d: Print the correct limit in a WARN(). --- dlls/wined3d/glsl_shader.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ca50305..b248a3b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1175,7 +1175,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * case WINED3DSPR_COLOROUT: if (reg->idx >= GL_LIMITS(buffers)) - WARN("Write to render target %u, only %d supported\n", reg->idx, 4); + WARN("Write to render target %u, only %d supported\n", reg->idx, GL_LIMITS(buffers)); if (GL_SUPPORT(ARB_DRAW_BUFFERS)) sprintf(register_name, "gl_FragData[%u]", reg->idx); /* On older cards with GLSL support like the GeforceFX there's only one buffer. */

1 0

Henri Verbeet : wined3d: Pass a struct wined3d_shader_register to shader_record_register_usage().
by Alexandre Julliard 12 May '09

12 May '09

Module: wine Branch: master Commit: adc9bfe3fdc673c1c85e700861b4e692bf71b2d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=adc9bfe3fdc673c1c85e70086… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 11 16:43:49 2009 +0200 wined3d: Pass a struct wined3d_shader_register to shader_record_register_usage(). --- dlls/wined3d/baseshader.c | 75 ++++++++++++++++++++------------------------- 1 files changed, 33 insertions(+), 42 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 7018abe..1746917 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -246,24 +246,24 @@ static inline void set_bitmap_bit(DWORD *bitmap, DWORD bit) } static void shader_record_register_usage(IWineD3DBaseShaderImpl *This, struct shader_reg_maps *reg_maps, - DWORD register_type, UINT register_idx, BOOL has_rel_addr, BOOL pshader) + const struct wined3d_shader_register *reg, BOOL pshader) { - switch (register_type) + switch (reg->type) { case WINED3DSPR_TEXTURE: /* WINED3DSPR_ADDR */ - if (pshader) reg_maps->texcoord[register_idx] = 1; - else reg_maps->address[register_idx] = 1; + if (pshader) reg_maps->texcoord[reg->idx] = 1; + else reg_maps->address[reg->idx] = 1; break; case WINED3DSPR_TEMP: - reg_maps->temporary[register_idx] = 1; + reg_maps->temporary[reg->idx] = 1; break; case WINED3DSPR_INPUT: - if (!pshader) reg_maps->attributes[register_idx] = 1; + if (!pshader) reg_maps->attributes[reg->idx] = 1; else { - if (has_rel_addr) + if (reg->rel_addr) { /* If relative addressing is used, we must assume that all registers * are used. Even if it is a construct like v3[aL], we can't assume @@ -276,68 +276,68 @@ static void shader_record_register_usage(IWineD3DBaseShaderImpl *This, struct sh } else { - ((IWineD3DPixelShaderImpl *)This)->input_reg_used[register_idx] = TRUE; + ((IWineD3DPixelShaderImpl *)This)->input_reg_used[reg->idx] = TRUE; } } break; case WINED3DSPR_RASTOUT: - if (register_idx == 1) reg_maps->fog = 1; + if (reg->idx == 1) reg_maps->fog = 1; break; case WINED3DSPR_MISCTYPE: - if (pshader && register_idx == 0) reg_maps->vpos = 1; + if (pshader && reg->idx == 0) reg_maps->vpos = 1; break; case WINED3DSPR_CONST: - if (has_rel_addr) + if (reg->rel_addr) { if (!pshader) { - if (register_idx <= ((IWineD3DVertexShaderImpl *)This)->min_rel_offset) - ((IWineD3DVertexShaderImpl *)This)->min_rel_offset = register_idx; - else if (register_idx >= ((IWineD3DVertexShaderImpl *)This)->max_rel_offset) - ((IWineD3DVertexShaderImpl *)This)->max_rel_offset = register_idx; + if (reg->idx <= ((IWineD3DVertexShaderImpl *)This)->min_rel_offset) + ((IWineD3DVertexShaderImpl *)This)->min_rel_offset = reg->idx; + else if (reg->idx >= ((IWineD3DVertexShaderImpl *)This)->max_rel_offset) + ((IWineD3DVertexShaderImpl *)This)->max_rel_offset = reg->idx; } reg_maps->usesrelconstF = TRUE; } else { - set_bitmap_bit(reg_maps->constf, register_idx); + set_bitmap_bit(reg_maps->constf, reg->idx); } break; case WINED3DSPR_CONSTINT: - reg_maps->integer_constants |= (1 << register_idx); + reg_maps->integer_constants |= (1 << reg->idx); break; case WINED3DSPR_CONSTBOOL: - reg_maps->boolean_constants |= (1 << register_idx); + reg_maps->boolean_constants |= (1 << reg->idx); break; default: - TRACE("Not recording register of type %#x and idx %u\n", register_type, register_idx); + TRACE("Not recording register of type %#x and idx %u\n", reg->type, reg->idx); break; } } -static unsigned char get_instr_regcount(enum WINED3D_SHADER_INSTRUCTION_HANDLER instr, int param) +static unsigned int get_instr_extra_regcount(enum WINED3D_SHADER_INSTRUCTION_HANDLER instr, unsigned int param) { switch(instr) { case WINED3DSIH_M4x4: case WINED3DSIH_M3x4: - return param == 1 ? 4 : 1; + return param == 1 ? 3 : 0; case WINED3DSIH_M4x3: case WINED3DSIH_M3x3: - return param == 1 ? 3 : 1; + return param == 1 ? 2 : 0; case WINED3DSIH_M3x2: - return param == 1 ? 2 : 1; + return param == 1 ? 1 : 0; default: - return 1; + return 0; } } @@ -558,8 +558,7 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 } else { - shader_record_register_usage(This, reg_maps, dst_param.reg.type, - dst_param.reg.idx, !!dst_param.reg.rel_addr, pshader); + shader_record_register_usage(This, reg_maps, &dst_param.reg, pshader); } /* Declare 1.X samplers implicitly, based on the destination reg. number */ @@ -617,25 +616,17 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, const struct wined3 for (i = 0; i < limit; ++i) { struct wined3d_shader_src_param src_param, src_rel_addr; + unsigned int count; fe->shader_read_src_param(fe_data, &pToken, &src_param, &src_rel_addr); - switch(get_instr_regcount(ins.handler_idx, i)) + count = get_instr_extra_regcount(ins.handler_idx, i); + + shader_record_register_usage(This, reg_maps, &src_param.reg, pshader); + while (count) { - case 4: - shader_record_register_usage(This, reg_maps, src_param.reg.type, - src_param.reg.idx + 3, !!src_param.reg.rel_addr, pshader); - /* drop through */ - case 3: - shader_record_register_usage(This, reg_maps, src_param.reg.type, - src_param.reg.idx + 2, !!src_param.reg.rel_addr, pshader); - /* drop through */ - case 2: - shader_record_register_usage(This, reg_maps, src_param.reg.type, - src_param.reg.idx + 1, !!src_param.reg.rel_addr, pshader); - /* drop through */ - case 1: - shader_record_register_usage(This, reg_maps, src_param.reg.type, - src_param.reg.idx, !!src_param.reg.rel_addr, pshader); + ++src_param.reg.idx; + shader_record_register_usage(This, reg_maps, &src_param.reg, pshader); + --count; } } }

1 0

Henri Verbeet : wined3d: Pass a struct wined3d_shader_register to shader_dump_register().
by Alexandre Julliard 12 May '09

12 May '09

Module: wine Branch: master Commit: 2039702035d71aa9ae35c2fe5904e347357f0ee4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2039702035d71aa9ae35c2fe5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon May 11 16:43:49 2009 +0200 wined3d: Pass a struct wined3d_shader_register to shader_dump_register(). --- dlls/wined3d/baseshader.c | 44 +++++++++++++++++++++----------------------- 1 files changed, 21 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 8b8aef4..7018abe 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -721,15 +721,14 @@ static void shader_dump_decl_usage(const struct wined3d_shader_semantic *semanti } } -static void shader_dump_register(WINED3DSHADER_PARAM_REGISTER_TYPE register_type, UINT register_idx, - enum wined3d_immconst_type immconst_type, const DWORD *immconst_data, - const struct wined3d_shader_src_param *rel_addr, const struct wined3d_shader_version *shader_version) +static void shader_dump_register(const struct wined3d_shader_register *reg, + const struct wined3d_shader_version *shader_version) { static const char * const rastout_reg_names[] = {"oPos", "oFog", "oPts"}; static const char * const misctype_reg_names[] = {"vPos", "vFace"}; - UINT offset = register_idx; + UINT offset = reg->idx; - switch (register_type) + switch (reg->type) { case WINED3DSPR_TEMP: TRACE("r"); @@ -744,7 +743,7 @@ static void shader_dump_register(WINED3DSHADER_PARAM_REGISTER_TYPE register_type case WINED3DSPR_CONST3: case WINED3DSPR_CONST4: TRACE("c"); - offset = shader_get_float_offset(register_type, register_idx); + offset = shader_get_float_offset(reg->type, reg->idx); break; case WINED3DSPR_TEXTURE: /* vs: case WINED3DSPR_ADDR */ @@ -752,7 +751,7 @@ static void shader_dump_register(WINED3DSHADER_PARAM_REGISTER_TYPE register_type break; case WINED3DSPR_RASTOUT: - TRACE("%s", rastout_reg_names[register_idx]); + TRACE("%s", rastout_reg_names[reg->idx]); break; case WINED3DSPR_COLOROUT: @@ -795,8 +794,8 @@ static void shader_dump_register(WINED3DSHADER_PARAM_REGISTER_TYPE register_type break; case WINED3DSPR_MISCTYPE: - if (register_idx > 1) FIXME("Unhandled misctype register %d\n", register_idx); - else TRACE("%s", misctype_reg_names[register_idx]); + if (reg->idx > 1) FIXME("Unhandled misctype register %d\n", reg->idx); + else TRACE("%s", misctype_reg_names[reg->idx]); break; case WINED3DSPR_PREDICATE: @@ -808,41 +807,41 @@ static void shader_dump_register(WINED3DSHADER_PARAM_REGISTER_TYPE register_type break; default: - TRACE("unhandled_rtype(%#x)", register_type); + TRACE("unhandled_rtype(%#x)", reg->type); break; } - if (register_type == WINED3DSPR_IMMCONST) + if (reg->type == WINED3DSPR_IMMCONST) { TRACE("("); - switch (immconst_type) + switch (reg->immconst_type) { case WINED3D_IMMCONST_FLOAT: - TRACE("%.8e", *(float *)immconst_data); + TRACE("%.8e", *(float *)reg->immconst_data); break; case WINED3D_IMMCONST_FLOAT4: TRACE("%.8e, %.8e, %.8e, %.8e", - *(float *)&immconst_data[0], *(float *)&immconst_data[1], - *(float *)&immconst_data[2], *(float *)&immconst_data[3]); + *(float *)&reg->immconst_data[0], *(float *)&reg->immconst_data[1], + *(float *)&reg->immconst_data[2], *(float *)&reg->immconst_data[3]); break; default: - TRACE("<unhandled immconst_type %#x>", immconst_type); + TRACE("<unhandled immconst_type %#x>", reg->immconst_type); break; } TRACE(")"); } - else if (register_type != WINED3DSPR_RASTOUT && register_type != WINED3DSPR_MISCTYPE) + else if (reg->type != WINED3DSPR_RASTOUT && reg->type != WINED3DSPR_MISCTYPE) { - if (rel_addr) + if (reg->rel_addr) { TRACE("["); - shader_dump_src_param(rel_addr, shader_version); + shader_dump_src_param(reg->rel_addr, shader_version); TRACE(" + "); } TRACE("%u", offset); - if (rel_addr) TRACE("]"); + if (reg->rel_addr) TRACE("]"); } } @@ -851,7 +850,7 @@ void shader_dump_dst_param(const struct wined3d_shader_dst_param *param, { DWORD write_mask = param->write_mask; - shader_dump_register(param->reg.type, param->reg.idx, 0, NULL, param->reg.rel_addr, shader_version); + shader_dump_register(&param->reg, shader_version); if (write_mask != WINED3DSP_WRITEMASK_ALL) { @@ -885,8 +884,7 @@ void shader_dump_src_param(const struct wined3d_shader_src_param *param, if (src_modifier == WINED3DSPSM_ABS || src_modifier == WINED3DSPSM_ABSNEG) TRACE("abs("); - shader_dump_register(param->reg.type, param->reg.idx, param->reg.immconst_type, - param->reg.immconst_data, param->reg.rel_addr, shader_version); + shader_dump_register(&param->reg, shader_version); if (src_modifier) {

1 0

← Newer
1
...
54
55
56
57
58
59
60
...
80
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 May 2009