January 2016 - Wine-Commits

Józef Kucia : wined3d: Add support for WINED3DFMT_BC3_UNORM format.
by Alexandre Julliard Jan. 9, 2016

Jan. 9, 2016

Module: wine Branch: master Commit: 9d3460c9e0f76030e60885eef833b95c9e7bb6d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d3460c9e0f76030e60885eef… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 7 10:54:39 2016 +0100 wined3d: Add support for WINED3DFMT_BC3_UNORM format. 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 | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4406067..9d053a3 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -57,6 +57,7 @@ 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_BC3_UNORM, 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}, @@ -201,15 +202,16 @@ struct wined3d_format_block_info static const struct wined3d_format_block_info format_block_info[] = { - {WINED3DFMT_DXT1, 4, 4, 8, TRUE}, - {WINED3DFMT_DXT2, 4, 4, 16, TRUE}, - {WINED3DFMT_DXT3, 4, 4, 16, TRUE}, - {WINED3DFMT_DXT4, 4, 4, 16, TRUE}, - {WINED3DFMT_DXT5, 4, 4, 16, TRUE}, - {WINED3DFMT_ATI1N, 4, 4, 8, FALSE}, - {WINED3DFMT_ATI2N, 4, 4, 16, FALSE}, - {WINED3DFMT_YUY2, 2, 1, 4, FALSE}, - {WINED3DFMT_UYVY, 2, 1, 4, FALSE}, + {WINED3DFMT_DXT1, 4, 4, 8, TRUE}, + {WINED3DFMT_DXT2, 4, 4, 16, TRUE}, + {WINED3DFMT_DXT3, 4, 4, 16, TRUE}, + {WINED3DFMT_DXT4, 4, 4, 16, TRUE}, + {WINED3DFMT_DXT5, 4, 4, 16, TRUE}, + {WINED3DFMT_BC3_UNORM, 4, 4, 16, TRUE}, + {WINED3DFMT_ATI1N, 4, 4, 8, FALSE}, + {WINED3DFMT_ATI2N, 4, 4, 16, FALSE}, + {WINED3DFMT_YUY2, 2, 1, 4, FALSE}, + {WINED3DFMT_UYVY, 2, 1, 4, FALSE}, }; struct wined3d_format_vertex_info @@ -950,6 +952,11 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_COMPRESSED, EXT_TEXTURE_COMPRESSION_S3TC, NULL}, + {WINED3DFMT_BC3_UNORM, GL_COMPRESSED_RGBA_S3TC_DXT5_EXT, GL_COMPRESSED_RGBA_S3TC_DXT5_EXT, 0, + GL_RGBA, GL_UNSIGNED_BYTE, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_COMPRESSED, + EXT_TEXTURE_COMPRESSION_S3TC, NULL}, /* IEEE formats */ {WINED3DFMT_R32_FLOAT, GL_RGB32F_ARB, GL_RGB32F_ARB, 0, GL_RED, GL_FLOAT, 0, @@ -2648,6 +2655,8 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; idx = getFmtIdx(WINED3DFMT_DXT5); gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + idx = getFmtIdx(WINED3DFMT_BC3_UNORM); + gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; /* Similarly with ATI1N / ATI2N and GL_ARB_texture_compression_rgtc. */ idx = getFmtIdx(WINED3DFMT_ATI1N); gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE;

1 0

Jacek Caban : mshtml: Merge htmlstyle2.c into htmlstyle.c.
by Alexandre Julliard Jan. 9, 2016

Jan. 9, 2016

Module: wine Branch: master Commit: d22303703428842106f09432111785af7f5b1ad0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d22303703428842106f094321… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 7 14:04:59 2016 +0100 mshtml: Merge htmlstyle2.c into htmlstyle.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/Makefile.in | 1 - dlls/mshtml/htmlstyle.c | 601 +++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/htmlstyle.h | 1 - dlls/mshtml/htmlstyle2.c | 637 ----------------------------------------------- 4 files changed, 600 insertions(+), 640 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d22303703428842106f09…

1 0

Józef Kucia : wined3d: Recreate default_sampler during device reset.
by Alexandre Julliard Jan. 9, 2016

Jan. 9, 2016

Module: wine Branch: master Commit: 9b18f626025c64d4d965f817c10c1ce2aac6ba11 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b18f626025c64d4d965f817c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 7 12:11:31 2016 +0100 wined3d: Recreate default_sampler during device reset. 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/device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 49480c5..7c5a4c2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4508,6 +4508,7 @@ static void delete_opengl_contexts(struct wined3d_device *device, struct wined3d device->blitter->free_private(device); device->shader_backend->shader_free_private(device); destroy_dummy_textures(device, gl_info); + destroy_default_sampler(device); context_release(context); @@ -4565,6 +4566,7 @@ static HRESULT create_primary_opengl_context(struct wined3d_device *device, stru swapchain->context[0] = context; swapchain->num_contexts = 1; create_dummy_textures(device, context); + create_default_sampler(device); context_release(context); return WINED3D_OK;

1 0

Józef Kucia : wined3d: Add support for WINED3DFMT_R8G8_UNORM format.
by Alexandre Julliard Jan. 9, 2016

Jan. 9, 2016

Module: wine Branch: master Commit: a5889a5cda7cd353d394f54d421864da44c9de1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5889a5cda7cd353d394f54d4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 7 10:54:44 2016 +0100 wined3d: Add support for WINED3DFMT_R8G8_UNORM format. 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 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index d828779..f06affd 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -102,6 +102,7 @@ static const struct wined3d_format_channels formats[] = {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}, /* 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}, @@ -1109,6 +1110,10 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET, WINED3D_GL_EXT_NONE, NULL}, + {WINED3DFMT_R8G8_UNORM, GL_RG8, GL_RG8, 0, + GL_RG, GL_UNSIGNED_BYTE, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING, + ARB_TEXTURE_RG, NULL}, /* Luminance */ {WINED3DFMT_L8_UNORM, GL_LUMINANCE8, GL_SLUMINANCE8_EXT, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, 0,

1 0

Jactry Zeng : riched20: Print boundary for ME_CheckCharOffsets only when richedit_check channel was opened.
by Alexandre Julliard Jan. 9, 2016

Jan. 9, 2016

Module: wine Branch: master Commit: 684965b86621bb86a6e58898c53c835ad1bbbb69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=684965b86621bb86a6e58898c… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Mon Jan 4 16:09:53 2016 +0800 riched20: Print boundary for ME_CheckCharOffsets only when richedit_check channel was opened. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/run.c | 10 +++++----- dlls/riched20/wrap.c | 20 +++++++------------- 2 files changed, 12 insertions(+), 18 deletions(-) diff --git a/dlls/riched20/run.c b/dlls/riched20/run.c index 7016932..3126cc9 100644 --- a/dlls/riched20/run.c +++ b/dlls/riched20/run.c @@ -102,6 +102,8 @@ void ME_CheckCharOffsets(ME_TextEditor *editor) { ME_DisplayItem *p = editor->pBuffer->pFirst; int ofs = 0, ofsp = 0; + + TRACE_(richedit_check)("Checking begin\n"); if(TRACE_ON(richedit_lists)) { TRACE_(richedit_lists)("---\n"); @@ -113,6 +115,7 @@ void ME_CheckCharOffsets(ME_TextEditor *editor) case diTextEnd: TRACE_(richedit_check)("tend, real ofsp = %d, counted = %d\n", p->member.para.nCharOfs, ofsp+ofs); assert(ofsp+ofs == p->member.para.nCharOfs); + TRACE_(richedit_check)("Checking finished\n"); return; case diParagraph: TRACE_(richedit_check)("para, real ofsp = %d, counted = %d\n", p->member.para.nCharOfs, ofsp+ofs); @@ -137,6 +140,7 @@ void ME_CheckCharOffsets(ME_TextEditor *editor) assert(0); } } while(1); + TRACE_(richedit_check)("Checking finished\n"); } /****************************************************************************** @@ -234,12 +238,8 @@ void ME_JoinRuns(ME_TextEditor *editor, ME_DisplayItem *p) ME_Remove(pNext); ME_DestroyDisplayItem(pNext); ME_UpdateRunFlags(editor, &p->member.run); - if(TRACE_ON(richedit)) - { - TRACE("Before check after join\n"); + if(TRACE_ON(richedit_check)) ME_CheckCharOffsets(editor); - TRACE("After check after join\n"); - } } /****************************************************************************** diff --git a/dlls/riched20/wrap.c b/dlls/riched20/wrap.c index 6c9f2e3..e8575fdb 100644 --- a/dlls/riched20/wrap.c +++ b/dlls/riched20/wrap.c @@ -23,6 +23,7 @@ #include "editor.h" WINE_DEFAULT_DEBUG_CHANNEL(richedit); +WINE_DECLARE_DEBUG_CHANNEL(richedit_check); /* * Unsolved problems: @@ -123,12 +124,8 @@ static ME_DisplayItem *split_run_extents(ME_WrapContext *wc, ME_DisplayItem *ite ME_Cursor cursor = {wc->pPara, item, nVChar}; assert(item->member.run.nCharOfs != -1); - if(TRACE_ON(richedit)) - { - TRACE("Before check before split\n"); + if(TRACE_ON(richedit_check)) ME_CheckCharOffsets(editor); - TRACE("After check before split\n"); - } run = &item->member.run; @@ -147,15 +144,12 @@ static ME_DisplayItem *split_run_extents(ME_WrapContext *wc, ME_DisplayItem *ite run2->pt.x = run->pt.x+run->nWidth; run2->pt.y = run->pt.y; - if(TRACE_ON(richedit)) - { - TRACE("Before check after split\n"); + if(TRACE_ON(richedit_check)) ME_CheckCharOffsets(editor); - TRACE("After check after split\n"); - TRACE("After split: %s(%d, %d), %s(%d, %d)\n", - debugstr_run( run ), run->pt.x, run->pt.y, - debugstr_run( run2 ), run2->pt.x, run2->pt.y); - } + + TRACE("After split: %s(%d, %d), %s(%d, %d)\n", + debugstr_run( run ), run->pt.x, run->pt.y, + debugstr_run( run2 ), run2->pt.x, run2->pt.y); return cursor.pRun; }

1 0

Jacek Caban : mshtml: Merge htmlstyle3.c into htmlstyle.c.
by Alexandre Julliard Jan. 9, 2016

Jan. 9, 2016

Module: wine Branch: master Commit: f7597a6a1f5c156316b896f22aa1f6ea6a558c06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7597a6a1f5c156316b896f22… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Jan 7 14:06:24 2016 +0100 mshtml: Merge htmlstyle3.c into htmlstyle.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/Makefile.in | 1 - dlls/mshtml/htmlstyle.c | 923 ++++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/htmlstyle.h | 1 - dlls/mshtml/htmlstyle3.c | 958 ----------------------------------------------- 4 files changed, 922 insertions(+), 961 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f7597a6a1f5c156316b89…

1 0

Józef Kucia : d3d11/tests: Add test for block-compressed textures.
by Alexandre Julliard Jan. 9, 2016

Jan. 9, 2016

Module: wine Branch: master Commit: 334081882bfd752c3c27425c6a80967ca1a18a85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=334081882bfd752c3c27425c6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 7 10:54:42 2016 +0100 d3d11/tests: Add test for block-compressed textures. 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/d3d11/tests/d3d11.c | 251 ++++++++++++++++++++++++++++------------------- 1 file changed, 151 insertions(+), 100 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=334081882bfd752c3c274…

1 0

Józef Kucia : wined3d: Add support for WINED3DFMT_BC2_UNORM format.
by Alexandre Julliard Jan. 9, 2016

Jan. 9, 2016

Module: wine Branch: master Commit: 09d2e1d484dc588d9d74fc20d54121c067462c4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=09d2e1d484dc588d9d74fc20d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 7 10:54:41 2016 +0100 wined3d: Add support for WINED3DFMT_BC2_UNORM format. 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 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 397826b..d828779 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -58,6 +58,7 @@ static const struct wined3d_format_channels formats[] = {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_BC2_UNORM, 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_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}, @@ -209,6 +210,7 @@ static const struct wined3d_format_block_info format_block_info[] = {WINED3DFMT_DXT4, 4, 4, 16, TRUE}, {WINED3DFMT_DXT5, 4, 4, 16, TRUE}, {WINED3DFMT_BC1_UNORM, 4, 4, 8, TRUE}, + {WINED3DFMT_BC2_UNORM, 4, 4, 16, TRUE}, {WINED3DFMT_BC3_UNORM, 4, 4, 16, TRUE}, {WINED3DFMT_ATI1N, 4, 4, 8, FALSE}, {WINED3DFMT_ATI2N, 4, 4, 16, FALSE}, @@ -959,6 +961,11 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_COMPRESSED, EXT_TEXTURE_COMPRESSION_S3TC, NULL}, + {WINED3DFMT_BC2_UNORM, GL_COMPRESSED_RGBA_S3TC_DXT3_EXT, GL_COMPRESSED_RGBA_S3TC_DXT3_EXT, 0, + GL_RGBA, GL_UNSIGNED_BYTE, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_COMPRESSED, + EXT_TEXTURE_COMPRESSION_S3TC, NULL}, {WINED3DFMT_BC3_UNORM, GL_COMPRESSED_RGBA_S3TC_DXT5_EXT, GL_COMPRESSED_RGBA_S3TC_DXT5_EXT, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING @@ -2664,6 +2671,8 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; idx = getFmtIdx(WINED3DFMT_BC1_UNORM); gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + idx = getFmtIdx(WINED3DFMT_BC2_UNORM); + gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; idx = getFmtIdx(WINED3DFMT_BC3_UNORM); gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; /* Similarly with ATI1N / ATI2N and GL_ARB_texture_compression_rgtc. */

1 0

Józef Kucia : wined3d: Add support for WINED3DFMT_BC1_UNORM format.
by Alexandre Julliard Jan. 9, 2016

Jan. 9, 2016

Module: wine Branch: master Commit: 3e1120421011f9667b1b362341458f3438baf0e0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e1120421011f9667b1b36234… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 7 10:54:40 2016 +0100 wined3d: Add support for WINED3DFMT_BC1_UNORM format. 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 | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 9d053a3..397826b 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -57,6 +57,7 @@ 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_BC3_UNORM, 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}, @@ -207,6 +208,7 @@ static const struct wined3d_format_block_info format_block_info[] = {WINED3DFMT_DXT3, 4, 4, 16, TRUE}, {WINED3DFMT_DXT4, 4, 4, 16, TRUE}, {WINED3DFMT_DXT5, 4, 4, 16, TRUE}, + {WINED3DFMT_BC1_UNORM, 4, 4, 8, TRUE}, {WINED3DFMT_BC3_UNORM, 4, 4, 16, TRUE}, {WINED3DFMT_ATI1N, 4, 4, 8, FALSE}, {WINED3DFMT_ATI2N, 4, 4, 16, FALSE}, @@ -952,6 +954,11 @@ static const struct wined3d_format_texture_info format_texture_info[] = WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_SRGB_READ | WINED3DFMT_FLAG_COMPRESSED, EXT_TEXTURE_COMPRESSION_S3TC, NULL}, + {WINED3DFMT_BC1_UNORM, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, GL_COMPRESSED_RGBA_S3TC_DXT1_EXT, 0, + GL_RGBA, GL_UNSIGNED_BYTE, 0, + WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING + | WINED3DFMT_FLAG_COMPRESSED, + EXT_TEXTURE_COMPRESSION_S3TC, NULL}, {WINED3DFMT_BC3_UNORM, GL_COMPRESSED_RGBA_S3TC_DXT5_EXT, GL_COMPRESSED_RGBA_S3TC_DXT5_EXT, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0, WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING @@ -2655,6 +2662,8 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; idx = getFmtIdx(WINED3DFMT_DXT5); gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; + idx = getFmtIdx(WINED3DFMT_BC1_UNORM); + gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; idx = getFmtIdx(WINED3DFMT_BC3_UNORM); gl_info->formats[idx].flags[WINED3D_GL_RES_TYPE_TEX_3D] &= ~WINED3DFMT_FLAG_TEXTURE; /* Similarly with ATI1N / ATI2N and GL_ARB_texture_compression_rgtc. */

1 0

Józef Kucia : d3d10core/tests: Add test for block-compressed textures.
by Alexandre Julliard Jan. 9, 2016

Jan. 9, 2016

Module: wine Branch: master Commit: a8f9d0e1fbe414ff78769a6a2defed8c1063cefe URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8f9d0e1fbe414ff78769a6a2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 7 10:54:43 2016 +0100 d3d10core/tests: Add test for block-compressed textures. 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/d3d10core/tests/device.c | 251 +++++++++++++++++++++++++----------------- 1 file changed, 151 insertions(+), 100 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a8f9d0e1fbe414ff78769…

1 0