July 2016 - Wine-commits - list.winehq.org

Jacek Caban : mshtml: Set compatibility mode based on doctype.
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: 6614df04a8d502c1fc027d14b6b49f41ff0e184d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6614df04a8d502c1fc027d14b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 5 22:47:33 2016 +0200 mshtml: Set compatibility mode based on doctype. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/mutation.c | 11 +++++++++++ dlls/mshtml/nsiface.idl | 15 ++++++++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/mutation.c b/dlls/mshtml/mutation.c index dd3d119..a298ecb 100644 --- a/dlls/mshtml/mutation.c +++ b/dlls/mshtml/mutation.c @@ -729,6 +729,17 @@ static void NSAPI nsDocumentObserver_BindToDocument(nsIDocumentObserver *iface, return; } + if(This->document_mode == COMPAT_MODE_QUIRKS) { + nsIDOMDocumentType *nsdoctype; + nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMDocumentType, (void**)&nsdoctype); + if(NS_SUCCEEDED(nsres)) { + TRACE("doctype node\n"); + /* FIXME: We should set it to something higher for internet zone. */ + set_document_mode(This, COMPAT_MODE_IE7); + nsIDOMDocumentType_Release(nsdoctype); + } + } + nsres = nsIContent_QueryInterface(aContent, &IID_nsIDOMHTMLElement, (void**)&nselem); if(NS_FAILED(nsres)) return; diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index 1b6104a..e9c717d 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -134,7 +134,6 @@ typedef nsISupports nsISHistory; typedef nsISupports nsIWidget; typedef nsISupports nsIPrompt; typedef nsISupports nsIAuthPrompt; -typedef nsISupports nsIDOMDocumentType; typedef nsISupports nsIDOMDOMImplementation; typedef nsISupports nsIDOMCDATASection; typedef nsISupports nsIDOMProcessingInstruction; @@ -1201,6 +1200,20 @@ interface nsIDOMComment : nsIDOMCharacterData [ object, + uuid(cd7467b9-0f26-4787-a359-66e80ba8db92), + local +] +interface nsIDOMDocumentType : nsIDOMNode +{ + nsresult GetName(nsAString *aName); + nsresult GetPublicId(nsAString *aPublicId); + nsresult GetSystemId(nsAString *aSystemId); + nsresult GetInternalSubset(nsAString *aInternalSubset); + nsresult MozRemove(); +} + +[ + object, uuid(48eb8d72-95bb-402e-a8fc-f2b187abcbdb), local ]

1 0

Jacek Caban : mshtml: Added document.documentMode tests.
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: 429e0dde694fc4e81302e0d01efb5b32317f542f URL: http://source.winehq.org/git/wine.git/?a=commit;h=429e0dde694fc4e81302e0d01… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 5 22:47:56 2016 +0200 mshtml: Added document.documentMode tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/documentmode.js | 37 +++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/rsrc.rc | 3 +++ dlls/mshtml/tests/script.c | 9 +++++++++ 3 files changed, 49 insertions(+) diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js new file mode 100644 index 0000000..89fe0a9 --- /dev/null +++ b/dlls/mshtml/tests/documentmode.js @@ -0,0 +1,37 @@ +/* + * Copyright 2016 Jacek Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +function test_doc_mode() { + var opt = parseInt(document.location.search.substring(1)); + + trace("Testing document mode " + opt); + + if(opt > document.documentMode) { + win_skip("Document mode not supported (expected " + opt + " got " + document.documentMode + ")"); + reportSuccess(); + return; + } + + ok(opt === document.documentMode, "documentMode = " + document.documentMode); + + next_test(); +} + +var tests = [ + test_doc_mode +]; diff --git a/dlls/mshtml/tests/rsrc.rc b/dlls/mshtml/tests/rsrc.rc index a9ab563..8b28dfa 100644 --- a/dlls/mshtml/tests/rsrc.rc +++ b/dlls/mshtml/tests/rsrc.rc @@ -40,6 +40,9 @@ navigation.js HTML "navigation.js" /* @makedep: xhr.js */ xhr.js HTML "xhr.js" +/* @makedep: documentmode.js */ +documentmode.js HTML "documentmode.js" + /* @makedep: blank.html */ blank.html HTML "blank.html" diff --git a/dlls/mshtml/tests/script.c b/dlls/mshtml/tests/script.c index eadf737..eda3005 100644 --- a/dlls/mshtml/tests/script.c +++ b/dlls/mshtml/tests/script.c @@ -3320,6 +3320,15 @@ static void run_js_tests(void) run_script_as_http_with_mode("xhr.js", NULL, "11"); run_script_as_http_with_mode("navigation.js", NULL, NULL); run_script_as_http_with_mode("navigation.js", NULL, "11"); + + run_script_as_http_with_mode("documentmode.js", "?5", NULL); + run_script_as_http_with_mode("documentmode.js", "?5", "5"); + run_script_as_http_with_mode("documentmode.js", "?5", "6"); + run_script_as_http_with_mode("documentmode.js", "?7", "7"); + run_script_as_http_with_mode("documentmode.js", "?8", "8"); + run_script_as_http_with_mode("documentmode.js", "?9", "9"); + run_script_as_http_with_mode("documentmode.js", "?10", "10"); + run_script_as_http_with_mode("documentmode.js", "?11", "11"); } static BOOL init_registry(BOOL init)

1 0

Jacek Caban : mshtml: Reimplement IHTMLDocument5:: get_compatMode based on document mode.
by Alexandre Julliard 06 Jul '16

06 Jul '16

Module: wine Branch: master Commit: 87f7aea1cad423eb576fec8ea1d508640775d67b URL: http://source.winehq.org/git/wine.git/?a=commit;h=87f7aea1cad423eb576fec8ea… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jul 5 22:48:04 2016 +0200 mshtml: Reimplement IHTMLDocument5::get_compatMode based on document mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 15 +++++---------- dlls/mshtml/tests/documentmode.js | 5 +++++ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 1c0cc35..8fa3f52 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -2947,19 +2947,14 @@ static HRESULT WINAPI HTMLDocument5_get_onbeforedeactivate(IHTMLDocument5 *iface static HRESULT WINAPI HTMLDocument5_get_compatMode(IHTMLDocument5 *iface, BSTR *p) { HTMLDocument *This = impl_from_IHTMLDocument5(iface); - nsAString mode_str; - nsresult nsres; - TRACE("(%p)->(%p)\n", This, p); + static const WCHAR BackCompatW[] = {'B','a','c','k','C','o','m','p','a','t',0}; + static const WCHAR CSS1CompatW[] = {'C','S','S','1','C','o','m','p','a','t',0}; - if(!This->doc_node->nsdoc) { - WARN("NULL nsdoc\n"); - return E_UNEXPECTED; - } + TRACE("(%p)->(%p)\n", This, p); - nsAString_Init(&mode_str, NULL); - nsres = nsIDOMHTMLDocument_GetCompatMode(This->doc_node->nsdoc, &mode_str); - return return_nsstr(nsres, &mode_str, p); + *p = SysAllocString(This->doc_node->document_mode == COMPAT_MODE_QUIRKS ? BackCompatW : CSS1CompatW); + return *p ? S_OK : E_OUTOFMEMORY; } static const IHTMLDocument5Vtbl HTMLDocument5Vtbl = { diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 89fe0a9..5979514 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -29,6 +29,11 @@ function test_doc_mode() { ok(opt === document.documentMode, "documentMode = " + document.documentMode); + if(document.documentMode > 5) + ok(document.compatMode === "CSS1Compat", "document.compatMode = " + document.compatMode); + else + ok(document.compatMode === "BackCompat", "document.compatMode = " + document.compatMode); + next_test(); }

1 0

Hugh McMaster : regedit: Process the next file, if any, on error.
by Alexandre Julliard 05 Jul '16

05 Jul '16

Module: wine Branch: master Commit: 6ad44d7a3190d8e9a3daa9bd723980e5c4320b42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ad44d7a3190d8e9a3daa9bd7… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Tue Jul 5 09:13:35 2016 +0000 regedit: Process the next file, if any, on error. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/regedit.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/programs/regedit/regedit.c b/programs/regedit/regedit.c index 04dd317..c37f695 100644 --- a/programs/regedit/regedit.c +++ b/programs/regedit/regedit.c @@ -88,7 +88,7 @@ typedef enum { ACTION_ADD, ACTION_EXPORT, ACTION_DELETE } REGEDIT_ACTION; -static BOOL PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i) +static void PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i) { switch (action) { case ACTION_ADD: { @@ -113,7 +113,8 @@ static BOOL PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i) if (size == 0) { output_message(STRING_FILE_NOT_FOUND, filename); - exit(1); + HeapFree(GetProcessHeap(), 0, realname); + return; } reg_file = _wfopen(realname, rb_mode); if (reg_file == NULL) @@ -121,7 +122,8 @@ static BOOL PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i) WCHAR regedit[] = {'r','e','g','e','d','i','t',0}; _wperror(regedit); output_message(STRING_CANNOT_OPEN_FILE, filename); - exit(1); + HeapFree(GetProcessHeap(), 0, realname); + return; } import_registry_file(reg_file); if (realname) @@ -150,7 +152,6 @@ static BOOL PerformRegAction(REGEDIT_ACTION action, WCHAR **argv, int *i) exit(1); break; } - return TRUE; } BOOL ProcessCmdLine(WCHAR *cmdline)

1 0

Józef Kucia : d3d11/tests: Add test for creating unordered access views.
by Alexandre Julliard 05 Jul '16

05 Jul '16

Module: wine Branch: master Commit: 4de5e9c0bfe1ed00218ea0572b065d1cec0bad1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=4de5e9c0bfe1ed00218ea0572… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jul 5 11:46:50 2016 +0200 d3d11/tests: Add test for creating unordered access views. 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 | 379 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 379 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4de5e9c0bfe1ed00218ea…

1 0

Józef Kucia : wined3d: Recognize SM5 cut_stream opcode.
by Alexandre Julliard 05 Jul '16

05 Jul '16

Module: wine Branch: master Commit: bd405f6bd69cc15c8a36c7666dc4822674e38434 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd405f6bd69cc15c8a36c7666… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jul 5 11:46:51 2016 +0200 wined3d: Recognize SM5 cut_stream 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 0b4c6a0..cd016e3 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5226,6 +5226,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_CND */ pshader_hw_cnd, /* WINED3DSIH_CRS */ shader_hw_map2gl, /* WINED3DSIH_CUT */ NULL, + /* WINED3DSIH_CUT_STREAM */ NULL, /* WINED3DSIH_DCL */ shader_hw_nop, /* WINED3DSIH_DCL_CONSTANT_BUFFER */ shader_hw_nop, /* WINED3DSIH_DCL_GLOBAL_FLAGS */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5c33106..e0aeed8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8578,6 +8578,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_CND */ shader_glsl_cnd, /* WINED3DSIH_CRS */ shader_glsl_cross, /* WINED3DSIH_CUT */ shader_glsl_cut, + /* WINED3DSIH_CUT_STREAM */ NULL, /* WINED3DSIH_DCL */ shader_glsl_nop, /* WINED3DSIH_DCL_CONSTANT_BUFFER */ shader_glsl_nop, /* WINED3DSIH_DCL_GLOBAL_FLAGS */ shader_glsl_nop, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 2a3b9a9..a520744 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -56,6 +56,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_CND */ "cnd", /* WINED3DSIH_CRS */ "crs", /* WINED3DSIH_CUT */ "cut", + /* WINED3DSIH_CUT_STREAM */ "cut_stream", /* WINED3DSIH_DCL */ "dcl", /* WINED3DSIH_DCL_CONSTANT_BUFFER */ "dcl_constantBuffer", /* WINED3DSIH_DCL_GLOBAL_FLAGS */ "dcl_globalFlags", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 4c09843..22012c7 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -207,6 +207,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_HS_FORK_PHASE = 0x73, WINED3D_SM5_OP_HS_JOIN_PHASE = 0x74, WINED3D_SM5_OP_EMIT_STREAM = 0x75, + WINED3D_SM5_OP_CUT_STREAM = 0x76, WINED3D_SM5_OP_BUFINFO = 0x79, WINED3D_SM5_OP_DERIV_RTX_COARSE = 0x7a, WINED3D_SM5_OP_DERIV_RTX_FINE = 0x7b, @@ -799,6 +800,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_HS_FORK_PHASE, WINED3DSIH_HS_FORK_PHASE, "", ""}, {WINED3D_SM5_OP_HS_JOIN_PHASE, WINED3DSIH_HS_JOIN_PHASE, "", ""}, {WINED3D_SM5_OP_EMIT_STREAM, WINED3DSIH_EMIT_STREAM, "", "f"}, + {WINED3D_SM5_OP_CUT_STREAM, WINED3DSIH_CUT_STREAM, "", "f"}, {WINED3D_SM5_OP_BUFINFO, WINED3DSIH_BUFINFO, "i", "U"}, {WINED3D_SM5_OP_DERIV_RTX_COARSE, WINED3DSIH_DSX_COARSE, "f", "f"}, {WINED3D_SM5_OP_DERIV_RTX_FINE, WINED3DSIH_DSX_FINE, "f", "f"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f592664..6a3df61 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -572,6 +572,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_CND, WINED3DSIH_CRS, WINED3DSIH_CUT, + WINED3DSIH_CUT_STREAM, WINED3DSIH_DCL, WINED3DSIH_DCL_CONSTANT_BUFFER, WINED3DSIH_DCL_GLOBAL_FLAGS,

1 0

Józef Kucia : wined3d: Recognize SM5 swapc opcode.
by Alexandre Julliard 05 Jul '16

05 Jul '16

Module: wine Branch: master Commit: eab16f13109ec2ac4566705773b45185559212fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=eab16f13109ec2ac456670577… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jul 5 11:46:52 2016 +0200 wined3d: Recognize SM5 swapc 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 cd016e3..6b53eba 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5367,6 +5367,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_STORE_STRUCTURED */ NULL, /* WINED3DSIH_STORE_UAV_TYPED */ NULL, /* WINED3DSIH_SUB */ shader_hw_map2gl, + /* WINED3DSIH_SWAPC */ NULL, /* WINED3DSIH_SWITCH */ NULL, /* WINED3DSIH_TEX */ pshader_hw_tex, /* WINED3DSIH_TEXBEM */ pshader_hw_texbem, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e0aeed8..ced7561 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8719,6 +8719,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_STORE_STRUCTURED */ NULL, /* WINED3DSIH_STORE_UAV_TYPED */ NULL, /* WINED3DSIH_SUB */ shader_glsl_binop, + /* WINED3DSIH_SWAPC */ NULL, /* WINED3DSIH_SWITCH */ shader_glsl_switch, /* WINED3DSIH_TEX */ shader_glsl_tex, /* WINED3DSIH_TEXBEM */ shader_glsl_texbem, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index a520744..cd52ad6 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -197,6 +197,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_STORE_STRUCTURED */ "store_structured", /* WINED3DSIH_STORE_UAV_TYPED */ "store_uav_typed", /* WINED3DSIH_SUB */ "sub", + /* WINED3DSIH_SWAPC */ "swapc", /* WINED3DSIH_SWITCH */ "switch", /* WINED3DSIH_TEX */ "texld", /* WINED3DSIH_TEXBEM */ "texbem", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 22012c7..7f15a82 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -215,6 +215,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DERIV_RTY_FINE = 0x7d, WINED3D_SM5_OP_GATHER4_C = 0x7e, WINED3D_SM5_OP_BFI = 0x8c, + WINED3D_SM5_OP_SWAPC = 0x8e, WINED3D_SM5_OP_DCL_STREAM = 0x8f, WINED3D_SM5_OP_DCL_INPUT_CONTROL_POINT_COUNT = 0x93, WINED3D_SM5_OP_DCL_OUTPUT_CONTROL_POINT_COUNT = 0x94, @@ -808,6 +809,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_DERIV_RTY_FINE, WINED3DSIH_DSY_FINE, "f", "f"}, {WINED3D_SM5_OP_GATHER4_C, WINED3DSIH_GATHER4_C, "f", "fRSf"}, {WINED3D_SM5_OP_BFI, WINED3DSIH_BFI, "u", "uuuu"}, + {WINED3D_SM5_OP_SWAPC, WINED3DSIH_SWAPC, "ff", "uff"}, {WINED3D_SM5_OP_DCL_STREAM, WINED3DSIH_DCL_STREAM, "", "f"}, {WINED3D_SM5_OP_DCL_INPUT_CONTROL_POINT_COUNT, WINED3DSIH_DCL_INPUT_CONTROL_POINT_COUNT, "", "", shader_sm5_read_control_point_count}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6a3df61..1e0bb2f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -713,6 +713,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_STORE_STRUCTURED, WINED3DSIH_STORE_UAV_TYPED, WINED3DSIH_SUB, + WINED3DSIH_SWAPC, WINED3DSIH_SWITCH, WINED3DSIH_TEX, WINED3DSIH_TEXBEM,

1 0

Józef Kucia : wined3d: Implement SM4 continue instruction.
by Alexandre Julliard 05 Jul '16

05 Jul '16

Module: wine Branch: master Commit: 57732599e5a5665daee958056d1dfb8bff154ad2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57732599e5a5665daee958056… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jul 5 11:46:53 2016 +0200 wined3d: Implement SM4 continue instruction. 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 | 6 ++++++ dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 11 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 6b53eba..deae1cc 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5224,6 +5224,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_CASE */ NULL, /* WINED3DSIH_CMP */ pshader_hw_cmp, /* WINED3DSIH_CND */ pshader_hw_cnd, + /* WINED3DSIH_CONTINUE */ NULL, /* WINED3DSIH_CRS */ shader_hw_map2gl, /* WINED3DSIH_CUT */ NULL, /* WINED3DSIH_CUT_STREAM */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ced7561..e06f47b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4330,6 +4330,11 @@ static void shader_glsl_breakp(const struct wined3d_shader_instruction *ins) shader_addline(ins->ctx->buffer, "if (%s(%s)) break;\n", condition, src_param.param_str); } +static void shader_glsl_continue(const struct wined3d_shader_instruction *ins) +{ + shader_addline(ins->ctx->buffer, "continue;\n"); +} + static void shader_glsl_label(const struct wined3d_shader_instruction *ins) { shader_addline(ins->ctx->buffer, "}\n"); @@ -8576,6 +8581,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_CASE */ shader_glsl_case, /* WINED3DSIH_CMP */ shader_glsl_conditional_move, /* WINED3DSIH_CND */ shader_glsl_cnd, + /* WINED3DSIH_CONTINUE */ shader_glsl_continue, /* WINED3DSIH_CRS */ shader_glsl_cross, /* WINED3DSIH_CUT */ shader_glsl_cut, /* WINED3DSIH_CUT_STREAM */ NULL, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index cd52ad6..ce301cc 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -54,6 +54,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_CASE */ "case", /* WINED3DSIH_CMP */ "cmp", /* WINED3DSIH_CND */ "cnd", + /* WINED3DSIH_CONTINUE */ "continue", /* WINED3DSIH_CRS */ "crs", /* WINED3DSIH_CUT */ "cut", /* WINED3DSIH_CUT_STREAM */ "cut_stream", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 7f15a82..abfcf4f 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -112,6 +112,7 @@ enum wined3d_sm4_opcode WINED3D_SM4_OP_BREAK = 0x02, WINED3D_SM4_OP_BREAKC = 0x03, WINED3D_SM4_OP_CASE = 0x06, + WINED3D_SM4_OP_CONTINUE = 0x07, WINED3D_SM4_OP_CUT = 0x09, WINED3D_SM4_OP_DEFAULT = 0x0a, WINED3D_SM4_OP_DERIV_RTX = 0x0b, @@ -687,6 +688,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM4_OP_BREAKC, WINED3DSIH_BREAKP, "", "u", shader_sm4_read_conditional_op}, {WINED3D_SM4_OP_CASE, WINED3DSIH_CASE, "", "u"}, + {WINED3D_SM4_OP_CONTINUE, WINED3DSIH_CONTINUE, "", ""}, {WINED3D_SM4_OP_CUT, WINED3DSIH_CUT, "", ""}, {WINED3D_SM4_OP_DEFAULT, WINED3DSIH_DEFAULT, "", ""}, {WINED3D_SM4_OP_DERIV_RTX, WINED3DSIH_DSX, "f", "f"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1e0bb2f..e8dc3fd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -570,6 +570,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_CASE, WINED3DSIH_CMP, WINED3DSIH_CND, + WINED3DSIH_CONTINUE, WINED3DSIH_CRS, WINED3DSIH_CUT, WINED3DSIH_CUT_STREAM,

1 0

Józef Kucia : wined3d: Do not limit temporary register count to 32 in SM4+.
by Alexandre Julliard 05 Jul '16

05 Jul '16

Module: wine Branch: master Commit: eb5c8d71fb31f5464457782182eb7772d06b8453 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb5c8d71fb31f546445778218… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jul 5 11:46:54 2016 +0200 wined3d: Do not limit temporary register count to 32 in SM4+. 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/glsl_shader.c | 13 +++++++++++-- dlls/wined3d/shader.c | 4 ++++ dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e06f47b..8b5af9e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2168,9 +2168,18 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont shader_addline(buffer, "vec4 %s_out[%u];\n", prefix, shader->limits->packed_output); /* Declare temporary variables */ - for (i = 0, map = reg_maps->temporary; map; map >>= 1, ++i) + if (reg_maps->temporary_count) { - if (map & 1) shader_addline(buffer, "vec4 R%u;\n", i); + for (i = 0; i < reg_maps->temporary_count; ++i) + shader_addline(buffer, "vec4 R%u;\n", i); + } + else + { + for (i = 0, map = reg_maps->temporary; map; map >>= 1, ++i) + { + if (map & 1) + shader_addline(buffer, "vec4 R%u;\n", i); + } } /* Declare indexable temporary variables */ diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index ce301cc..9bf7164 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -982,6 +982,10 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st if (ins.flags & WINED3DSI_SAMPLER_COMPARISON_MODE) reg_maps->sampler_comparison_mode |= (1u << ins.declaration.dst.reg.idx[0].offset); } + else if (ins.handler_idx == WINED3DSIH_DCL_TEMPS) + { + reg_maps->temporary_count = ins.declaration.count; + } else if (ins.handler_idx == WINED3DSIH_DCL_VERTICES_OUT) { if (shader_version.type == WINED3D_SHADER_TYPE_GEOMETRY) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e8dc3fd..ec52b15 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -530,7 +530,6 @@ enum wined3d_shader_conditional_op /* TODO: Make this dynamic, based on shader limits ? */ #define MAX_ATTRIBS 16 #define MAX_REG_ADDR 1 -#define MAX_REG_TEMP 32 #define MAX_REG_TEXCRD 8 #define MAX_REG_INPUT 32 #define MAX_REG_OUTPUT 32 @@ -810,7 +809,8 @@ struct wined3d_shader_reg_maps BYTE texcoord; /* MAX_REG_TEXCRD, 8 */ BYTE address; /* MAX_REG_ADDR, 1 */ WORD labels; /* MAX_LABELS, 16 */ - DWORD temporary; /* MAX_REG_TEMP, 32 */ + DWORD temporary; /* 32 */ + unsigned int temporary_count; DWORD *constf; /* pixel, vertex */ struct list indexable_temps; const struct wined3d_shader_immediate_constant_buffer *icb;

1 0

Józef Kucia : wined3d: Allow to create WINED3DFMT_R{16, 32}_TYPELESS depth textures.
by Alexandre Julliard 05 Jul '16

05 Jul '16

Module: wine Branch: master Commit: c7fdde8e83640c43746fd363c1ff63d862db43b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7fdde8e83640c43746fd363c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jul 5 11:46:55 2016 +0200 wined3d: Allow to create WINED3DFMT_R{16, 32}_TYPELESS depth 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 | 3 ++- dlls/d3d11/tests/d3d11.c | 3 ++- dlls/wined3d/utils.c | 8 ++++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 5f4981f..7067ee6 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -1055,6 +1055,7 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R32_TYPELESS, 9, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R32_TYPELESS, 9, D3D10_BIND_SHADER_RESOURCE, D3D10_RESOURCE_MISC_TEXTURECUBE, FALSE, TRUE}, + {DXGI_FORMAT_R32_TYPELESS, 1, D3D11_BIND_DEPTH_STENCIL, 0, TRUE, FALSE}, {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D10_BIND_VERTEX_BUFFER, 0, FALSE, TRUE}, {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D10_BIND_INDEX_BUFFER, 0, FALSE, TRUE}, {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D10_BIND_CONSTANT_BUFFER, 0, FALSE, TRUE}, @@ -1065,7 +1066,7 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R8G8_UNORM, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8_SNORM, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R16_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, - {DXGI_FORMAT_R16_TYPELESS, 1, D3D10_BIND_DEPTH_STENCIL, 0, TRUE, TRUE}, + {DXGI_FORMAT_R16_TYPELESS, 1, D3D10_BIND_DEPTH_STENCIL, 0, TRUE, FALSE}, {DXGI_FORMAT_R8_TYPELESS, 1, D3D10_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8B8A8_UNORM, 1, D3D10_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8B8A8_UNORM, 1, D3D10_BIND_DEPTH_STENCIL, 0, FALSE, FALSE}, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 174031c..b3b67c4 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1476,6 +1476,7 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R32_TYPELESS, 9, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R32_TYPELESS, 9, D3D11_BIND_SHADER_RESOURCE, D3D11_RESOURCE_MISC_TEXTURECUBE, TRUE, FALSE}, + {DXGI_FORMAT_R32_TYPELESS, 1, D3D11_BIND_DEPTH_STENCIL, 0, TRUE, FALSE}, {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D11_BIND_VERTEX_BUFFER, 0, FALSE, TRUE}, {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D11_BIND_INDEX_BUFFER, 0, FALSE, TRUE}, {DXGI_FORMAT_R24G8_TYPELESS, 1, D3D11_BIND_CONSTANT_BUFFER, 0, FALSE, TRUE}, @@ -1486,7 +1487,7 @@ static void test_create_texture2d(void) {DXGI_FORMAT_R8G8_UNORM, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8_SNORM, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R16_TYPELESS, 1, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, - {DXGI_FORMAT_R16_TYPELESS, 1, D3D11_BIND_DEPTH_STENCIL, 0, TRUE, TRUE}, + {DXGI_FORMAT_R16_TYPELESS, 1, D3D11_BIND_DEPTH_STENCIL, 0, TRUE, FALSE}, {DXGI_FORMAT_R8_TYPELESS, 1, D3D11_BIND_SHADER_RESOURCE, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8B8A8_UNORM, 1, D3D11_BIND_RENDER_TARGET, 0, TRUE, FALSE}, {DXGI_FORMAT_R8G8B8A8_UNORM, 1, D3D11_BIND_DEPTH_STENCIL, 0, FALSE, FALSE}, diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 01e56eb..394f8ea 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -234,6 +234,7 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_R32_UINT, WINED3DFMT_R32_TYPELESS, "U"}, {WINED3DFMT_R32_SINT, WINED3DFMT_R32_TYPELESS, "I"}, {WINED3DFMT_R32_FLOAT, WINED3DFMT_R32_TYPELESS, "F"}, + {WINED3DFMT_D32_FLOAT, WINED3DFMT_R32_TYPELESS, "D"}, {WINED3DFMT_R24_UNORM_X8_TYPELESS, WINED3DFMT_R24G8_TYPELESS, "DX"}, {WINED3DFMT_X24_TYPELESS_G8_UINT, WINED3DFMT_R24G8_TYPELESS, "XS"}, {WINED3DFMT_D24_UNORM_S8_UINT, WINED3DFMT_R24G8_TYPELESS, "DS"}, @@ -243,6 +244,7 @@ static const struct wined3d_typed_format_info typed_formats[] = {WINED3DFMT_R16_UINT, WINED3DFMT_R16_TYPELESS, "U"}, {WINED3DFMT_R16_SINT, WINED3DFMT_R16_TYPELESS, "I"}, {WINED3DFMT_R16_FLOAT, WINED3DFMT_R16_TYPELESS, "F"}, + {WINED3DFMT_D16_UNORM, WINED3DFMT_R16_TYPELESS, "D"}, {WINED3DFMT_R8_UNORM, WINED3DFMT_R8_TYPELESS, "u"}, {WINED3DFMT_BC1_UNORM_SRGB, WINED3DFMT_BC1_TYPELESS, ""}, {WINED3DFMT_BC1_UNORM, WINED3DFMT_BC1_TYPELESS, ""}, @@ -1676,6 +1678,12 @@ static BOOL init_format_base_info(struct wined3d_gl_info *gl_info) flags |= WINED3DFMT_FLAG_INTEGER; if (channel_type == WINED3D_CHANNEL_TYPE_FLOAT) flags |= WINED3DFMT_FLAG_FLOAT; + + if (channel_type == WINED3D_CHANNEL_TYPE_DEPTH && !format->depth_size) + { + format->depth_size = format->red_size; + format->red_size = format->red_offset = 0; + } } format_set_flag(format, flags);

1 0