April 2013 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Simplify DISCARD / READONLY handling in wined3d_buffer_map() a bit.
by Alexandre Julliard April 16, 2013

April 16, 2013

Module: wine Branch: master Commit: 00cc81dc69c0f61107d5d2b9f27b946221794020 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00cc81dc69c0f61107d5d2b9f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 16 08:13:42 2013 +0200 wined3d: Simplify DISCARD / READONLY handling in wined3d_buffer_map() a bit. --- dlls/wined3d/buffer.c | 27 ++++++++++++--------------- 1 files changed, 12 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index dc5b4d2..9110bbd 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -986,22 +986,19 @@ HRESULT CDECL wined3d_buffer_map(struct wined3d_buffer *buffer, UINT offset, UIN TRACE("buffer %p, offset %u, size %u, data %p, flags %#x\n", buffer, offset, size, data, flags); flags = buffer_sanitize_flags(buffer, flags); - if (!(flags & WINED3D_MAP_READONLY)) + if (flags & WINED3D_MAP_DISCARD) { - if (flags & WINED3D_MAP_DISCARD) - { - /* DISCARD invalidates the entire buffer, regardless of the - * specified offset and size. Some applications also depend on the - * entire buffer being uploaded in that case. Two such - * applications are Port Royale and Darkstar One. */ - if (!buffer_add_dirty_area(buffer, 0, 0)) - return E_OUTOFMEMORY; - } - else - { - if (!buffer_add_dirty_area(buffer, offset, size)) - return E_OUTOFMEMORY; - } + /* DISCARD invalidates the entire buffer, regardless of the specified + * offset and size. Some applications also depend on the entire buffer + * being uploaded in that case. Two such applications are Port Royale + * and Darkstar One. */ + if (!buffer_add_dirty_area(buffer, 0, 0)) + return E_OUTOFMEMORY; + } + else if (!(flags & WINED3D_MAP_READONLY)) + { + if (!buffer_add_dirty_area(buffer, offset, size)) + return E_OUTOFMEMORY; } count = ++buffer->resource.map_count;

1 0

Ken Thomases : winemac: Refactor WineApplication class to separate most logic into a controller class .
by Alexandre Julliard April 16, 2013

April 16, 2013

Module: wine Branch: master Commit: e7d5f329e5c0df157485b697ebd246e46200d490 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7d5f329e5c0df157485b697e… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Apr 16 00:38:01 2013 -0500 winemac: Refactor WineApplication class to separate most logic into a controller class. --- dlls/winemac.drv/cocoa_app.h | 18 +++- dlls/winemac.drv/cocoa_app.m | 214 ++++++++++++++++++++++++--------------- dlls/winemac.drv/cocoa_event.m | 8 +- dlls/winemac.drv/cocoa_main.m | 28 ++++- dlls/winemac.drv/cocoa_window.m | 80 ++++++++------- 5 files changed, 218 insertions(+), 130 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e7d5f329e5c0df157485b…

1 0

Jacek Caban : ieframe: Added DISPID_WINDOWCLOSING tests.
by Alexandre Julliard April 16, 2013

April 16, 2013

Module: wine Branch: master Commit: e5147a51614cd9671aff4a9700f35a0ede73a2d9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5147a51614cd9671aff4a970… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 16 12:01:17 2013 +0200 ieframe: Added DISPID_WINDOWCLOSING tests. --- dlls/ieframe/tests/webbrowser.c | 41 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 40 insertions(+), 1 deletions(-) diff --git a/dlls/ieframe/tests/webbrowser.c b/dlls/ieframe/tests/webbrowser.c index 47d0fbc..1eb6119 100644 --- a/dlls/ieframe/tests/webbrowser.c +++ b/dlls/ieframe/tests/webbrowser.c @@ -109,6 +109,7 @@ DEFINE_EXPECT(Invoke_TITLECHANGE); DEFINE_EXPECT(Invoke_NAVIGATECOMPLETE2); DEFINE_EXPECT(Invoke_PROGRESSCHANGE); DEFINE_EXPECT(Invoke_DOCUMENTCOMPLETE); +DEFINE_EXPECT(Invoke_WINDOWCLOSING); DEFINE_EXPECT(Invoke_282); DEFINE_EXPECT(EnableModeless_TRUE); DEFINE_EXPECT(EnableModeless_FALSE); @@ -658,7 +659,7 @@ static HRESULT WINAPI WebBrowserEvents2_QueryInterface(IDispatch *iface, REFIID { *ppv = NULL; - if(IsEqualGUID(&DIID_DWebBrowserEvents2, riid)) { + if(IsEqualGUID(&DIID_DWebBrowserEvents2, riid) || IsEqualGUID(&IID_IDispatch, riid)) { *ppv = iface; return S_OK; } @@ -951,6 +952,21 @@ static HRESULT WINAPI WebBrowserEvents2_Invoke(IDispatch *iface, DISPID dispIdMe test_documentcomplete(pDispParams); break; + case DISPID_WINDOWCLOSING: { + VARIANT *is_child = pDispParams->rgvarg+1, *cancel = pDispParams->rgvarg; + + CHECK_EXPECT(Invoke_WINDOWCLOSING); + + ok(pDispParams->cArgs == 2, "pdp->cArgs = %d\n", pDispParams->cArgs); + ok(V_VT(is_child) == VT_BOOL, "V_VT(is_child) = %d\n", V_VT(is_child)); + ok(!V_BOOL(is_child), "V_BOOL(is_child) = %x\n", V_BOOL(is_child)); + ok(V_VT(cancel) == (VT_BYREF|VT_BOOL), "V_VT(cancel) = %d\n", V_VT(cancel)); + ok(!*V_BOOLREF(cancel), "*V_BOOLREF(cancel) = %x\n", *V_BOOLREF(cancel)); + + *V_BOOLREF(cancel) = VARIANT_TRUE; + return S_OK; + } + case 282: /* FIXME */ CHECK_EXPECT2(Invoke_282); break; @@ -3085,6 +3101,28 @@ static void test_external(IWebBrowser2 *unk) IDocHostUIHandler2_Release(dochost); } +static void test_htmlwindow_close(IWebBrowser2 *wb) +{ + IHTMLWindow2 *window; + IHTMLDocument2 *doc; + HRESULT hres; + + doc = get_document(wb); + + hres = IHTMLDocument2_get_parentWindow(doc, &window); + ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + IHTMLDocument2_Release(doc); + + SET_EXPECT(Invoke_WINDOWCLOSING); + + hres = IHTMLWindow2_close(window); + ok(hres == S_OK, "close failed: %08x\n", hres); + + CHECK_CALLED(Invoke_WINDOWCLOSING); + + IHTMLWindow2_Release(window); +} + static void test_TranslateAccelerator(IWebBrowser2 *unk) { IOleClientSite *doc_clientsite; @@ -3404,6 +3442,7 @@ static void test_WebBrowser(BOOL do_download, BOOL do_close) } test_external(webbrowser); + test_htmlwindow_close(webbrowser); if(do_close) test_Close(webbrowser, do_download);

1 0

Ken Thomases : loader: On Mac, if Wine is already on secondary thread, don' t reserve it for the system frameworks.
by Alexandre Julliard April 16, 2013

April 16, 2013

Module: wine Branch: master Commit: cf73350d9ff3e689b1966548b49841252ca7d488 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf73350d9ff3e689b1966548b… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Apr 16 00:37:48 2013 -0500 loader: On Mac, if Wine is already on secondary thread, don't reserve it for the system frameworks. --- libs/wine/loader.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/libs/wine/loader.c b/libs/wine/loader.c index 302e9c1..7af1233 100644 --- a/libs/wine/loader.c +++ b/libs/wine/loader.c @@ -761,6 +761,12 @@ static void apple_main_thread( void (*init_func)(void) ) CFRunLoopSourceContext source_context = { 0 }; CFRunLoopSourceRef source; + if (!pthread_main_np()) + { + init_func(); + return; + } + /* Multi-processing Services can get confused about the main thread if the * first time it's used is on a secondary thread. Use it here to make sure * that doesn't happen. */

1 0

Henri Verbeet : d3drm/tests: Avoid LPDIRECT3DRM3.
by Alexandre Julliard April 16, 2013

April 16, 2013

Module: wine Branch: master Commit: 1ce059d6929810b22aeb4e1177fac5afc58d93ef URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ce059d6929810b22aeb4e117… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 16 08:13:46 2013 +0200 d3drm/tests: Avoid LPDIRECT3DRM3. --- dlls/d3drm/tests/d3drm.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 1f90119..9110efa 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -527,7 +527,7 @@ static void test_MeshBuilder3(void) { HRESULT hr; IDirect3DRM *d3drm; - LPDIRECT3DRM3 pD3DRM3; + IDirect3DRM3 *d3drm3; LPDIRECT3DRMMESHBUILDER3 pMeshBuilder3; D3DRMLOADMEMORY info; int val; @@ -539,14 +539,14 @@ static void test_MeshBuilder3(void) hr = pDirect3DRMCreate(&d3drm); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); - if (FAILED(hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM3, (void **)&pD3DRM3))) + if (FAILED(hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM3, (void **)&d3drm3))) { win_skip("Cannot get IDirect3DRM3 interface (hr = %x), skipping tests\n", hr); IDirect3DRM_Release(d3drm); return; } - hr = IDirect3DRM3_CreateMeshBuilder(pD3DRM3, &pMeshBuilder3); + hr = IDirect3DRM3_CreateMeshBuilder(d3drm3, &pMeshBuilder3); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMeshBuilder3 interface (hr = %x)\n", hr); hr = IDirect3DRMMeshBuilder3_GetClassName(pMeshBuilder3, NULL, cname); @@ -630,7 +630,7 @@ static void test_MeshBuilder3(void) ok(valv == 3.21f, "Wrong coordinate %f (must be 3.21)\n", valv); IDirect3DRMMeshBuilder3_Release(pMeshBuilder3); - IDirect3DRM3_Release(pD3DRM3); + IDirect3DRM3_Release(d3drm3); IDirect3DRM_Release(d3drm); } @@ -1118,7 +1118,7 @@ static void test_Material2(void) { HRESULT hr; IDirect3DRM *d3drm; - LPDIRECT3DRM3 pD3DRM3; + IDirect3DRM3 *d3drm3; LPDIRECT3DRMMATERIAL2 pMaterial2; D3DVALUE r, g, b; DWORD size; @@ -1127,14 +1127,14 @@ static void test_Material2(void) hr = pDirect3DRMCreate(&d3drm); ok(hr == D3DRM_OK, "Cannot get IDirect3DRM interface (hr = %x)\n", hr); - if (FAILED(hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM3, (void **)&pD3DRM3))) + if (FAILED(hr = IDirect3DRM_QueryInterface(d3drm, &IID_IDirect3DRM3, (void **)&d3drm3))) { win_skip("Cannot get IDirect3DRM3 interface (hr = %x), skipping tests\n", hr); IDirect3DRM_Release(d3drm); return; } - hr = IDirect3DRM3_CreateMaterial(pD3DRM3, 18.5f, &pMaterial2); + hr = IDirect3DRM3_CreateMaterial(d3drm3, 18.5f, &pMaterial2); ok(hr == D3DRM_OK, "Cannot get IDirect3DRMMaterial2 interface (hr = %x)\n", hr); hr = IDirect3DRMMaterial2_GetClassName(pMaterial2, NULL, cname); @@ -1190,7 +1190,7 @@ static void test_Material2(void) IDirect3DRMMaterial2_Release(pMaterial2); - IDirect3DRM3_Release(pD3DRM3); + IDirect3DRM3_Release(d3drm3); IDirect3DRM_Release(d3drm); }

1 0

Henri Verbeet : d3drm: Avoid LPDIRECT3DRM.
by Alexandre Julliard April 16, 2013

April 16, 2013

Module: wine Branch: master Commit: 5e3b4c8751d719f899842ceb3eb9ea1b4923eace URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e3b4c8751d719f899842ceb3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 16 08:13:45 2013 +0200 d3drm: Avoid LPDIRECT3DRM. --- dlls/d3drm/tests/d3drm.c | 105 +++++++++++++++++++++++----------------------- include/d3drm.h | 2 +- include/d3drmobj.h | 2 +- 3 files changed, 54 insertions(+), 55 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5e3b4c8751d719f899842…

1 0

Henri Verbeet : wined3d: Immediate constants should always have a valid location in shader_glsl_load_constantsB ().
by Alexandre Julliard April 16, 2013

April 16, 2013

Module: wine Branch: master Commit: 1a551fe5f91c3ed0c56418a25228244e43eee510 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1a551fe5f91c3ed0c56418a25… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Apr 16 08:13:44 2013 +0200 wined3d: Immediate constants should always have a valid location in shader_glsl_load_constantsB(). --- dlls/wined3d/glsl_shader.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 057763f..3493ff2 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -651,7 +651,6 @@ static void shader_glsl_load_constantsB(const struct wined3d_shader *shader, con snprintf(tmp_name, sizeof(tmp_name), "%s_b[%i]", prefix, i); tmp_loc = GL_EXTCALL(glGetUniformLocationARB(programId, tmp_name)); GL_EXTCALL(glUniform1ivARB(tmp_loc, 1, &constants[i])); - checkGLcall("glUniform1ivARB"); } /* Load immediate constants */ @@ -666,13 +665,11 @@ static void shader_glsl_load_constantsB(const struct wined3d_shader *shader, con snprintf(tmp_name, sizeof(tmp_name), "%s_b[%i]", prefix, idx); tmp_loc = GL_EXTCALL(glGetUniformLocationARB(programId, tmp_name)); - if (tmp_loc != -1) { - /* We found this uniform name in the program - go ahead and send the data */ - GL_EXTCALL(glUniform1ivARB(tmp_loc, 1, values)); - checkGLcall("glUniform1ivARB"); - } + GL_EXTCALL(glUniform1ivARB(tmp_loc, 1, values)); ptr = list_next(&shader->constantsB, ptr); } + + checkGLcall("shader_glsl_load_constantsB()"); } static void reset_program_constant_version(struct wine_rb_entry *entry, void *context)

1 0

Ken Thomases : libwine: Add libwine's directory (@loader_path) to rpath.
by Alexandre Julliard April 16, 2013

April 16, 2013

Module: wine Branch: master Commit: 304463b4e14472d6ff7e7cccc59b96356a98d794 URL: http://source.winehq.org/git/wine.git/?a=commit;h=304463b4e14472d6ff7e7cccc… Author: Ken Thomases <ken(a)codeweavers.com> Date: Tue Apr 16 00:37:54 2013 -0500 libwine: Add libwine's directory (@loader_path) to rpath. --- libs/wine/Makefile.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in index b8c713a..3468ee0 100644 --- a/libs/wine/Makefile.in +++ b/libs/wine/Makefile.in @@ -131,7 +131,7 @@ libwine.dll: $(OBJS) wine.def Makefile.in DYLIB_LDFLAGS = -compatibility_version $(SOVERSION) -current_version $(VERSION) libwine.$(VERSION).dylib: $(OBJS) $(RELPATH) Makefile.in - $(LDSHARED) -install_name @rpath/$(DYNAME) $(DYLIB_LDFLAGS) $(OBJS) $(EXTRALIBS) $(LDFLAGS) $(LIBS) -o $@ + $(LDSHARED) -install_name @rpath/$(DYNAME) -Wl,-rpath,@loader_path/ $(DYLIB_LDFLAGS) $(OBJS) $(EXTRALIBS) $(LDFLAGS) $(LIBS) -o $@ libwine.$(SOVERSION).dylib: libwine.$(VERSION).dylib $(RM) $@ && $(LN_S) libwine.$(VERSION).dylib $@

1 0

Jacek Caban : mshtml: Added IHTMLWindow2::close partial implementation.
by Alexandre Julliard April 15, 2013

April 15, 2013

Module: wine Branch: master Commit: e13cf82e61abcc2d904bfe13ec06bc2993c3e814 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e13cf82e61abcc2d904bfe13e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Apr 15 17:40:53 2013 +0200 mshtml: Added IHTMLWindow2::close partial implementation. --- dlls/mshtml/htmlwindow.c | 72 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 71 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 6cfa76b..113f33a 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -28,6 +28,7 @@ #include "mshtmdid.h" #include "shlguid.h" #include "shobjidl.h" +#include "exdispid.h" #define NO_SHLWAPI_REG #include "shlwapi.h" @@ -772,10 +773,79 @@ static HRESULT WINAPI HTMLWindow2_get_history(IHTMLWindow2 *iface, IOmHistory ** return S_OK; } +static BOOL notify_webbrowser_close(HTMLOuterWindow *window, HTMLDocumentObj *doc) +{ + IConnectionPointContainer *cp_container; + VARIANT_BOOL cancel = VARIANT_FALSE; + IEnumConnections *enum_conn; + VARIANT args[2]; + DISPPARAMS dp = {args, NULL, 2, 0}; + CONNECTDATA conn_data; + IConnectionPoint *cp; + IDispatch *disp; + ULONG fetched; + HRESULT hres; + + if(!doc->webbrowser) + return TRUE; + + hres = IUnknown_QueryInterface(doc->webbrowser, &IID_IConnectionPointContainer, (void**)&cp_container); + if(FAILED(hres)) + return TRUE; + + hres = IConnectionPointContainer_FindConnectionPoint(cp_container, &DIID_DWebBrowserEvents2, &cp); + IConnectionPointContainer_Release(cp_container); + if(FAILED(hres)) + return TRUE; + + hres = IConnectionPoint_EnumConnections(cp, &enum_conn); + IConnectionPoint_Release(cp); + if(FAILED(hres)) + return TRUE; + + while(!cancel) { + conn_data.pUnk = NULL; + conn_data.dwCookie = 0; + fetched = 0; + hres = IEnumConnections_Next(enum_conn, 1, &conn_data, &fetched); + if(hres != S_OK) + break; + + hres = IUnknown_QueryInterface(conn_data.pUnk, &IID_IDispatch, (void**)&disp); + IUnknown_Release(conn_data.pUnk); + if(FAILED(hres)) + continue; + + V_VT(args) = VT_BYREF|VT_BOOL; + V_BOOLREF(args) = &cancel; + V_VT(args+1) = VT_BOOL; + V_BOOL(args+1) = window->parent ? VARIANT_TRUE : VARIANT_FALSE; + hres = IDispatch_Invoke(disp, DISPID_WINDOWCLOSING, &IID_NULL, 0, DISPATCH_METHOD, &dp, NULL, NULL, NULL); + IDispatch_Release(disp); + if(FAILED(hres)) + cancel = VARIANT_FALSE; + } + + IEnumConnections_Release(enum_conn); + return !cancel; +} + static HRESULT WINAPI HTMLWindow2_close(IHTMLWindow2 *iface) { HTMLWindow *This = impl_from_IHTMLWindow2(iface); - FIXME("(%p)->()\n", This); + HTMLOuterWindow *window = This->outer_window; + + TRACE("(%p)\n", This); + + if(!window->doc_obj) { + FIXME("No document object\n"); + return E_FAIL; + } + + if(!notify_webbrowser_close(window, window->doc_obj)) + return S_OK; + + FIXME("default action not implemented\n"); return E_NOTIMPL; }

1 0

Stefan Dösinger : wined3d: Use the np2_fixup to find out if a RECT texture is used.
by Alexandre Julliard April 15, 2013

April 15, 2013

Module: wine Branch: master Commit: 547be26d90575a5013ea67025e940cb6f32119f4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=547be26d90575a5013ea67025… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sat Apr 13 16:37:15 2013 +0200 wined3d: Use the np2_fixup to find out if a RECT texture is used. --- dlls/wined3d/arb_program_shader.c | 18 ++++++++++-------- dlls/wined3d/glsl_shader.c | 9 +++++---- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 7e695fd..c3313ec 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1368,14 +1368,14 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD { struct wined3d_shader_buffer *buffer = ins->ctx->buffer; DWORD sampler_type = ins->ctx->reg_maps->sampler_type[sampler_idx]; - const struct wined3d_shader *shader = ins->ctx->shader; - const struct wined3d_texture *texture; const char *tex_type; BOOL np2_fixup = FALSE; - struct wined3d_device *device = shader->device; struct shader_arb_ctx_priv *priv = ins->ctx->backend_data; const char *mod; BOOL pshader = shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type); + const struct wined3d_shader *shader; + const struct wined3d_device *device; + const struct wined3d_gl_info *gl_info; /* D3D vertex shader sampler IDs are vertex samplers(0-3), not global d3d samplers */ if(!pshader) sampler_idx += MAX_FRAGMENT_SAMPLERS; @@ -1386,13 +1386,15 @@ static void shader_hw_sample(const struct wined3d_shader_instruction *ins, DWORD break; case WINED3DSTT_2D: - texture = device->stateBlock->state.textures[sampler_idx]; - if (texture && texture->target == GL_TEXTURE_RECTANGLE_ARB) - { + shader = ins->ctx->shader; + device = shader->device; + gl_info = &device->adapter->gl_info; + + if (pshader && priv->cur_ps_args->super.np2_fixup & (1 << sampler_idx) + && gl_info->supported[ARB_TEXTURE_RECTANGLE]) tex_type = "RECT"; - } else { + else tex_type = "2D"; - } if (shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type)) { if (priv->cur_np2fixup_info->super.active & (1 << sampler_idx)) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index a840a5d..ab32abe 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1058,7 +1058,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont if (reg_maps->sampler_type[i]) { BOOL shadow_sampler = version->type == WINED3D_SHADER_TYPE_PIXEL && (ps_args->shadow & (1 << i)); - const struct wined3d_texture *texture; + BOOL tex_rect; switch (reg_maps->sampler_type[i]) { @@ -1069,17 +1069,18 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont shader_addline(buffer, "uniform sampler1D %s_sampler%u;\n", prefix, i); break; case WINED3DSTT_2D: - texture = state->textures[i]; + tex_rect = version->type == WINED3D_SHADER_TYPE_PIXEL && (ps_args->np2_fixup & (1 << i)); + tex_rect = tex_rect && gl_info->supported[ARB_TEXTURE_RECTANGLE]; if (shadow_sampler) { - if (texture && texture->target == GL_TEXTURE_RECTANGLE_ARB) + if (tex_rect) shader_addline(buffer, "uniform sampler2DRectShadow %s_sampler%u;\n", prefix, i); else shader_addline(buffer, "uniform sampler2DShadow %s_sampler%u;\n", prefix, i); } else { - if (texture && texture->target == GL_TEXTURE_RECTANGLE_ARB) + if (tex_rect) shader_addline(buffer, "uniform sampler2DRect %s_sampler%u;\n", prefix, i); else shader_addline(buffer, "uniform sampler2D %s_sampler%u;\n", prefix, i);

1 0