wine-commits February 2016

wine-commits@winehq.org

2 participants
755 discussions

Józef Kucia : wined3d: Move more formats to typed_formats table.
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: 1098a673e61908bacf9459ea6a1ef062f9332d6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1098a673e61908bacf9459ea6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 11 13:34:37 2016 +0100 wined3d: Move more formats to typed_formats table. 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/utils.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 872c243f..dae30c1 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -105,10 +105,6 @@ static const struct wined3d_format_channels formats[] = {WINED3DFMT_P8_UINT, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, /* Standard ARGB formats. */ {WINED3DFMT_B8G8R8_UNORM, 8, 8, 8, 0, 16, 8, 0, 0, 3, 0, 0}, - {WINED3DFMT_B8G8R8A8_UNORM, 8, 8, 8, 8, 16, 8, 0, 24, 4, 0, 0}, - {WINED3DFMT_B8G8R8A8_UNORM_SRGB, 8, 8, 8, 8, 16, 8, 0, 24, 4, 0, 0}, - {WINED3DFMT_B8G8R8X8_UNORM, 8, 8, 8, 0, 16, 8, 0, 0, 4, 0, 0}, - {WINED3DFMT_B8G8R8X8_UNORM_SRGB, 8, 8, 8, 0, 16, 8, 0, 0, 4, 0, 0}, {WINED3DFMT_B5G6R5_UNORM, 5, 6, 5, 0, 11, 5, 0, 0, 2, 0, 0}, {WINED3DFMT_B5G5R5X1_UNORM, 5, 5, 5, 0, 10, 5, 0, 0, 2, 0, 0}, {WINED3DFMT_B5G5R5A1_UNORM, 5, 5, 5, 1, 10, 5, 0, 15, 2, 0, 0}, @@ -117,22 +113,17 @@ static const struct wined3d_format_channels formats[] = {WINED3DFMT_A8_UNORM, 0, 0, 0, 8, 0, 0, 0, 0, 1, 0, 0}, {WINED3DFMT_B2G3R3A8_UNORM, 3, 3, 2, 8, 5, 2, 0, 8, 2, 0, 0}, {WINED3DFMT_B4G4R4X4_UNORM, 4, 4, 4, 0, 8, 4, 0, 0, 2, 0, 0}, - {WINED3DFMT_R10G10B10A2_UINT, 10, 10, 10, 2, 0, 10, 20, 30, 4, 0, 0}, - {WINED3DFMT_R10G10B10A2_SNORM, 10, 10, 10, 2, 0, 10, 20, 30, 4, 0, 0}, {WINED3DFMT_R8G8B8X8_UNORM, 8, 8, 8, 0, 0, 8, 16, 0, 4, 0, 0}, {WINED3DFMT_B10G10R10A2_UNORM, 10, 10, 10, 2, 20, 10, 0, 30, 4, 0, 0}, - {WINED3DFMT_R16_UNORM, 16, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0}, /* Luminance */ {WINED3DFMT_L8_UNORM, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, {WINED3DFMT_L8A8_UNORM, 0, 0, 0, 8, 0, 0, 0, 8, 2, 0, 0}, {WINED3DFMT_L4A4_UNORM, 0, 0, 0, 4, 0, 0, 0, 4, 1, 0, 0}, {WINED3DFMT_L16_UNORM, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0}, /* Bump mapping stuff */ - {WINED3DFMT_R8G8_SNORM, 8, 8, 0, 0, 0, 8, 0, 0, 2, 0, 0}, {WINED3DFMT_R5G5_SNORM_L6_UNORM, 5, 5, 0, 0, 0, 5, 0, 0, 2, 0, 0}, {WINED3DFMT_R8G8_SNORM_L8X8_UNORM, 8, 8, 0, 0, 0, 8, 0, 0, 4, 0, 0}, {WINED3DFMT_R8G8B8A8_SNORM, 8, 8, 8, 8, 0, 8, 16, 24, 4, 0, 0}, - {WINED3DFMT_R16G16_SNORM, 16, 16, 0, 0, 0, 16, 0, 0, 4, 0, 0}, {WINED3DFMT_R10G11B11_SNORM, 10, 11, 11, 0, 0, 10, 21, 0, 4, 0, 0}, {WINED3DFMT_R10G10B10_SNORM_A2_UNORM, 10, 10, 10, 2, 0, 10, 20, 30, 4, 0, 0}, /* Depth stencil formats */ @@ -145,10 +136,6 @@ static const struct wined3d_format_channels formats[] = {WINED3DFMT_D32_FLOAT, 0, 0, 0, 0, 0, 0, 0, 0, 4, 32, 0}, {WINED3DFMT_S8_UINT_D24_FLOAT, 0, 0, 0, 0, 0, 0, 0, 0, 4, 24, 8}, {WINED3DFMT_VERTEXDATA, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - {WINED3DFMT_R32_UINT, 32, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0}, - {WINED3DFMT_R32G32_UINT, 32, 32, 0, 0, 0, 32, 0, 0, 8, 0, 0}, - {WINED3DFMT_R32G32B32_UINT, 32, 32, 32, 0, 0, 32, 64, 0, 12, 0, 0}, - {WINED3DFMT_R16G16B16A16_SNORM, 16, 16, 16, 16, 0, 16, 32, 48, 8, 0, 0}, /* Vendor-specific formats */ {WINED3DFMT_ATI1N, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, {WINED3DFMT_ATI2N, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, @@ -179,7 +166,10 @@ static const struct wined3d_format_channels formats[] = {WINED3DFMT_BC1_TYPELESS, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, {WINED3DFMT_BC2_TYPELESS, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, {WINED3DFMT_BC3_TYPELESS, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, + {WINED3DFMT_BC4_TYPELESS, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, {WINED3DFMT_BC5_TYPELESS, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, + {WINED3DFMT_B8G8R8A8_TYPELESS, 8, 8, 8, 8, 16, 8, 0, 24, 4, 0, 0}, + {WINED3DFMT_B8G8R8X8_TYPELESS, 8, 8, 8, 0, 16, 8, 0, 0, 4, 0, 0}, }; enum wined3d_channel_type @@ -217,20 +207,31 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_R32G32B32A32_UINT, WINED3DFMT_R32G32B32A32_TYPELESS, "UUUU"}, {WINED3DFMT_R32G32B32A32_SINT, WINED3DFMT_R32G32B32A32_TYPELESS, "IIII"}, {WINED3DFMT_R32G32B32A32_FLOAT, WINED3DFMT_R32G32B32A32_TYPELESS, "FFFF"}, + {WINED3DFMT_R32G32B32_UINT, WINED3DFMT_R32G32B32_TYPELESS, "UUU"}, {WINED3DFMT_R32G32B32_FLOAT, WINED3DFMT_R32G32B32_TYPELESS, "FFF"}, {WINED3DFMT_R16G16B16A16_UNORM, WINED3DFMT_R16G16B16A16_TYPELESS, "uuuu"}, + {WINED3DFMT_R16G16B16A16_SNORM, WINED3DFMT_R16G16B16A16_TYPELESS, "iiii"}, + {WINED3DFMT_R16G16B16A16_SINT, WINED3DFMT_R16G16B16A16_TYPELESS, "IIII"}, {WINED3DFMT_R16G16B16A16_FLOAT, WINED3DFMT_R16G16B16A16_TYPELESS, "FFFF"}, + {WINED3DFMT_R32G32_UINT, WINED3DFMT_R32G32_TYPELESS, "UU"}, {WINED3DFMT_R32G32_FLOAT, WINED3DFMT_R32G32_TYPELESS, "FF"}, + {WINED3DFMT_R10G10B10A2_SNORM, WINED3DFMT_R10G10B10A2_TYPELESS, "iiii"}, + {WINED3DFMT_R10G10B10A2_UINT, WINED3DFMT_R10G10B10A2_TYPELESS, "UUUU"}, {WINED3DFMT_R10G10B10A2_UNORM, WINED3DFMT_R10G10B10A2_TYPELESS, "uuuu"}, {WINED3DFMT_R8G8B8A8_UINT, WINED3DFMT_R8G8B8A8_TYPELESS, "UUUU"}, {WINED3DFMT_R8G8B8A8_SINT, WINED3DFMT_R8G8B8A8_TYPELESS, "IIII"}, {WINED3DFMT_R8G8B8A8_UNORM_SRGB, WINED3DFMT_R8G8B8A8_TYPELESS, "uuuu"}, {WINED3DFMT_R8G8B8A8_UNORM, WINED3DFMT_R8G8B8A8_TYPELESS, "uuuu"}, {WINED3DFMT_R16G16_UNORM, WINED3DFMT_R16G16_TYPELESS, "uu"}, + {WINED3DFMT_R16G16_SNORM, WINED3DFMT_R16G16_TYPELESS, "ii"}, + {WINED3DFMT_R16G16_SINT, WINED3DFMT_R16G16_TYPELESS, "II"}, {WINED3DFMT_R16G16_FLOAT, WINED3DFMT_R16G16_TYPELESS, "FF"}, + {WINED3DFMT_R32_UINT, WINED3DFMT_R32_TYPELESS, "U"}, {WINED3DFMT_R32_FLOAT, WINED3DFMT_R32_TYPELESS, "F"}, {WINED3DFMT_D24_UNORM_S8_UINT, WINED3DFMT_R24G8_TYPELESS, "DS"}, + {WINED3DFMT_R8G8_SNORM, WINED3DFMT_R8G8_TYPELESS, "ii"}, {WINED3DFMT_R8G8_UNORM, WINED3DFMT_R8G8_TYPELESS, "uu"}, + {WINED3DFMT_R16_UNORM, WINED3DFMT_R16_TYPELESS, "u"}, {WINED3DFMT_R16_UINT, WINED3DFMT_R16_TYPELESS, "U"}, {WINED3DFMT_R16_FLOAT, WINED3DFMT_R16_TYPELESS, "F"}, {WINED3DFMT_R8_UNORM, WINED3DFMT_R8_TYPELESS, "u"}, @@ -240,6 +241,10 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_BC2_UNORM, WINED3DFMT_BC2_TYPELESS, ""}, {WINED3DFMT_BC3_UNORM_SRGB, WINED3DFMT_BC3_TYPELESS, ""}, {WINED3DFMT_BC3_UNORM, WINED3DFMT_BC3_TYPELESS, ""}, + {WINED3DFMT_B8G8R8A8_UNORM_SRGB, WINED3DFMT_B8G8R8A8_TYPELESS, "uuuu"}, + {WINED3DFMT_B8G8R8A8_UNORM, WINED3DFMT_B8G8R8A8_TYPELESS, "uuuu"}, + {WINED3DFMT_B8G8R8X8_UNORM_SRGB, WINED3DFMT_B8G8R8X8_TYPELESS, "uuu"}, + {WINED3DFMT_B8G8R8X8_UNORM, WINED3DFMT_B8G8R8X8_TYPELESS, "uuu"}, }; struct wined3d_format_base_flags

1 0

Józef Kucia : wined3d: Copy channel info for typed formats from typeless formats.
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: 0e9327b9f23233f939495ef96346abf3844d73a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e9327b9f23233f939495ef96… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 11 13:34:36 2016 +0100 wined3d: Copy channel info for typed formats from typeless formats. 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/utils.c | 53 +++++++++++++++++++++++++--------------------------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 9edd23f..872c243f 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -93,27 +93,12 @@ static const struct wined3d_format_channels formats[] = {WINED3DFMT_DXT3, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, {WINED3DFMT_DXT4, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, {WINED3DFMT_DXT5, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, - {WINED3DFMT_BC1_UNORM, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, - {WINED3DFMT_BC1_UNORM_SRGB, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, - {WINED3DFMT_BC2_UNORM, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, - {WINED3DFMT_BC2_UNORM_SRGB, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, - {WINED3DFMT_BC3_UNORM, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, - {WINED3DFMT_BC3_UNORM_SRGB, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, {WINED3DFMT_MULTI2_ARGB8, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, {WINED3DFMT_G8R8_G8B8, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, {WINED3DFMT_R8G8_B8G8, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, - /* IEEE formats */ - {WINED3DFMT_R32_FLOAT, 32, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0}, - {WINED3DFMT_R32G32_FLOAT, 32, 32, 0, 0, 0, 32, 0, 0, 8, 0, 0}, - {WINED3DFMT_R32G32B32_FLOAT, 32, 32, 32, 0, 0, 32, 64, 0, 12, 0, 0}, - {WINED3DFMT_R32G32B32A32_FLOAT, 32, 32, 32, 32, 0, 32, 64, 96, 16, 0, 0}, /* Hmm? */ {WINED3DFMT_R8G8_SNORM_Cx, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0}, - /* Float */ - {WINED3DFMT_R16_FLOAT, 16, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0}, - {WINED3DFMT_R16G16_FLOAT, 16, 16, 0, 0, 0, 16, 0, 0, 4, 0, 0}, {WINED3DFMT_R16G16_SINT, 16, 16, 0, 0, 0, 16, 0, 0, 4, 0, 0}, - {WINED3DFMT_R16G16B16A16_FLOAT, 16, 16, 16, 16, 0, 16, 32, 48, 8, 0, 0}, {WINED3DFMT_R16G16B16A16_SINT, 16, 16, 16, 16, 0, 16, 32, 48, 8, 0, 0}, /* Palettized formats */ {WINED3DFMT_P8_UINT_A8_UNORM, 0, 0, 0, 8, 0, 0, 0, 8, 2, 0, 0}, @@ -129,22 +114,13 @@ static const struct wined3d_format_channels formats[] = {WINED3DFMT_B5G5R5A1_UNORM, 5, 5, 5, 1, 10, 5, 0, 15, 2, 0, 0}, {WINED3DFMT_B4G4R4A4_UNORM, 4, 4, 4, 4, 8, 4, 0, 12, 2, 0, 0}, {WINED3DFMT_B2G3R3_UNORM, 3, 3, 2, 0, 5, 2, 0, 0, 1, 0, 0}, - {WINED3DFMT_R8_UNORM, 8, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, {WINED3DFMT_A8_UNORM, 0, 0, 0, 8, 0, 0, 0, 0, 1, 0, 0}, {WINED3DFMT_B2G3R3A8_UNORM, 3, 3, 2, 8, 5, 2, 0, 8, 2, 0, 0}, {WINED3DFMT_B4G4R4X4_UNORM, 4, 4, 4, 0, 8, 4, 0, 0, 2, 0, 0}, - {WINED3DFMT_R10G10B10A2_UNORM, 10, 10, 10, 2, 0, 10, 20, 30, 4, 0, 0}, {WINED3DFMT_R10G10B10A2_UINT, 10, 10, 10, 2, 0, 10, 20, 30, 4, 0, 0}, {WINED3DFMT_R10G10B10A2_SNORM, 10, 10, 10, 2, 0, 10, 20, 30, 4, 0, 0}, - {WINED3DFMT_R8G8B8A8_UNORM, 8, 8, 8, 8, 0, 8, 16, 24, 4, 0, 0}, - {WINED3DFMT_R8G8B8A8_UNORM_SRGB, 8, 8, 8, 8, 0, 8, 16, 24, 4, 0, 0}, - {WINED3DFMT_R8G8B8A8_UINT, 8, 8, 8, 8, 0, 8, 16, 24, 4, 0, 0}, - {WINED3DFMT_R8G8B8A8_SINT, 8, 8, 8, 8, 0, 8, 16, 24, 4, 0, 0}, {WINED3DFMT_R8G8B8X8_UNORM, 8, 8, 8, 0, 0, 8, 16, 0, 4, 0, 0}, - {WINED3DFMT_R16G16_UNORM, 16, 16, 0, 0, 0, 16, 0, 0, 4, 0, 0}, {WINED3DFMT_B10G10R10A2_UNORM, 10, 10, 10, 2, 20, 10, 0, 30, 4, 0, 0}, - {WINED3DFMT_R16G16B16A16_UNORM, 16, 16, 16, 16, 0, 16, 32, 48, 8, 0, 0}, - {WINED3DFMT_R8G8_UNORM, 8, 8, 0, 0, 0, 8, 0, 0, 2, 0, 0}, {WINED3DFMT_R16_UNORM, 16, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0}, /* Luminance */ {WINED3DFMT_L8_UNORM, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, @@ -163,19 +139,15 @@ static const struct wined3d_format_channels formats[] = {WINED3DFMT_D16_LOCKABLE, 0, 0, 0, 0, 0, 0, 0, 0, 2, 16, 0}, {WINED3DFMT_D32_UNORM, 0, 0, 0, 0, 0, 0, 0, 0, 4, 32, 0}, {WINED3DFMT_S1_UINT_D15_UNORM, 0, 0, 0, 0, 0, 0, 0, 0, 2, 15, 1}, - {WINED3DFMT_D24_UNORM_S8_UINT, 0, 0, 0, 0, 0, 0, 0, 0, 4, 24, 8}, {WINED3DFMT_X8D24_UNORM, 0, 0, 0, 0, 0, 0, 0, 0, 4, 24, 0}, {WINED3DFMT_S4X4_UINT_D24_UNORM, 0, 0, 0, 0, 0, 0, 0, 0, 4, 24, 4}, {WINED3DFMT_D16_UNORM, 0, 0, 0, 0, 0, 0, 0, 0, 2, 16, 0}, {WINED3DFMT_D32_FLOAT, 0, 0, 0, 0, 0, 0, 0, 0, 4, 32, 0}, {WINED3DFMT_S8_UINT_D24_FLOAT, 0, 0, 0, 0, 0, 0, 0, 0, 4, 24, 8}, {WINED3DFMT_VERTEXDATA, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, - {WINED3DFMT_R16_UINT, 16, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0}, {WINED3DFMT_R32_UINT, 32, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0}, {WINED3DFMT_R32G32_UINT, 32, 32, 0, 0, 0, 32, 0, 0, 8, 0, 0}, {WINED3DFMT_R32G32B32_UINT, 32, 32, 32, 0, 0, 32, 64, 0, 12, 0, 0}, - {WINED3DFMT_R32G32B32A32_UINT, 32, 32, 32, 32, 0, 32, 64, 96, 16, 0, 0}, - {WINED3DFMT_R32G32B32A32_SINT, 32, 32, 32, 32, 0, 32, 64, 96, 16, 0, 0}, {WINED3DFMT_R16G16B16A16_SNORM, 16, 16, 16, 16, 0, 16, 32, 48, 8, 0, 0}, /* Vendor-specific formats */ {WINED3DFMT_ATI1N, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0}, @@ -1574,6 +1546,7 @@ static BOOL init_format_base_info(struct wined3d_gl_info *gl_info) for (i = 0; i < ARRAY_SIZE(typed_formats); ++i) { + const struct wined3d_format *typeless_format; struct wined3d_format *format; DWORD flags = 0; int fmt_idx; @@ -1587,6 +1560,30 @@ static BOOL init_format_base_info(struct wined3d_gl_info *gl_info) } format = &gl_info->formats[fmt_idx]; + typeless_format = wined3d_get_format(gl_info, typed_formats[i].typeless_id); + if (typeless_format->id == WINED3DFMT_UNKNOWN) + { + ERR("Typeless format %s (%#x) not found.\n", + debug_d3dformat(typed_formats[i].typeless_id), typed_formats[i].typeless_id); + goto fail; + } + + format->id = typed_formats[i].id; + format->red_size = typeless_format->red_size; + format->green_size = typeless_format->green_size; + format->blue_size = typeless_format->blue_size; + format->alpha_size = typeless_format->alpha_size; + format->red_offset = typeless_format->red_offset; + format->green_offset = typeless_format->green_offset; + format->blue_offset = typeless_format->blue_offset; + format->alpha_offset = typeless_format->alpha_offset; + format->byte_count = typeless_format->byte_count; + format->depth_size = typeless_format->depth_size; + format->stencil_size = typeless_format->stencil_size; + format->block_width = typeless_format->block_width; + format->block_height = typeless_format->block_height; + format->block_byte_count = typeless_format->block_byte_count; + for (j = 0; j < strlen(typed_formats[i].channels); ++j) { enum wined3d_channel_type channel_type = map_channel_type(typed_formats[i].channels[j]);

1 0

Józef Kucia : wined3d: Use format id as index in formats table whenever possible.
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: ab9f7d4ee689c29784edb20e577c3d82488114f0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab9f7d4ee689c29784edb20e5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 11 13:34:35 2016 +0100 wined3d: Use format id as index in formats table whenever possible. 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/utils.c | 96 ++++++++++++++++++++++++++++++------------ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 71 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 9af7e80..9edd23f 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -33,6 +33,42 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); +#define WINED3D_FORMAT_FOURCC_BASE (WINED3DFMT_BC7_UNORM_SRGB + 1) + +static const struct +{ + enum wined3d_format_id id; + unsigned int idx; +} +format_index_remap[] = +{ + {WINED3DFMT_UYVY, WINED3D_FORMAT_FOURCC_BASE}, + {WINED3DFMT_YUY2, WINED3D_FORMAT_FOURCC_BASE + 1}, + {WINED3DFMT_YV12, WINED3D_FORMAT_FOURCC_BASE + 2}, + {WINED3DFMT_DXT1, WINED3D_FORMAT_FOURCC_BASE + 3}, + {WINED3DFMT_DXT2, WINED3D_FORMAT_FOURCC_BASE + 4}, + {WINED3DFMT_DXT3, WINED3D_FORMAT_FOURCC_BASE + 5}, + {WINED3DFMT_DXT4, WINED3D_FORMAT_FOURCC_BASE + 6}, + {WINED3DFMT_DXT5, WINED3D_FORMAT_FOURCC_BASE + 7}, + {WINED3DFMT_MULTI2_ARGB8, WINED3D_FORMAT_FOURCC_BASE + 8}, + {WINED3DFMT_G8R8_G8B8, WINED3D_FORMAT_FOURCC_BASE + 9}, + {WINED3DFMT_R8G8_B8G8, WINED3D_FORMAT_FOURCC_BASE + 10}, + {WINED3DFMT_ATI1N, WINED3D_FORMAT_FOURCC_BASE + 11}, + {WINED3DFMT_ATI2N, WINED3D_FORMAT_FOURCC_BASE + 12}, + {WINED3DFMT_INST, WINED3D_FORMAT_FOURCC_BASE + 13}, + {WINED3DFMT_NVDB, WINED3D_FORMAT_FOURCC_BASE + 14}, + {WINED3DFMT_NVHU, WINED3D_FORMAT_FOURCC_BASE + 15}, + {WINED3DFMT_NVHS, WINED3D_FORMAT_FOURCC_BASE + 16}, + {WINED3DFMT_INTZ, WINED3D_FORMAT_FOURCC_BASE + 17}, + {WINED3DFMT_RESZ, WINED3D_FORMAT_FOURCC_BASE + 18}, + {WINED3DFMT_NULL, WINED3D_FORMAT_FOURCC_BASE + 19}, + {WINED3DFMT_R16, WINED3D_FORMAT_FOURCC_BASE + 20}, + {WINED3DFMT_AL16, WINED3D_FORMAT_FOURCC_BASE + 21}, + {WINED3DFMT_NV12, WINED3D_FORMAT_FOURCC_BASE + 22}, +}; + +#define WINED3D_FORMAT_COUNT (WINED3D_FORMAT_FOURCC_BASE + ARRAY_SIZE(format_index_remap)) + struct wined3d_format_channels { enum wined3d_format_id id; @@ -1439,22 +1475,17 @@ static const struct wined3d_format_srgb_info format_srgb_info[] = static inline int get_format_idx(enum wined3d_format_id format_id) { - /* First check if the format is at the position of its value. - * This will catch the argb formats before the loop is entered. */ - if (format_id < (sizeof(formats) / sizeof(*formats)) - && formats[format_id].id == format_id) - { + unsigned int i; + + if (format_id < WINED3D_FORMAT_FOURCC_BASE) return format_id; - } - else - { - unsigned int i; - for (i = 0; i < (sizeof(formats) / sizeof(*formats)); ++i) - { - if (formats[i].id == format_id) return i; - } + for (i = 0; i < ARRAY_SIZE(format_index_remap); ++i) + { + if (format_index_remap[i].id == format_id) + return format_index_remap[i].idx; } + return -1; } @@ -1500,19 +1531,30 @@ static enum wined3d_channel_type map_channel_type(char t) static BOOL init_format_base_info(struct wined3d_gl_info *gl_info) { - UINT format_count = sizeof(formats) / sizeof(*formats); unsigned int i, j; - gl_info->formats = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, format_count * sizeof(*gl_info->formats)); - if (!gl_info->formats) + gl_info->format_count = WINED3D_FORMAT_COUNT; + if (!(gl_info->formats = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + gl_info->format_count * sizeof(*gl_info->formats)))) { ERR("Failed to allocate memory.\n"); return FALSE; } - for (i = 0; i < format_count; ++i) + for (i = 0; i < ARRAY_SIZE(formats); ++i) { - struct wined3d_format *format = &gl_info->formats[i]; + struct wined3d_format *format; + int fmt_idx; + + fmt_idx = get_format_idx(formats[i].id); + if (fmt_idx == -1) + { + ERR("Could not allocate index for format %s %#x.\n", + debug_d3dformat(formats[i].id), formats[i].id); + goto fail; + } + format = &gl_info->formats[fmt_idx]; + format->id = formats[i].id; format->red_size = formats[i].red_size; format->green_size = formats[i].green_size; @@ -1539,10 +1581,9 @@ static BOOL init_format_base_info(struct wined3d_gl_info *gl_info) fmt_idx = get_format_idx(typed_formats[i].id); if (fmt_idx == -1) { - ERR("Format %s (%#x) not found.\n", + ERR("Could not allocate index for format %s %#x.\n", debug_d3dformat(typed_formats[i].id), typed_formats[i].id); - HeapFree(GetProcessHeap(), 0, gl_info->formats); - return FALSE; + goto fail; } format = &gl_info->formats[fmt_idx]; @@ -1566,14 +1607,17 @@ static BOOL init_format_base_info(struct wined3d_gl_info *gl_info) { ERR("Format %s (%#x) not found.\n", debug_d3dformat(format_base_flags[i].id), format_base_flags[i].id); - HeapFree(GetProcessHeap(), 0, gl_info->formats); - return FALSE; + goto fail; } format_set_flag(&gl_info->formats[fmt_idx], format_base_flags[i].flags); } return TRUE; + +fail: + HeapFree(GetProcessHeap(), 0, gl_info->formats); + return FALSE; } static BOOL init_format_block_info(struct wined3d_gl_info *gl_info) @@ -2176,7 +2220,7 @@ static void init_format_fbo_compat_info(struct wined3d_caps_gl_ctx *ctx) if (gl_info->supported[ARB_INTERNALFORMAT_QUERY2]) { - for (i = 0; i < sizeof(formats) / sizeof(*formats); ++i) + for (i = 0; i < gl_info->format_count; ++i) { GLint value; struct wined3d_format *format = &gl_info->formats[i]; @@ -2287,7 +2331,7 @@ static void init_format_fbo_compat_info(struct wined3d_caps_gl_ctx *ctx) gl_info->gl_ops.gl.p_glReadBuffer(GL_COLOR_ATTACHMENT0); } - for (i = 0; i < sizeof(formats) / sizeof(*formats); ++i) + for (i = 0; i < gl_info->format_count; ++i) { struct wined3d_format *format = &gl_info->formats[i]; @@ -2897,7 +2941,7 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ format_set_flag(&gl_info->formats[idx], WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET); } - for (i = 0; i < sizeof(formats) / sizeof(*formats); ++i) + for (i = 0; i < gl_info->format_count; ++i) { struct wined3d_format *format = &gl_info->formats[i]; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 56ca786..81c3af2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1828,6 +1828,7 @@ struct wined3d_gl_info struct wined3d_fbo_ops fbo_ops; struct wined3d_format *formats; + unsigned int format_count; }; struct wined3d_driver_info

1 0

Józef Kucia : wined3d: Rename getFmtIdx() to get_format_idx().
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: a5389a43156f25277c43030f4557f36d8e44e378 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5389a43156f25277c43030f4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 11 13:34:34 2016 +0100 wined3d: Rename getFmtIdx() to get_format_idx(). 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/utils.c | 108 +++++++++++++++++++++++++-------------------------- 1 file changed, 54 insertions(+), 54 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a5389a43156f25277c430…

1 0

Józef Kucia : wined3d: Introduce table with typed format channels.
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: 8a5aabce9a9099a06cbbe90ac34467df8e06dd59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a5aabce9a9099a06cbbe90ac… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 11 13:34:33 2016 +0100 wined3d: Introduce table with typed format channels. 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/utils.c | 158 ++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 111 insertions(+), 47 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8a5aabce9a9099a06cbbe…

1 0

Hugh McMaster : reg: Fail when / d is used without an accompanying argument.
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: 3c340fda682a7835975bc9644b654149a27d11ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=3c340fda682a7835975bc9644… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Feb 11 23:34:22 2016 +1100 reg: Fail when /d is used without an accompanying argument. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/reg.c | 8 +++++++- programs/reg/tests/reg.c | 8 ++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 32b0d17..63b518f 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -562,7 +562,13 @@ int wmain(int argc, WCHAR *argvW[]) else if (!lstrcmpiW(argvW[i], slashSW)) separator = argvW[++i][0]; else if (!lstrcmpiW(argvW[i], slashDW)) - data = argvW[++i]; + { + if (!(data = argvW[++i])) + { + output_message(STRING_INVALID_CMDLINE); + return 1; + } + } else if (!lstrcmpiW(argvW[i], slashFW)) force = TRUE; } diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index 0eaf638..cdf8359 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -169,7 +169,7 @@ static void test_add(void) verify_reg(hkey, "test", REG_SZ, "", 1, TODO_REG_SIZE); run_reg_exe("reg add HKCU\\" KEY_BASE " /v test1 /t REG_SZ /f /d", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKEY_CURRENT_USER\\" KEY_BASE " /ve /d WineTEST /f", &r); ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); @@ -242,7 +242,7 @@ static void test_add(void) verify_reg(hkey, "bin5", REG_BINARY, buffer, 0, 0); run_reg_exe("reg add HKCU\\" KEY_BASE " /v bin6 /t REG_BINARY /f /d", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); /* REG_DWORD */ run_reg_exe("reg add HKCU\\" KEY_BASE " /t REG_DWORD /f /d 12345678", &r); @@ -255,7 +255,7 @@ static void test_add(void) win_skip("broken reg.exe detected\n"); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword0 /t REG_DWORD /f /d", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword1 /t REG_DWORD /f", &r); todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), "got exit code %d, expected 1\n", r); @@ -353,7 +353,7 @@ static void test_add(void) verify_reg(hkey, "multi11", REG_MULTI_SZ, buffer, 3, TODO_REG_SIZE); run_reg_exe("reg add HKCU\\" KEY_BASE " /v multi12 /t REG_MULTI_SZ /f /d", &r); - todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); + ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); RegCloseKey(hkey);

1 0

Hugh McMaster : reg/tests: Fix incorrect expected value.
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: 2c0359fb3cac5d91dd16a2c13fb6b32f173d787c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c0359fb3cac5d91dd16a2c13… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Feb 11 23:34:21 2016 +1100 reg/tests: Fix incorrect expected value. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/reg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/programs/reg/tests/reg.c b/programs/reg/tests/reg.c index e55e1a2..0eaf638 100644 --- a/programs/reg/tests/reg.c +++ b/programs/reg/tests/reg.c @@ -258,7 +258,7 @@ static void test_add(void) todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword1 /t REG_DWORD /f", &r); todo_wine ok(r == REG_EXIT_FAILURE || broken(r == REG_EXIT_SUCCESS /* WinXP */), - "got exit code %d, expected 0\n", r); + "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword2 /t REG_DWORD /d zzz /f", &r); todo_wine ok(r == REG_EXIT_FAILURE, "got exit code %d, expected 1\n", r); run_reg_exe("reg add HKCU\\" KEY_BASE " /v dword3 /t REG_DWORD /d deadbeef /f", &r);

1 0

Alexandre Julliard : ntdll/tests: Remove some macros.
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: f17fe5a4adf2c9c9bb4aad0ab7f1871f5c34fec3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f17fe5a4adf2c9c9bb4aad0ab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 11 22:10:54 2016 +0900 ntdll/tests: Remove some macros. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/om.c | 186 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 111 insertions(+), 75 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f17fe5a4adf2c9c9bb4aa…

1 0

Sebastian Lackner : msvcr90/tests: Use brackets to protect arguments in call_func2 macro.
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: 155d3b192b1510d37985b155360e5e0fae8c89fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=155d3b192b1510d37985b1553… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 11 02:18:03 2016 +0100 msvcr90/tests: Use brackets to protect arguments in call_func2 macro. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr90/tests/msvcr90.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcr90/tests/msvcr90.c b/dlls/msvcr90/tests/msvcr90.c index 184ce76..5e16e8f 100644 --- a/dlls/msvcr90/tests/msvcr90.c +++ b/dlls/msvcr90/tests/msvcr90.c @@ -283,7 +283,7 @@ static void* do_call_func2(void *func, void *_this, const void* arg) #endif #define call_func1(func,_this) do_call_func1(func,_this) -#define call_func2(func,_this,a) do_call_func2(func,_this,(const void*)a) +#define call_func2(func,_this,a) do_call_func2(func,_this,(const void*)(a)) #else

1 0

Sebastian Lackner : msvcp90/tests: Use brackets to protect arguments in call_func macros.
by Alexandre Julliard 11 Feb '16

11 Feb '16

Module: wine Branch: master Commit: 6ed6e91621bf3c9a2e5538227e11cd9137abb9b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ed6e91621bf3c9a2e5538227… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Feb 11 02:17:42 2016 +0100 msvcp90/tests: Use brackets to protect arguments in call_func macros. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp90/tests/string.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/msvcp90/tests/string.c b/dlls/msvcp90/tests/string.c index 5f8fcd2..8aea30a 100644 --- a/dlls/msvcp90/tests/string.c +++ b/dlls/msvcp90/tests/string.c @@ -149,14 +149,14 @@ static void init_thiscall_thunk(void) } #define call_func1(func,_this) call_thiscall_func1(func,_this) -#define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)a) -#define call_func3(func,_this,a,b) call_thiscall_func3(func,_this,(const void*)a,(const void*)b) -#define call_func4(func,_this,a,b,c) call_thiscall_func4(func,_this,(const void*)a,\ - (const void*)b,(const void*)c) -#define call_func5(func,_this,a,b,c,d) call_thiscall_func5(func,_this,(const void*)a,\ - (const void*)b,(const void*)c,(const void*)d) -#define call_func6(func,_this,a,b,c,d,e) call_thiscall_func6(func,_this,(const void*)a,\ - (const void*)b,(const void*)c,(const void*)d,(const void*)e) +#define call_func2(func,_this,a) call_thiscall_func2(func,_this,(const void*)(a)) +#define call_func3(func,_this,a,b) call_thiscall_func3(func,_this,(const void*)(a),(const void*)(b)) +#define call_func4(func,_this,a,b,c) call_thiscall_func4(func,_this,(const void*)(a),\ + (const void*)(b),(const void*)(c)) +#define call_func5(func,_this,a,b,c,d) call_thiscall_func5(func,_this,(const void*)(a),\ + (const void*)(b),(const void*)(c),(const void*)(d)) +#define call_func6(func,_this,a,b,c,d,e) call_thiscall_func6(func,_this,(const void*)(a),\ + (const void*)(b),(const void*)(c),(const void*)(d),(const void*)(e)) #else

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
76
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 February 2016