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

Alexandre Julliard : gdi32: Take DPI awareness into account for the LOGPIXELSX/Y device caps.
by Alexandre Julliard April 12, 2018

April 12, 2018

Module: wine Branch: master Commit: 31967ef51df71994ab9b273353ea4937b8231b82 URL: https://source.winehq.org/git/wine.git/?a=commit;h=31967ef51df71994ab9b2733… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 12 13:25:16 2018 +0200 gdi32: Take DPI awareness into account for the LOGPIXELSX/Y device caps. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/driver.c | 5 +---- dlls/gdi32/gdi_private.h | 1 + dlls/gdi32/gdiobj.c | 18 ++++++++++++++++++ dlls/user32/tests/sysparams.c | 1 - 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/dlls/gdi32/driver.c b/dlls/gdi32/driver.c index fcf016b..c81a2e1 100644 --- a/dlls/gdi32/driver.c +++ b/dlls/gdi32/driver.c @@ -298,7 +298,6 @@ static BOOL nulldrv_GetCharWidth( PHYSDEV dev, UINT first, UINT last, INT *buffe static INT nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) { - static int screen_dpi; int bpp; switch (cap) @@ -351,9 +350,7 @@ static INT nulldrv_GetDeviceCaps( PHYSDEV dev, INT cap ) case SHADEBLENDCAPS: return 0; case COLORMGMTCAPS: return 0; case LOGPIXELSX: - case LOGPIXELSY: - if (!screen_dpi && !(screen_dpi = get_dpi())) screen_dpi = 96; - return screen_dpi; + case LOGPIXELSY: return get_system_dpi(); case NUMCOLORS: bpp = GetDeviceCaps( dev->hdc, BITSPIXEL ); return (bpp > 8) ? -1 : (1 << bpp); diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index cf904d6..c5e4231 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -304,6 +304,7 @@ extern BOOL GDI_dec_ref_count( HGDIOBJ handle ) DECLSPEC_HIDDEN; extern void GDI_hdc_using_object(HGDIOBJ obj, HDC hdc) DECLSPEC_HIDDEN; extern void GDI_hdc_not_using_object(HGDIOBJ obj, HDC hdc) DECLSPEC_HIDDEN; extern DWORD get_dpi(void) DECLSPEC_HIDDEN; +extern DWORD get_system_dpi(void) DECLSPEC_HIDDEN; /* mapping.c */ extern BOOL dp_to_lp( DC *dc, POINT *points, INT count ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index 16b82a3..db03f49 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -641,6 +641,24 @@ DWORD get_dpi(void) return 0; } +/****************************************************************************** + * get_system_dpi + * + * Get the system DPI, based on the DPI awareness mode. + */ +DWORD get_system_dpi(void) +{ + static UINT (WINAPI *pGetDpiForSystem)(void); + + if (!pGetDpiForSystem) + { + static const WCHAR user32W[] = {'u','s','e','r','3','2','.','d','l','l',0}; + HMODULE user = GetModuleHandleW( user32W ); + if (user) pGetDpiForSystem = (void *)GetProcAddress( user, "GetDpiForSystem" ); + } + return pGetDpiForSystem ? pGetDpiForSystem() : 96; +} + static HFONT create_scaled_font( const LOGFONTW *deffont ) { LOGFONTW lf; diff --git a/dlls/user32/tests/sysparams.c b/dlls/user32/tests/sysparams.c index 5b185b9..4d60ea5 100644 --- a/dlls/user32/tests/sysparams.c +++ b/dlls/user32/tests/sysparams.c @@ -3091,7 +3091,6 @@ static void test_dpi_aware(void) dpi = pGetDpiForSystem(); ok( dpi == USER_DEFAULT_SCREEN_DPI, "wrong dpi %u\n", dpi ); dpi = GetDeviceCaps( hdc, LOGPIXELSX ); - todo_wine_if (real_dpi != USER_DEFAULT_SCREEN_DPI) ok( dpi == USER_DEFAULT_SCREEN_DPI, "wrong dpi %u\n", dpi ); ok( !pIsProcessDPIAware(), "still aware\n" ); context = pGetThreadDpiAwarenessContext();

1 0

Alexandre Julliard : user32: Get the system DPI from the registry instead of from GDI.
by Alexandre Julliard April 12, 2018

April 12, 2018

Module: wine Branch: master Commit: 74a9c91964bcbc9a5d550c2059c07c307c227414 URL: https://source.winehq.org/git/wine.git/?a=commit;h=74a9c91964bcbc9a5d550c20… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 12 13:24:36 2018 +0200 user32: Get the system DPI from the registry instead of from GDI. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/sysparams.c | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 95a883d..7b948eb 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -612,6 +612,31 @@ static BOOL init_entry_string( struct sysparam_entry *entry, const WCHAR *str ) return init_entry( entry, str, (strlenW(str) + 1) * sizeof(WCHAR), REG_SZ ); } +static DWORD get_reg_dword( HKEY base, const WCHAR *key_name, const WCHAR *value_name ) +{ + HKEY key; + DWORD type, ret = 0, size = sizeof(ret); + + if (RegOpenKeyW( base, key_name, &key )) return 0; + if (RegQueryValueExW( key, value_name, NULL, &type, (void *)&ret, &size ) || type != REG_DWORD) + ret = 0; + RegCloseKey( key ); + return ret; +} + +/* get the system dpi from the registry */ +static UINT get_system_dpi(void) +{ + static const WCHAR dpi_key_name[] = {'C','o','n','t','r','o','l',' ','P','a','n','e','l','\\','D','e','s','k','t','o','p','\0'}; + static const WCHAR def_dpi_key_name[] = {'S','o','f','t','w','a','r','e','\\','F','o','n','t','s','\0'}; + static const WCHAR dpi_value_name[] = {'L','o','g','P','i','x','e','l','s','\0'}; + DWORD dpi; + + if ((dpi = get_reg_dword( HKEY_CURRENT_USER, dpi_key_name, dpi_value_name ))) return dpi; + if ((dpi = get_reg_dword( HKEY_CURRENT_CONFIG, def_dpi_key_name, dpi_value_name ))) return dpi; + return USER_DEFAULT_SCREEN_DPI; +} + HDC get_display_dc(void) { static const WCHAR DISPLAY[] = {'D','I','S','P','L','A','Y',0}; @@ -3065,12 +3090,7 @@ UINT WINAPI GetDpiForSystem(void) if (!IsProcessDPIAware()) return USER_DEFAULT_SCREEN_DPI; - if (!display_dpi) - { - HDC hdc = get_display_dc(); - display_dpi = GetDeviceCaps( hdc, LOGPIXELSY ); - release_display_dc( hdc ); - } + if (!display_dpi) display_dpi = get_system_dpi(); return display_dpi; }

1 0

Sergio Gómez Del Real : ole32: Reset CLSID of datacache so that automatic entry is re-created on load.
by Alexandre Julliard April 12, 2018

April 12, 2018

Module: wine Branch: master Commit: 33fd8787289d9c3da7325aed9b576ae2dadaa040 URL: https://source.winehq.org/git/wine.git/?a=commit;h=33fd8787289d9c3da7325aed… Author: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Date: Wed Apr 11 11:45:17 2018 -0500 ole32: Reset CLSID of datacache so that automatic entry is re-created on load. Signed-off-by: Sergio Gómez Del Real <sdelreal(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/datacache.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ole32/datacache.c b/dlls/ole32/datacache.c index b98c448..b72b8ff 100644 --- a/dlls/ole32/datacache.c +++ b/dlls/ole32/datacache.c @@ -1843,6 +1843,7 @@ static HRESULT WINAPI DataCache_Load( IPersistStorage *iface, IStorage *stg ) LIST_FOR_EACH_ENTRY_SAFE( entry, cursor2, &This->cache_list, DataCacheEntry, entry ) DataCacheEntry_Destroy( This, entry ); + This->clsid = CLSID_NULL; ReadClassStg( stg, &clsid ); hr = create_automatic_entry( This, &clsid );

1 0

Zebediah Figura : rpcrt4: We don't need to marshal type 0.
by Alexandre Julliard April 12, 2018

April 12, 2018

Module: wine Branch: master Commit: c3ebd20283b7950727e04901013011c2a4d78b12 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3ebd20283b7950727e04901… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 10 20:30:28 2018 -0500 rpcrt4: We don't need to marshal type 0. Because it's not a type, but the lack of one. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/ndr_marshall.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index cbe8223..6356fb9 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -5753,7 +5753,8 @@ static unsigned char *union_arm_marshall(PMIDL_STUB_MESSAGE pStubMsg, unsigned c m(pStubMsg, pMemory, desc); } } - else FIXME("no marshaller for embedded type %02x\n", *desc); + else if (*desc) + FIXME("no marshaller for embedded type %02x\n", *desc); } return NULL; } @@ -5826,7 +5827,8 @@ static unsigned char *union_arm_unmarshall(PMIDL_STUB_MESSAGE pStubMsg, m(pStubMsg, ppMemory, desc, fMustAlloc); } } - else FIXME("no marshaller for embedded type %02x\n", *desc); + else if (*desc) + FIXME("no marshaller for embedded type %02x\n", *desc); } return NULL; } @@ -5884,7 +5886,8 @@ static void union_arm_buffer_size(PMIDL_STUB_MESSAGE pStubMsg, m(pStubMsg, pMemory, desc); } } - else FIXME("no buffersizer for embedded type %02x\n", *desc); + else if (*desc) + FIXME("no buffersizer for embedded type %02x\n", *desc); } } @@ -5932,7 +5935,8 @@ static ULONG union_arm_memory_size(PMIDL_STUB_MESSAGE pStubMsg, return m(pStubMsg, desc); } } - else FIXME("no marshaller for embedded type %02x\n", *desc); + else if (*desc) + FIXME("no marshaller for embedded type %02x\n", *desc); } TRACE("size %d\n", size);

1 0

Zebediah Figura : widl: Size of an encapsulated union doesn' t include the tag.
by Alexandre Julliard April 12, 2018

April 12, 2018

Module: wine Branch: master Commit: 947ff4ba46ff140afd3deccbb3de304778cda723 URL: https://source.winehq.org/git/wine.git/?a=commit;h=947ff4ba46ff140afd3deccb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Apr 10 20:30:29 2018 -0500 widl: Size of an encapsulated union doesn't include the tag. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/typegen.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/widl/typegen.c b/tools/widl/typegen.c index 27855cc..9f62589 100644 --- a/tools/widl/typegen.c +++ b/tools/widl/typegen.c @@ -3248,6 +3248,7 @@ static unsigned int write_union_tfs(FILE *file, const attr_list_t *attrs, unsigned int nbranch = 0; type_t *deftype = NULL; short nodeftype = 0xffff; + unsigned int dummy; var_t *f; if (processed(type) && @@ -3256,10 +3257,10 @@ static unsigned int write_union_tfs(FILE *file, const attr_list_t *attrs, guard_rec(type); - size = type_memsize(type); - fields = type_union_get_cases(type); + size = union_memsize(fields, &dummy); + if (fields) LIST_FOR_EACH_ENTRY(f, fields, var_t, entry) { expr_list_t *cases = get_attrp(f->attrs, ATTR_CASE);

1 0

Henri Verbeet : wined3d: Select the correct texture level in draw_textured_quad().
by Alexandre Julliard April 12, 2018

April 12, 2018

Module: wine Branch: master Commit: e2a0a939bad89a502696618af3f235d14b0bdd76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e2a0a939bad89a502696618a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 12 16:46:10 2018 +0430 wined3d: Select the correct texture level in draw_textured_quad(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index c01bd32..6c7d6df 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -173,12 +173,14 @@ void draw_textured_quad(struct wined3d_texture *texture, unsigned int sub_resour { const struct wined3d_gl_info *gl_info = context->gl_info; struct blt_info info; + unsigned int level; texture2d_get_blt_info(texture, sub_resource_idx, src_rect, &info); gl_info->gl_ops.gl.p_glEnable(info.bind_target); checkGLcall("glEnable(bind_target)"); + level = sub_resource_idx % texture->level_count; context_bind_texture(context, info.bind_target, texture->texture_rgb.name); /* Filtering for StretchRect */ @@ -191,6 +193,8 @@ void draw_textured_quad(struct wined3d_texture *texture, unsigned int sub_resour gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); if (context->gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_SRGB_DECODE_EXT, GL_SKIP_DECODE_EXT); + gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_BASE_LEVEL, level); + gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_MAX_LEVEL, level); gl_info->gl_ops.gl.p_glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); checkGLcall("glTexEnvi"); @@ -209,6 +213,8 @@ void draw_textured_quad(struct wined3d_texture *texture, unsigned int sub_resour gl_info->gl_ops.gl.p_glVertex2i(dst_rect->right, dst_rect->bottom); gl_info->gl_ops.gl.p_glEnd(); + gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_MAX_LEVEL, texture->level_count - 1); + /* Unbind the texture */ context_bind_texture(context, info.bind_target, 0); @@ -218,6 +224,7 @@ void draw_textured_quad(struct wined3d_texture *texture, unsigned int sub_resour texture->texture_rgb.sampler_desc.min_filter = WINED3D_TEXF_POINT; texture->texture_rgb.sampler_desc.mip_filter = WINED3D_TEXF_NONE; texture->texture_rgb.sampler_desc.srgb_decode = FALSE; + texture->texture_rgb.base_level = level; } /* Works correctly only for <= 4 bpp formats. */

1 0

Sebastian Lackner : rpcrt4: Hold CS while iterating through protseqs list.
by Alexandre Julliard April 12, 2018

April 12, 2018

Module: wine Branch: master Commit: ce2080ac6059ac7ccdd252f2cdcb9c6dbd65052d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce2080ac6059ac7ccdd252f2… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Mon Apr 9 02:18:00 2018 +0000 rpcrt4: Hold CS while iterating through protseqs list. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpc_server.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index c350c59..d1b5d64 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -806,8 +806,10 @@ static RPC_STATUS RPCRT4_stop_listen(BOOL auto_listen) if (stop_listen) { RpcServerProtseq *cps; + EnterCriticalSection(&server_cs); LIST_FOR_EACH_ENTRY(cps, &protseqs, RpcServerProtseq, entry) RPCRT4_sync_with_server_thread(cps); + LeaveCriticalSection(&server_cs); } if (!auto_listen)

1 0

Alistair Leslie-Hughes : fltmgr.sys: Implement FltGetRoutineAddress.
by Alexandre Julliard April 12, 2018

April 12, 2018

Module: wine Branch: master Commit: a7b33a6a428c9920d8130819373b1554bbd206c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a7b33a6a428c9920d8130819… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Apr 4 23:18:22 2018 +0000 fltmgr.sys: Implement FltGetRoutineAddress. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fltmgr.sys/fltmgr.sys.spec | 2 +- dlls/fltmgr.sys/main.c | 15 +++++++++++++++ include/ddk/fltkernel.h | 1 + 3 files changed, 17 insertions(+), 1 deletion(-) diff --git a/dlls/fltmgr.sys/fltmgr.sys.spec b/dlls/fltmgr.sys/fltmgr.sys.spec index c217ad3..7b1ba29 100644 --- a/dlls/fltmgr.sys/fltmgr.sys.spec +++ b/dlls/fltmgr.sys/fltmgr.sys.spec @@ -79,7 +79,7 @@ @ stub FltGetLowerInstance @ stub FltGetRequestorProcess @ stub FltGetRequestorProcessId -@ stub FltGetRoutineAddress +@ stdcall FltGetRoutineAddress(str) @ stub FltGetStreamContext @ stub FltGetStreamHandleContext @ stub FltGetSwappedBufferMdlAddress diff --git a/dlls/fltmgr.sys/main.c b/dlls/fltmgr.sys/main.c index 2ffde97..16ca284 100644 --- a/dlls/fltmgr.sys/main.c +++ b/dlls/fltmgr.sys/main.c @@ -64,3 +64,18 @@ void WINAPI FltUnregisterFilter( PFLT_FILTER filter ) { FIXME( "(%p): stub\n", filter ); } + +void* WINAPI FltGetRoutineAddress(LPCSTR name) +{ + static const WCHAR fltmgrW[] = {'f','l','t','m','g','r','.','s','y','s',0}; + HMODULE mod = GetModuleHandleW(fltmgrW); + void *func; + + func = GetProcAddress(mod, name); + if (func) + TRACE( "%s -> %p\n", debugstr_a(name), func ); + else + FIXME( "%s not found\n", debugstr_a(name) ); + + return func; +} diff --git a/include/ddk/fltkernel.h b/include/ddk/fltkernel.h index 00b7dc5..8ebebfa 100644 --- a/include/ddk/fltkernel.h +++ b/include/ddk/fltkernel.h @@ -654,6 +654,7 @@ typedef struct _FLT_REGISTRATION } FLT_REGISTRATION, *PFLT_REGISTRATION; +void* WINAPI FltGetRoutineAddress(LPCSTR name); NTSTATUS WINAPI FltRegisterFilter(PDRIVER_OBJECT, const FLT_REGISTRATION *, PFLT_FILTER *); NTSTATUS WINAPI FltStartFiltering(PFLT_FILTER); void WINAPI FltUnregisterFilter(PFLT_FILTER);

1 0

Matteo Bruni : wined3d: Move draw_textured_quad() to context.c.
by Alexandre Julliard April 12, 2018

April 12, 2018

Module: wine Branch: master Commit: 9100fce2ba65dff71fbe009b92e3b86d51ce87c3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9100fce2ba65dff71fbe009b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Apr 12 16:46:13 2018 +0430 wined3d: Move draw_textured_quad() to context.c. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/context.c | 60 ++++++++++++ dlls/wined3d/surface.c | 195 +------------------------------------- dlls/wined3d/texture.c | 124 ++++++++++++++++++++++++ dlls/wined3d/wined3d_private.h | 15 ++- 5 files changed, 197 insertions(+), 199 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9100fce2ba65dff71fbe…

1 0

Matteo Bruni : wined3d: Introduce a function for drawing shaded quads.
by Alexandre Julliard April 12, 2018

April 12, 2018

Module: wine Branch: master Commit: f1ad8bab5184b29eebf7cc793854632596500242 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f1ad8bab5184b29eebf7cc79… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Apr 12 16:46:14 2018 +0430 wined3d: Introduce a function for drawing shaded quads. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 104 ++++++++++++++++++++++++++++++++--------- dlls/wined3d/wined3d_private.h | 3 ++ 2 files changed, 86 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index ccf7777..e85e20d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4987,6 +4987,88 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s context_release(context); } +static void apply_texture_blit_state(const struct wined3d_gl_info *gl_info, struct gl_texture *texture, + GLenum target, unsigned int level, enum wined3d_texture_filter_type filter) +{ + gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_MAG_FILTER, wined3d_gl_mag_filter(filter)); + gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_MIN_FILTER, + wined3d_gl_min_mip_filter(filter, WINED3D_TEXF_NONE)); + gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); + gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); + if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) + gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_SRGB_DECODE_EXT, GL_SKIP_DECODE_EXT); + gl_info->gl_ops.gl.p_glTexParameteri(target, GL_TEXTURE_BASE_LEVEL, level); + + /* We changed the filtering settings on the texture. Make sure they get + * reset on subsequent draws. */ + texture->sampler_desc.mag_filter = WINED3D_TEXF_POINT; + texture->sampler_desc.min_filter = WINED3D_TEXF_POINT; + texture->sampler_desc.mip_filter = WINED3D_TEXF_NONE; + texture->sampler_desc.address_u = WINED3D_TADDRESS_CLAMP; + texture->sampler_desc.address_v = WINED3D_TADDRESS_CLAMP; + texture->sampler_desc.srgb_decode = FALSE; + texture->base_level = level; +} + +/* Context activation is done by the caller. */ +void context_draw_shaded_quad(struct wined3d_context *context, struct wined3d_texture *texture, + unsigned int sub_resource_idx, const RECT *src_rect, const RECT *dst_rect, + enum wined3d_texture_filter_type filter) +{ + const struct wined3d_gl_info *gl_info = context->gl_info; + struct wined3d_blt_info info; + unsigned int level, w, h, i; + SIZE dst_size; + struct blit_vertex + { + float x, y; + struct wined3d_vec3 texcoord; + } + quad[4]; + + texture2d_get_blt_info(texture, sub_resource_idx, src_rect, &info); + + level = sub_resource_idx % texture->level_count; + context_bind_texture(context, info.bind_target, texture->texture_rgb.name); + apply_texture_blit_state(gl_info, &texture->texture_rgb, info.bind_target, level, filter); + gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_MAX_LEVEL, level); + + context_get_rt_size(context, &dst_size); + w = dst_size.cx; + h = dst_size.cy; + + quad[0].x = dst_rect->left * 2.0f / w - 1.0f; + quad[0].y = dst_rect->top * 2.0f / h - 1.0f; + quad[0].texcoord = info.texcoords[0]; + + quad[1].x = dst_rect->right * 2.0f / w - 1.0f; + quad[1].y = dst_rect->top * 2.0f / h - 1.0f; + quad[1].texcoord = info.texcoords[1]; + + quad[2].x = dst_rect->left * 2.0f / w - 1.0f; + quad[2].y = dst_rect->bottom * 2.0f / h - 1.0f; + quad[2].texcoord = info.texcoords[2]; + + quad[3].x = dst_rect->right * 2.0f / w - 1.0f; + quad[3].y = dst_rect->bottom * 2.0f / h - 1.0f; + quad[3].texcoord = info.texcoords[3]; + + /* Draw a quad. */ + gl_info->gl_ops.gl.p_glBegin(GL_TRIANGLE_STRIP); + + for (i = 0; i < ARRAY_SIZE(quad); ++i) + { + GL_EXTCALL(glVertexAttrib3fv(1, &quad[i].texcoord.x)); + GL_EXTCALL(glVertexAttrib2fv(0, &quad[i].x)); + } + + gl_info->gl_ops.gl.p_glEnd(); + checkGLcall("draw"); + + gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_MAX_LEVEL, texture->level_count - 1); + context_bind_texture(context, info.bind_target, 0); +} + /* Context activation is done by the caller. */ void context_draw_textured_quad(struct wined3d_context *context, struct wined3d_texture *texture, unsigned int sub_resource_idx, const RECT *src_rect, const RECT *dst_rect, @@ -5003,17 +5085,7 @@ void context_draw_textured_quad(struct wined3d_context *context, struct wined3d_ level = sub_resource_idx % texture->level_count; context_bind_texture(context, info.bind_target, texture->texture_rgb.name); - - gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_MAG_FILTER, wined3d_gl_mag_filter(filter)); - checkGLcall("glTexParameteri"); - gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_MIN_FILTER, - wined3d_gl_min_mip_filter(filter, WINED3D_TEXF_NONE)); - checkGLcall("glTexParameteri"); - gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE); - gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE); - if (gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) - gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_SRGB_DECODE_EXT, GL_SKIP_DECODE_EXT); - gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_BASE_LEVEL, level); + apply_texture_blit_state(gl_info, &texture->texture_rgb, info.bind_target, level, filter); gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_MAX_LEVEL, level); gl_info->gl_ops.gl.p_glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); checkGLcall("glTexEnvi"); @@ -5035,14 +5107,4 @@ void context_draw_textured_quad(struct wined3d_context *context, struct wined3d_ gl_info->gl_ops.gl.p_glTexParameteri(info.bind_target, GL_TEXTURE_MAX_LEVEL, texture->level_count - 1); context_bind_texture(context, info.bind_target, 0); - - /* We changed the filtering settings on the texture. Make sure they get - * reset on subsequent draws. */ - texture->texture_rgb.sampler_desc.mag_filter = WINED3D_TEXF_POINT; - texture->texture_rgb.sampler_desc.min_filter = WINED3D_TEXF_POINT; - texture->texture_rgb.sampler_desc.mip_filter = WINED3D_TEXF_NONE; - texture->texture_rgb.sampler_desc.address_u = WINED3D_TADDRESS_CLAMP; - texture->texture_rgb.sampler_desc.address_v = WINED3D_TADDRESS_CLAMP; - texture->texture_rgb.sampler_desc.srgb_decode = FALSE; - texture->texture_rgb.base_level = level; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8e2f7ab..1e2b6ac 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2154,6 +2154,9 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, stru const struct wined3d_format *ds_format) DECLSPEC_HIDDEN; HGLRC context_create_wgl_attribs(const struct wined3d_gl_info *gl_info, HDC hdc, HGLRC share_ctx) DECLSPEC_HIDDEN; void context_destroy(struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN; +void context_draw_shaded_quad(struct wined3d_context *context, struct wined3d_texture *texture, + unsigned int sub_resource_idx, const RECT *src_rect, const RECT *dst_rect, + enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; void context_draw_textured_quad(struct wined3d_context *context, struct wined3d_texture *texture, unsigned int sub_resource_idx, const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN;

1 0