January 2016 - Wine-Commits

Hugh McMaster : kernel32: Implement the TRUE pathway of GetCurrentConsoleFont.
by Alexandre Julliard Jan. 27, 2016

Jan. 27, 2016

Module: wine Branch: master Commit: 2c5756347bc4e9abcb656a7d1e001f60415b78b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c5756347bc4e9abcb656a7d1… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Wed Jan 27 14:55:16 2016 +1100 kernel32: Implement the TRUE pathway of GetCurrentConsoleFont. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/console.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/console.c b/dlls/kernel32/console.c index 4767fb2..b86cd8e 100644 --- a/dlls/kernel32/console.c +++ b/dlls/kernel32/console.c @@ -3267,20 +3267,21 @@ BOOL WINAPI GetCurrentConsoleFont(HANDLE hConsole, BOOL maxwindow, LPCONSOLE_FON memset(fontinfo, 0, sizeof(CONSOLE_FONT_INFO)); - if (maxwindow) - { - FIXME(": (%p, %d, %p) stub!\n", hConsole, maxwindow, fontinfo); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; - } - SERVER_START_REQ(get_console_output_info) { req->handle = console_handle_unmap(hConsole); if ((ret = !wine_server_call_err(req))) { - fontinfo->dwFontSize.X = reply->win_right - reply->win_left + 1; - fontinfo->dwFontSize.Y = reply->win_bottom - reply->win_top + 1; + if (maxwindow) + { + fontinfo->dwFontSize.X = min(reply->width, reply->max_width); + fontinfo->dwFontSize.Y = min(reply->height, reply->max_height); + } + else + { + fontinfo->dwFontSize.X = reply->win_right - reply->win_left + 1; + fontinfo->dwFontSize.Y = reply->win_bottom - reply->win_top + 1; + } } } SERVER_END_REQ;

1 0

Matteo Bruni : d3d9: Return one quality level when the multisampling type isn't available.
by Alexandre Julliard Jan. 27, 2016

Jan. 27, 2016

Module: wine Branch: master Commit: 4c1d6d27d06b9ea0e4cb74182709c54f1b7f00de URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c1d6d27d06b9ea0e4cb74182… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jan 26 22:51:33 2016 +0100 d3d9: Return one quality level when the multisampling type isn't available. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/directx.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index fd6bc8c..fb096c4 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -309,6 +309,8 @@ static HRESULT WINAPI d3d9_CheckDeviceMultiSampleType(IDirect3D9Ex *iface, UINT hr = wined3d_check_device_multisample_type(d3d9->wined3d, adapter, device_type, wined3dformat_from_d3dformat(format), windowed, multisample_type, levels); wined3d_mutex_unlock(); + if (hr == WINED3DERR_NOTAVAILABLE && levels) + *levels = 1; return hr; }

1 0

Matteo Bruni : wined3d: Limit the number of WINED3D_MULTISAMPLE_NON_MASKABLE quality levels reported.
by Alexandre Julliard Jan. 27, 2016

Jan. 27, 2016

Module: wine Branch: master Commit: a25c47f59a600d7da819869b643b0b17720c07c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a25c47f59a600d7da819869b6… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jan 26 22:51:29 2016 +0100 wined3d: Limit the number of WINED3D_MULTISAMPLE_NON_MASKABLE quality levels reported. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 +- dlls/wined3d/surface.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 23fdd89..2fe9597 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4430,7 +4430,7 @@ HRESULT CDECL wined3d_check_device_multisample_type(const struct wined3d *wined3 if (quality_levels) { if (multisample_type == WINED3D_MULTISAMPLE_NON_MASKABLE) - *quality_levels = gl_info->limits.samples; + *quality_levels = wined3d_log2i(gl_info->limits.samples); else *quality_levels = 1; } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 715b4ac..70b9d44 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2864,7 +2864,7 @@ static void surface_prepare_rb(struct wined3d_surface *surface, const struct win * AMD has a similar feature called Enhanced Quality Anti-Aliasing (EQAA), * but it does not have an equivalent OpenGL extension. */ if (surface->resource.multisample_type == WINED3D_MULTISAMPLE_NON_MASKABLE) - samples = surface->resource.multisample_quality; + samples = 1u << (surface->resource.multisample_quality + 1); else samples = surface->resource.multisample_type;

1 0

Józef Kucia : wined3d: Recognize SM4 not opcode.
by Alexandre Julliard Jan. 27, 2016

Jan. 27, 2016

Module: wine Branch: master Commit: 764c87d531d2b000c21698c8f2bbe0d1355b1550 URL: http://source.winehq.org/git/wine.git/?a=commit;h=764c87d531d2b000c21698c8f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 26 17:49:14 2016 +0100 wined3d: Recognize SM4 not opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 8347802..5dfa92f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5290,6 +5290,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_MUL */ shader_hw_map2gl, /* WINED3DSIH_NE */ NULL, /* WINED3DSIH_NOP */ shader_hw_nop, + /* WINED3DSIH_NOT */ NULL, /* WINED3DSIH_NRM */ shader_hw_nrm, /* WINED3DSIH_OR */ NULL, /* WINED3DSIH_PHASE */ shader_hw_nop, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c8ba074..4be81a5 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8050,6 +8050,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_MUL */ shader_glsl_binop, /* WINED3DSIH_NE */ shader_glsl_relop, /* WINED3DSIH_NOP */ shader_glsl_nop, + /* WINED3DSIH_NOT */ NULL, /* WINED3DSIH_NRM */ shader_glsl_nrm, /* WINED3DSIH_OR */ shader_glsl_binop, /* WINED3DSIH_PHASE */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index f2c3e74..5730cef 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -118,6 +118,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_MUL */ "mul", /* WINED3DSIH_NE */ "ne", /* WINED3DSIH_NOP */ "nop", + /* WINED3DSIH_NOT */ "not", /* WINED3DSIH_NRM */ "nrm", /* WINED3DSIH_OR */ "or", /* WINED3DSIH_PHASE */ "phase", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index d800bc8..b6e3c1e 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -125,6 +125,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_MOVC = 0x37, WINED3D_SM4_OP_MUL = 0x38, WINED3D_SM4_OP_NE = 0x39, + WINED3D_SM4_OP_NOT = 0x3b, WINED3D_SM4_OP_OR = 0x3c, WINED3D_SM4_OP_RESINFO = 0x3d, WINED3D_SM4_OP_RET = 0x3e, @@ -306,6 +307,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_MOVC, WINED3DSIH_MOVC, "F", "UFF"}, {WINED3D_SM4_OP_MUL, WINED3DSIH_MUL, "F", "FF"}, {WINED3D_SM4_OP_NE, WINED3DSIH_NE, "U", "FF"}, + {WINED3D_SM4_OP_NOT, WINED3DSIH_NOT, "U", "U"}, {WINED3D_SM4_OP_OR, WINED3DSIH_OR, "U", "UU"}, {WINED3D_SM4_OP_RESINFO, WINED3DSIH_RESINFO, "F", "IR"}, {WINED3D_SM4_OP_RET, WINED3DSIH_RET, "", ""}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 191733a..5558c70 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -535,6 +535,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_MUL, WINED3DSIH_NE, WINED3DSIH_NOP, + WINED3DSIH_NOT, WINED3DSIH_NRM, WINED3DSIH_OR, WINED3DSIH_PHASE,

1 0

Józef Kucia : wined3d: Recognize SM4 else opcode.
by Alexandre Julliard Jan. 27, 2016

Jan. 27, 2016

Module: wine Branch: master Commit: 0e3e566ddefcb7e3003232e2a5d6120c46bae659 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e3e566ddefcb7e3003232e2a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 26 17:49:10 2016 +0100 wined3d: Recognize SM4 else opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/shader_sm4.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 35f6201..d800bc8 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -91,6 +91,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_DP2 = 0x0f, WINED3D_SM4_OP_DP3 = 0x10, WINED3D_SM4_OP_DP4 = 0x11, + WINED3D_SM4_OP_ELSE = 0x12, WINED3D_SM4_OP_EMIT = 0x13, WINED3D_SM4_OP_ENDIF = 0x15, WINED3D_SM4_OP_ENDLOOP = 0x16, @@ -271,6 +272,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_DP2, WINED3DSIH_DP2, "F", "FF"}, {WINED3D_SM4_OP_DP3, WINED3DSIH_DP3, "F", "FF"}, {WINED3D_SM4_OP_DP4, WINED3DSIH_DP4, "F", "FF"}, + {WINED3D_SM4_OP_ELSE, WINED3DSIH_ELSE, "", ""}, {WINED3D_SM4_OP_EMIT, WINED3DSIH_EMIT, "", ""}, {WINED3D_SM4_OP_ENDIF, WINED3DSIH_ENDIF, "", ""}, {WINED3D_SM4_OP_ENDLOOP, WINED3DSIH_ENDLOOP, "", ""},

1 0

Henri Verbeet : wined3d: Rename the texture creation flags to WINED3D_TEXTURE_CREATE_*.
by Alexandre Julliard Jan. 27, 2016

Jan. 27, 2016

Module: wine Branch: master Commit: ad11f38db92b425e8df84dc4f7ea58366b73e32a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad11f38db92b425e8df84dc4f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 27 00:06:25 2016 +0100 wined3d: Rename the texture creation flags to WINED3D_TEXTURE_CREATE_*. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 10 +++++----- dlls/d3d8/texture.c | 12 ++++++------ dlls/d3d9/device.c | 14 +++++++------- dlls/d3d9/texture.c | 12 ++++++------ dlls/ddraw/ddraw.c | 2 +- dlls/ddraw/surface.c | 7 ++++--- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/surface.c | 7 ++++--- dlls/wined3d/texture.c | 8 ++++---- include/wine/wined3d.h | 8 ++++---- 10 files changed, 43 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ad11f38db92b425e8df84…

1 0

Henri Verbeet : wined3d: Rename WINED3D_RTYPE_VOLUME_TEXTURE to WINED3D_RTYPE_TEXTURE_3D.
by Alexandre Julliard Jan. 27, 2016

Jan. 27, 2016

Module: wine Branch: master Commit: cf899ac2670b41ae596289ef9336c13d6dee86c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf899ac2670b41ae596289ef9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 27 00:06:24 2016 +0100 wined3d: Rename WINED3D_RTYPE_VOLUME_TEXTURE to WINED3D_RTYPE_TEXTURE_3D. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/texture.c | 2 +- dlls/d3d8/directx.c | 2 +- dlls/d3d8/texture.c | 2 +- dlls/d3d9/directx.c | 2 +- dlls/d3d9/texture.c | 2 +- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/directx.c | 2 +- dlls/wined3d/resource.c | 12 ++++++------ dlls/wined3d/texture.c | 8 ++++---- dlls/wined3d/utils.c | 2 +- include/wine/wined3d.h | 6 +++--- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/d3d11/texture.c b/dlls/d3d11/texture.c index 78aac0a..a73f3fc 100644 --- a/dlls/d3d11/texture.c +++ b/dlls/d3d11/texture.c @@ -914,7 +914,7 @@ static HRESULT d3d_texture3d_init(struct d3d_texture3d *texture, struct d3d_devi wined3d_private_store_init(&texture->private_store); texture->desc = *desc; - wined3d_desc.resource_type = WINED3D_RTYPE_VOLUME_TEXTURE; + wined3d_desc.resource_type = WINED3D_RTYPE_TEXTURE_3D; wined3d_desc.format = wined3dformat_from_dxgi_format(desc->Format); wined3d_desc.multisample_type = WINED3D_MULTISAMPLE_NONE; wined3d_desc.multisample_quality = 0; diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 2db6488..0ca0dd3 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -254,7 +254,7 @@ static HRESULT WINAPI d3d8_CheckDeviceFormat(IDirect3D8 *iface, UINT adapter, D3 break; case D3DRTYPE_VOLUMETEXTURE: - wined3d_rtype = WINED3D_RTYPE_VOLUME_TEXTURE; + wined3d_rtype = WINED3D_RTYPE_TEXTURE_3D; break; case D3DRTYPE_CUBETEXTURE: diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index f756e01..96a34dc 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -1246,7 +1246,7 @@ HRESULT volumetexture_init(struct d3d8_texture *texture, struct d3d8_device *dev d3d8_resource_init(&texture->resource); list_init(&texture->rtv_list); - desc.resource_type = WINED3D_RTYPE_VOLUME_TEXTURE; + desc.resource_type = WINED3D_RTYPE_TEXTURE_3D; desc.format = wined3dformat_from_d3dformat(format); desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index 1d759c4..fd6bc8c 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -270,7 +270,7 @@ static HRESULT WINAPI d3d9_CheckDeviceFormat(IDirect3D9Ex *iface, UINT adapter, break; case D3DRTYPE_VOLUMETEXTURE: - wined3d_rtype = WINED3D_RTYPE_VOLUME_TEXTURE; + wined3d_rtype = WINED3D_RTYPE_TEXTURE_3D; break; case D3DRTYPE_CUBETEXTURE: diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index ebe5e50..878a4ae 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1386,7 +1386,7 @@ HRESULT volumetexture_init(struct d3d9_texture *texture, struct d3d9_device *dev d3d9_resource_init(&texture->resource); list_init(&texture->rtv_list); - desc.resource_type = WINED3D_RTYPE_VOLUME_TEXTURE; + desc.resource_type = WINED3D_RTYPE_TEXTURE_3D; desc.format = wined3dformat_from_d3dformat(format); desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index dfbec0f..bb910b3 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3676,7 +3676,7 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, break; } - case WINED3D_RTYPE_VOLUME_TEXTURE: + case WINED3D_RTYPE_TEXTURE_3D: { for (i = 0; i < level_count; ++i) { @@ -4971,7 +4971,7 @@ void device_resource_released(struct wined3d_device *device, struct wined3d_reso break; case WINED3D_RTYPE_TEXTURE_2D: - case WINED3D_RTYPE_VOLUME_TEXTURE: + case WINED3D_RTYPE_TEXTURE_3D: for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) { struct wined3d_texture *texture = wined3d_texture_from_resource(resource); diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index cc6e5e1..23fdd89 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4662,7 +4662,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, UINT ad } break; - case WINED3D_RTYPE_VOLUME_TEXTURE: + case WINED3D_RTYPE_TEXTURE_3D: case WINED3D_RTYPE_VOLUME: format_flags |= WINED3DFMT_FLAG_TEXTURE; allowed_usage = WINED3DUSAGE_DYNAMIC diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 4ebcd04..73250ec 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -93,12 +93,12 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * } resource_types[] = { - {WINED3D_RTYPE_BUFFER, 0, WINED3D_GL_RES_TYPE_BUFFER}, - {WINED3D_RTYPE_TEXTURE_2D, 0, WINED3D_GL_RES_TYPE_TEX_2D}, - {WINED3D_RTYPE_TEXTURE_2D, 0, WINED3D_GL_RES_TYPE_TEX_RECT}, - {WINED3D_RTYPE_TEXTURE_2D, 0, WINED3D_GL_RES_TYPE_RB}, - {WINED3D_RTYPE_TEXTURE_2D, WINED3DUSAGE_LEGACY_CUBEMAP, WINED3D_GL_RES_TYPE_TEX_CUBE}, - {WINED3D_RTYPE_VOLUME_TEXTURE, 0, WINED3D_GL_RES_TYPE_TEX_3D}, + {WINED3D_RTYPE_BUFFER, 0, WINED3D_GL_RES_TYPE_BUFFER}, + {WINED3D_RTYPE_TEXTURE_2D, 0, WINED3D_GL_RES_TYPE_TEX_2D}, + {WINED3D_RTYPE_TEXTURE_2D, 0, WINED3D_GL_RES_TYPE_TEX_RECT}, + {WINED3D_RTYPE_TEXTURE_2D, 0, WINED3D_GL_RES_TYPE_RB}, + {WINED3D_RTYPE_TEXTURE_2D, WINED3DUSAGE_LEGACY_CUBEMAP, WINED3D_GL_RES_TYPE_TEX_CUBE}, + {WINED3D_RTYPE_TEXTURE_3D, 0, WINED3D_GL_RES_TYPE_TEX_3D}, }; resource_check_usage(usage); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 5eea7d2..12d57b8 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -53,7 +53,7 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc if ((desc->format == WINED3DFMT_DXT1 || desc->format == WINED3DFMT_DXT2 || desc->format == WINED3DFMT_DXT3 || desc->format == WINED3DFMT_DXT4 || desc->format == WINED3DFMT_DXT5) && !(format->flags[WINED3D_GL_RES_TYPE_TEX_2D] & WINED3DFMT_FLAG_TEXTURE) - && desc->resource_type != WINED3D_RTYPE_VOLUME_TEXTURE && !once++) + && desc->resource_type != WINED3D_RTYPE_TEXTURE_3D && !once++) ERR_(winediag)("The application tried to create a DXTn texture, but the driver does not support them.\n"); WARN("Failed to initialize resource, returning %#x\n", hr); @@ -610,9 +610,9 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT return WINED3DERR_INVALIDCALL; } - if (texture->resource.type == WINED3D_RTYPE_VOLUME_TEXTURE) + if (texture->resource.type == WINED3D_RTYPE_TEXTURE_3D) { - WARN("Not supported on volume textures.\n"); + WARN("Not supported on 3D textures.\n"); return WINED3DERR_INVALIDCALL; } @@ -1457,7 +1457,7 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct hr = texture_init(object, desc, level_count, surface_flags, device, parent, parent_ops); break; - case WINED3D_RTYPE_VOLUME_TEXTURE: + case WINED3D_RTYPE_TEXTURE_3D: hr = volumetexture_init(object, desc, level_count, device, parent, parent_ops); break; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index a4829b6..5eb1696 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3205,9 +3205,9 @@ const char *debug_d3dresourcetype(enum wined3d_resource_type resource_type) #define WINED3D_TO_STR(x) case x: return #x WINED3D_TO_STR(WINED3D_RTYPE_SURFACE); WINED3D_TO_STR(WINED3D_RTYPE_VOLUME); - WINED3D_TO_STR(WINED3D_RTYPE_VOLUME_TEXTURE); WINED3D_TO_STR(WINED3D_RTYPE_BUFFER); WINED3D_TO_STR(WINED3D_RTYPE_TEXTURE_2D); + WINED3D_TO_STR(WINED3D_RTYPE_TEXTURE_3D); #undef WINED3D_TO_STR default: FIXME("Unrecognized resource type %#x.\n", resource_type); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 0190d12..79db043 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -657,9 +657,9 @@ enum wined3d_resource_type { WINED3D_RTYPE_SURFACE = 1, WINED3D_RTYPE_VOLUME = 2, - WINED3D_RTYPE_VOLUME_TEXTURE = 3, - WINED3D_RTYPE_BUFFER = 4, - WINED3D_RTYPE_TEXTURE_2D = 5, + WINED3D_RTYPE_BUFFER = 3, + WINED3D_RTYPE_TEXTURE_2D = 4, + WINED3D_RTYPE_TEXTURE_3D = 5, }; enum wined3d_pool

1 0

Alexandre Julliard : ntdll/tests: Fix some more failures on restricted Windows.
by Alexandre Julliard Jan. 27, 2016

Jan. 27, 2016

Module: wine Branch: master Commit: 3e33f6c2d9cd05f2a603c60ef9bdeda2eb8d3098 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e33f6c2d9cd05f2a603c60ef… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 27 12:15:48 2016 +0900 ntdll/tests: Fix some more failures on restricted Windows. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/tests/om.c b/dlls/ntdll/tests/om.c index b957128..8a62cd3 100644 --- a/dlls/ntdll/tests/om.c +++ b/dlls/ntdll/tests/om.c @@ -1099,24 +1099,28 @@ static void test_query_object(void) pRtlCreateUnicodeStringFromAsciiz( &path, "\\REGISTRY\\Machine\\Software\\Classes" ); status = pNtCreateKey( &handle, KEY_ALL_ACCESS, &attr, 0, 0, 0, 0 ); - ok( handle != 0, "NtCreateKey failed status %x\n", status ); + ok( status == STATUS_SUCCESS || status == STATUS_ACCESS_DENIED, + "NtCreateKey failed status %x\n", status ); pRtlFreeUnicodeString( &path ); - len = 0; - status = pNtQueryObject( handle, ObjectNameInformation, buffer, sizeof(buffer), &len ); - ok( status == STATUS_SUCCESS , "NtQueryObject returned %x\n", status ); - str = (UNICODE_STRING *)buffer; - todo_wine - ok( len > sizeof(UNICODE_STRING), "unexpected len %u\n", len ); - str = (UNICODE_STRING *)buffer; - expected_len = sizeof(UNICODE_STRING) + str->Length + sizeof(WCHAR); - todo_wine - ok( len == expected_len || broken(len == expected_len - sizeof(WCHAR)), /* NT4 */ - "unexpected len %u\n", len ); - todo_wine - ok( len > sizeof(UNICODE_STRING) + sizeof("\\Classes") * sizeof(WCHAR), - "name too short %s\n", wine_dbgstr_w(str->Buffer) ); - trace( "got %s len %u\n", wine_dbgstr_w(str->Buffer), len ); - pNtClose( handle ); + if (status == STATUS_SUCCESS) + { + len = 0; + status = pNtQueryObject( handle, ObjectNameInformation, buffer, sizeof(buffer), &len ); + ok( status == STATUS_SUCCESS , "NtQueryObject returned %x\n", status ); + str = (UNICODE_STRING *)buffer; + todo_wine + ok( len > sizeof(UNICODE_STRING), "unexpected len %u\n", len ); + str = (UNICODE_STRING *)buffer; + expected_len = sizeof(UNICODE_STRING) + str->Length + sizeof(WCHAR); + todo_wine + ok( len == expected_len || broken(len == expected_len - sizeof(WCHAR)), /* NT4 */ + "unexpected len %u\n", len ); + todo_wine + ok( len > sizeof(UNICODE_STRING) + sizeof("\\Classes") * sizeof(WCHAR), + "name too short %s\n", wine_dbgstr_w(str->Buffer) ); + trace( "got %s len %u\n", wine_dbgstr_w(str->Buffer), len ); + pNtClose( handle ); + } } static void test_type_mismatch(void)

1 0

Matteo Bruni : wined3d: Add ARB_internalformat_query extension.
by Alexandre Julliard Jan. 27, 2016

Jan. 27, 2016

Module: wine Branch: master Commit: 42268b80564c998282f320dcf4d790fd9ade8266 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42268b80564c998282f320dcf… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jan 26 22:51:30 2016 +0100 wined3d: Add ARB_internalformat_query extension. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 6 ++++-- dlls/wined3d/wined3d_gl.h | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 2fe9597..9faf4ec 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -123,8 +123,9 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_geometry_shader4", ARB_GEOMETRY_SHADER4 }, {"GL_ARB_half_float_pixel", ARB_HALF_FLOAT_PIXEL }, {"GL_ARB_half_float_vertex", ARB_HALF_FLOAT_VERTEX }, - {"GL_ARB_instanced_arrays", ARB_INSTANCED_ARRAYS, }, - {"GL_ARB_internalformat_query2", ARB_INTERNALFORMAT_QUERY2, }, + {"GL_ARB_instanced_arrays", ARB_INSTANCED_ARRAYS }, + {"GL_ARB_internalformat_query", ARB_INTERNALFORMAT_QUERY }, + {"GL_ARB_internalformat_query2", ARB_INTERNALFORMAT_QUERY2 }, {"GL_ARB_map_buffer_alignment", ARB_MAP_BUFFER_ALIGNMENT }, {"GL_ARB_map_buffer_range", ARB_MAP_BUFFER_RANGE }, {"GL_ARB_multisample", ARB_MULTISAMPLE }, @@ -3441,6 +3442,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) {ARB_ES2_COMPATIBILITY, MAKEDWORD_VERSION(4, 1)}, + {ARB_INTERNALFORMAT_QUERY, MAKEDWORD_VERSION(4, 2)}, {ARB_MAP_BUFFER_ALIGNMENT, MAKEDWORD_VERSION(4, 2)}, {ARB_DEBUG_OUTPUT, MAKEDWORD_VERSION(4, 3)}, diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index a8c0db1..be4e308 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -60,6 +60,7 @@ enum wined3d_gl_extension ARB_HALF_FLOAT_PIXEL, ARB_HALF_FLOAT_VERTEX, ARB_INSTANCED_ARRAYS, + ARB_INTERNALFORMAT_QUERY, ARB_INTERNALFORMAT_QUERY2, ARB_MAP_BUFFER_ALIGNMENT, ARB_MAP_BUFFER_RANGE,

1 0

Matteo Bruni : wined3d: Improve wined3d_popcount() implementation.
by Alexandre Julliard Jan. 27, 2016

Jan. 27, 2016

Module: wine Branch: master Commit: 961215b8b87d0dda52f4c8a469f173aed8178a34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=961215b8b87d0dda52f4c8a46… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Jan 26 22:51:28 2016 +0100 wined3d: Improve wined3d_popcount() implementation. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 33 +++++++++++++++++++++++++++++++++ configure.ac | 9 +++++++++ dlls/wined3d/arb_program_shader.c | 4 ++-- dlls/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/shader.c | 4 ++-- dlls/wined3d/utils.c | 11 ----------- dlls/wined3d/wined3d_private.h | 12 +++++++++++- include/config.h.in | 3 +++ 8 files changed, 62 insertions(+), 18 deletions(-) diff --git a/configure b/configure index 6edecf6..c26963d 100755 --- a/configure +++ b/configure @@ -16883,6 +16883,39 @@ $as_echo "#define HAVE___BUILTIN_CLZ 1" >>confdefs.h fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_popcount" >&5 +$as_echo_n "checking for __builtin_popcount... " >&6; } +if ${ac_cv_have___builtin_popcount+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ +return __builtin_popcount(1) + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_have___builtin_popcount="yes" +else + ac_cv_have___builtin_popcount="no" +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_have___builtin_popcount" >&5 +$as_echo "$ac_cv_have___builtin_popcount" >&6; } +if test "$ac_cv_have___builtin_popcount" = "yes" +then + +$as_echo "#define HAVE___BUILTIN_POPCOUNT 1" >>confdefs.h + +fi + case $host_cpu in *i[3456789]86*) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we need to define __i386__" >&5 diff --git a/configure.ac b/configure.ac index 853277f..e434fbc 100644 --- a/configure.ac +++ b/configure.ac @@ -2551,6 +2551,15 @@ then AC_DEFINE(HAVE___BUILTIN_CLZ, 1, [Define to 1 if you have the `__builtin_clz' built-in function.]) fi +dnl Check for __builtin_popcount +AC_CACHE_CHECK([for __builtin_popcount], ac_cv_have___builtin_popcount, + AC_LINK_IFELSE([AC_LANG_PROGRAM(,[[return __builtin_popcount(1)]])], + [ac_cv_have___builtin_popcount="yes"], [ac_cv_have___builtin_popcount="no"])) +if test "$ac_cv_have___builtin_popcount" = "yes" +then + AC_DEFINE(HAVE___BUILTIN_POPCOUNT, 1, [Define to 1 if you have the `__builtin_popcount' built-in function.]) +fi + dnl *** check for the need to define platform-specific symbols case $host_cpu in diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 5dfa92f..a076cec 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -798,7 +798,7 @@ static void shader_generate_arb_declarations(const struct wined3d_shader *shader DWORD highest_constf = 0, clip_limit; max_constantsF -= reserved_vs_const(shader_data, reg_maps, gl_info); - max_constantsF -= count_bits(reg_maps->integer_constants); + max_constantsF -= wined3d_popcount(reg_maps->integer_constants); max_constantsF -= gl_info->reserved_arb_constants; for (i = 0; i < shader->limits->constant_float; ++i) @@ -819,7 +819,7 @@ static void shader_generate_arb_declarations(const struct wined3d_shader *shader else { unsigned int mask = ctx->cur_vs_args->clip.boolclip.clipplane_mask; - clip_limit = min(count_bits(mask), 4); + clip_limit = min(wined3d_popcount(mask), 4); } *num_clipplanes = min(clip_limit, max_constantsF - highest_constf - 1); max_constantsF -= *num_clipplanes; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ec3c2cb..1eb7e6d 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1685,12 +1685,12 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont max_constantsF = gl_info->limits.glsl_vs_float_constants - 3; if (vs_args->clip_enabled) max_constantsF -= gl_info->limits.clipplanes; - max_constantsF -= count_bits(reg_maps->integer_constants); + max_constantsF -= wined3d_popcount(reg_maps->integer_constants); /* Strictly speaking a bool only uses one scalar, but the nvidia(Linux) compiler doesn't pack them properly, * so each scalar requires a full vec4. We could work around this by packing the booleans ourselves, but * for now take this into account when calculating the number of available constants */ - max_constantsF -= count_bits(reg_maps->boolean_constants); + max_constantsF -= wined3d_popcount(reg_maps->boolean_constants); /* Set by driver quirks in directx.c */ max_constantsF -= gl_info->reserved_glsl_constants; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 5730cef..140665e 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1138,7 +1138,7 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st } else if (!input_signature->elements && reg_maps->input_registers) { - unsigned int count = count_bits(reg_maps->input_registers); + unsigned int count = wined3d_popcount(reg_maps->input_registers); struct wined3d_shader_signature_element *e; unsigned int i; @@ -1165,7 +1165,7 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st } else if (reg_maps->output_registers) { - unsigned int count = count_bits(reg_maps->output_registers); + unsigned int count = wined3d_popcount(reg_maps->output_registers); struct wined3d_shader_signature_element *e; if (!(output_signature->elements = HeapAlloc(GetProcessHeap(), 0, sizeof(*output_signature->elements) * count))) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 5eb1696..28a3216 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4048,17 +4048,6 @@ void get_fog_start_end(const struct wined3d_context *context, const struct wined } } -/* This small helper function is used to convert a bitmask into the number of masked bits */ -unsigned int count_bits(unsigned int mask) -{ - unsigned int count; - for (count = 0; mask; ++count) - { - mask &= mask - 1; - } - return count; -} - /* Note: It's the caller's responsibility to ensure values can be expressed * in the requested format. UNORM formats for example can only express values * in the range 0.0f -> 1.0f. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5558c70..b23aedb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -257,6 +257,17 @@ static inline float float_24_to_32(DWORD in) } } +static inline unsigned int wined3d_popcount(unsigned int x) +{ +#ifdef HAVE___BUILTIN_POPCOUNT + return __builtin_popcount(x); +#else + x -= x >> 1 & 0x55555555; + x = (x & 0x33333333) + (x >> 2 & 0x33333333); + return ((x + (x >> 4)) & 0x0f0f0f0f) * 0x01010101 >> 24; +#endif +} + #define ORM_BACKBUFFER 0 #define ORM_FBO 1 @@ -2930,7 +2941,6 @@ GLenum gl_primitive_type_from_d3d(enum wined3d_primitive_type primitive_type) DE /* Math utils */ void multiply_matrix(struct wined3d_matrix *dest, const struct wined3d_matrix *src1, const struct wined3d_matrix *src2) DECLSPEC_HIDDEN; -unsigned int count_bits(unsigned int mask) DECLSPEC_HIDDEN; void wined3d_release_dc(HWND window, HDC dc) DECLSPEC_HIDDEN; diff --git a/include/config.h.in b/include/config.h.in index 805374e..86318c5 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -1311,6 +1311,9 @@ /* Define to 1 if you have the `__builtin_clz' built-in function. */ #undef HAVE___BUILTIN_CLZ +/* Define to 1 if you have the `__builtin_popcount' built-in function. */ +#undef HAVE___BUILTIN_POPCOUNT + /* Define to 1 if you have the `__res_getservers' function. */ #undef HAVE___RES_GETSERVERS

1 0