June 2016 - Wine-Commits - list.winehq.org

Józef Kucia : wined3d: Recognize SM5 store_raw opcode.
by Alexandre Julliard June 15, 2016

June 15, 2016

Module: wine Branch: master Commit: 41b296eea757b8356eaedb6c14049f26af040fed URL: http://source.winehq.org/git/wine.git/?a=commit;h=41b296eea757b8356eaedb6c1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 13 10:39:31 2016 +0200 wined3d: Recognize SM5 store_raw 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 | 4 +++- dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 5ac70ad..392e6ee 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5348,6 +5348,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_SINCOS */ shader_hw_sincos, /* WINED3DSIH_SLT */ shader_hw_map2gl, /* WINED3DSIH_SQRT */ NULL, + /* WINED3DSIH_STORE_RAW */ NULL, /* WINED3DSIH_STORE_UAV_TYPED */ NULL, /* WINED3DSIH_SUB */ shader_hw_map2gl, /* WINED3DSIH_SWITCH */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 719c8a2..02a8d41 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8682,6 +8682,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_SINCOS */ shader_glsl_sincos, /* WINED3DSIH_SLT */ shader_glsl_compare, /* WINED3DSIH_SQRT */ shader_glsl_map2gl, + /* WINED3DSIH_STORE_RAW */ NULL, /* WINED3DSIH_STORE_UAV_TYPED */ NULL, /* WINED3DSIH_SUB */ shader_glsl_binop, /* WINED3DSIH_SWITCH */ shader_glsl_switch, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index f88ccb5..2073bcb 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -180,6 +180,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_SINCOS */ "sincos", /* WINED3DSIH_SLT */ "slt", /* WINED3DSIH_SQRT */ "sqrt", + /* WINED3DSIH_STORE_RAW */ "store_raw", /* WINED3DSIH_STORE_UAV_TYPED */ "store_uav_typed", /* WINED3DSIH_SUB */ "sub", /* WINED3DSIH_SWITCH */ "switch", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 4603d9a..fe85baa 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -220,6 +220,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DCL_UAV_TYPED = 0x9c, WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED = 0xa2, WINED3D_SM5_OP_STORE_UAV_TYPED = 0xa4, + WINED3D_SM5_OP_STORE_RAW = 0xa6, WINED3D_SM5_OP_LD_STRUCTURED = 0xa7, }; @@ -764,7 +765,8 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = shader_sm4_read_dcl_resource}, {WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED, WINED3DSIH_DCL_RESOURCE_STRUCTURED, "", "", shader_sm5_read_dcl_resource_structured}, - {WINED3D_SM5_OP_STORE_UAV_TYPED, WINED3DSIH_STORE_UAV_TYPED, "", "Uif"}, + {WINED3D_SM5_OP_STORE_UAV_TYPED, WINED3DSIH_STORE_UAV_TYPED, "U", "iu"}, + {WINED3D_SM5_OP_STORE_RAW, WINED3DSIH_STORE_RAW, "U", "iu"}, {WINED3D_SM5_OP_LD_STRUCTURED, WINED3DSIH_LD_STRUCTURED, "u", "uuR"}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7ad7bac..1bf95a6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -688,6 +688,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_SINCOS, WINED3DSIH_SLT, WINED3DSIH_SQRT, + WINED3DSIH_STORE_RAW, WINED3DSIH_STORE_UAV_TYPED, WINED3DSIH_SUB, WINED3DSIH_SWITCH,

1 0

Francois Gouget : wined3d: Make glsl_vertex_pipe_clip_plane() static.
by Alexandre Julliard June 15, 2016

June 15, 2016

Module: wine Branch: master Commit: 0652bf7eca6b7de9315b7be37c062bcee6eef388 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0652bf7eca6b7de9315b7be37… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jun 11 13:53:27 2016 +0200 wined3d: Make glsl_vertex_pipe_clip_plane() static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> 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/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 55affc1..719c8a2 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9062,7 +9062,7 @@ static void glsl_vertex_pipe_shademode(struct wined3d_context *context, context->shader_update_mask |= 1 << WINED3D_SHADER_TYPE_VERTEX; } -void glsl_vertex_pipe_clip_plane(struct wined3d_context *context, +static void glsl_vertex_pipe_clip_plane(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_gl_info *gl_info = context->gl_info;

1 0

Alistair Leslie-Hughes : wined3d: Correct memory size for Geforce 9600 GT.
by Alexandre Julliard June 15, 2016

June 15, 2016

Module: wine Branch: master Commit: 1da27c10b8edfa41e1308b8b67c80d236c4fed9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1da27c10b8edfa41e1308b8b6… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 15 07:48:30 2016 +0000 wined3d: Correct memory size for Geforce 9600 GT. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 4fc7736..cac8958 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1231,7 +1231,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9400M, "NVIDIA GeForce 9400M", DRIVER_NVIDIA_GEFORCE8, 256 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9400GT, "NVIDIA GeForce 9400 GT", DRIVER_NVIDIA_GEFORCE8, 256 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9500GT, "NVIDIA GeForce 9500 GT", DRIVER_NVIDIA_GEFORCE8, 256 }, - {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9600GT, "NVIDIA GeForce 9600 GT", DRIVER_NVIDIA_GEFORCE8, 384 }, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9600GT, "NVIDIA GeForce 9600 GT", DRIVER_NVIDIA_GEFORCE8, 512 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9700MGT, "NVIDIA GeForce 9700M GT", DRIVER_NVIDIA_GEFORCE8, 512 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_9800GT, "NVIDIA GeForce 9800 GT", DRIVER_NVIDIA_GEFORCE8, 512 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_210, "NVIDIA GeForce 210", DRIVER_NVIDIA_GEFORCE8, 512 },

1 0

Alexandre Julliard : gdi32: Fix PathToRegion and SelectClipPath behavior with an empty path.
by Alexandre Julliard June 15, 2016

June 15, 2016

Module: wine Branch: master Commit: 7373a7c71da2684f1497acdb2cb2051a4448ac56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7373a7c71da2684f1497acdb2… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 16 00:37:01 2016 +0900 gdi32: Fix PathToRegion and SelectClipPath behavior with an empty path. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/path.c | 43 +++++++++++-------------------------------- dlls/gdi32/tests/path.c | 4 ++-- 2 files changed, 13 insertions(+), 34 deletions(-) diff --git a/dlls/gdi32/path.c b/dlls/gdi32/path.c index e09cd0b..0d89cfb 100644 --- a/dlls/gdi32/path.c +++ b/dlls/gdi32/path.c @@ -374,9 +374,9 @@ static HRGN PATH_PathToRegion(const struct gdi_path *pPath, INT nPolyFillMode) INT *pNumPointsInStroke; HRGN hrgn; - if (!(rgn_path = PATH_FlattenPath( pPath ))) return 0; + if (!pPath->count) return 0; - /* FIXME: What happens when number of points is zero? */ + if (!(rgn_path = PATH_FlattenPath( pPath ))) return 0; /* First pass: Find out how many strokes there are in the path */ /* FIXME: We could eliminate this with some bookkeeping in GdiPath */ @@ -636,30 +636,20 @@ INT WINAPI GetPath(HDC hdc, LPPOINT pPoints, LPBYTE pTypes, INT nSize) /*********************************************************************** * PathToRegion (GDI32.@) - * - * FIXME - * Check that SetLastError is being called correctly - * - * The documentation does not state this explicitly, but a test under Windows - * shows that the region which is returned should be in device coordinates. */ HRGN WINAPI PathToRegion(HDC hdc) { HRGN hrgnRval = 0; DC *dc = get_dc_ptr( hdc ); - /* Get pointer to path */ if(!dc) return 0; if (!dc->path) SetLastError(ERROR_CAN_NOT_COMPLETE); else { - if ((hrgnRval = PATH_PathToRegion(dc->path, GetPolyFillMode(hdc)))) - { - /* FIXME: Should we empty the path even if conversion failed? */ - free_gdi_path( dc->path ); - dc->path = NULL; - } + hrgnRval = PATH_PathToRegion(dc->path, GetPolyFillMode(hdc)); + free_gdi_path( dc->path ); + dc->path = NULL; } release_dc_ptr( dc ); return hrgnRval; @@ -674,6 +664,7 @@ static BOOL PATH_FillPath( HDC hdc, const struct gdi_path *pPath ) HRGN hrgn; /* Construct a region from the path and fill it */ + if (!pPath->count) return TRUE; if ((hrgn = PATH_PathToRegion(pPath, GetPolyFillMode(hdc)))) { /* Since PaintRgn interprets the region as being in logical coordinates @@ -752,8 +743,6 @@ BOOL WINAPI FillPath(HDC hdc) /*********************************************************************** * SelectClipPath (GDI32.@) - * FIXME - * Check that SetLastError is being called correctly */ BOOL WINAPI SelectClipPath(HDC hdc, INT iMode) { @@ -2116,24 +2105,14 @@ BOOL nulldrv_CloseFigure( PHYSDEV dev ) BOOL nulldrv_SelectClipPath( PHYSDEV dev, INT mode ) { - BOOL ret; - HRGN hrgn; - DC *dc = get_nulldrv_dc( dev ); + BOOL ret = FALSE; + HRGN hrgn = PathToRegion( dev->hdc ); - if (!dc->path) - { - SetLastError( ERROR_CAN_NOT_COMPLETE ); - return FALSE; - } - if (!(hrgn = PATH_PathToRegion( dc->path, GetPolyFillMode(dev->hdc)))) return FALSE; - ret = ExtSelectClipRgn( dev->hdc, hrgn, mode ) != ERROR; - if (ret) + if (hrgn) { - free_gdi_path( dc->path ); - dc->path = NULL; + ret = ExtSelectClipRgn( dev->hdc, hrgn, mode ) != ERROR; + DeleteObject( hrgn ); } - /* FIXME: Should this function delete the path even if it failed? */ - DeleteObject( hrgn ); return ret; } diff --git a/dlls/gdi32/tests/path.c b/dlls/gdi32/tests/path.c index f7ed012..6e7f65a 100644 --- a/dlls/gdi32/tests/path.c +++ b/dlls/gdi32/tests/path.c @@ -266,7 +266,7 @@ static void test_path_state(void) EndPath( hdc ); SetLastError( 0xdeadbeef ); ret = SelectClipPath( hdc, RGN_OR ); - todo_wine ok( !ret, "SelectClipPath succeeded on empty path\n" ); + ok( !ret, "SelectClipPath succeeded on empty path\n" ); ok( GetLastError() == 0xdeadbeef, "wrong error %u\n", GetLastError() ); ok( GetPath( hdc, NULL, NULL, 0 ) == -1, "path not deleted\n" ); @@ -282,7 +282,7 @@ static void test_path_state(void) EndPath( hdc ); SetLastError( 0xdeadbeef ); rgn = PathToRegion( hdc ); - todo_wine ok( !rgn, "PathToRegion succeeded on empty path\n" ); + ok( !rgn, "PathToRegion succeeded on empty path\n" ); ok( GetLastError() == 0xdeadbeef, "wrong error %u\n", GetLastError() ); DeleteObject( rgn ); ok( GetPath( hdc, NULL, NULL, 0 ) == -1, "path not deleted\n" );

1 0

Alexandre Julliard : gdiplus: Avoid using PathToRegion with an empty path.
by Alexandre Julliard June 15, 2016

June 15, 2016

Module: wine Branch: master Commit: bc44b3f60d3df213f3a55d6f0878c019932bebfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc44b3f60d3df213f3a55d6f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 16 00:36:37 2016 +0900 gdiplus: Avoid using PathToRegion with an empty path. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/region.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/gdiplus/region.c b/dlls/gdiplus/region.c index a0c0823..50cb46a 100644 --- a/dlls/gdiplus/region.c +++ b/dlls/gdiplus/region.c @@ -1114,6 +1114,12 @@ static GpStatus get_path_hrgn(GpPath *path, GpGraphics *graphics, HRGN *hrgn) GpStatus stat; INT save_state; + if (!path->pathdata.Count) /* PathToRegion doesn't support empty paths */ + { + *hrgn = CreateRectRgn( 0, 0, 0, 0 ); + return *hrgn ? Ok : OutOfMemory; + } + if (!graphics) { new_hdc = CreateCompatibleDC(0);

1 0

Józef Kucia : wined3d: Recognize SM5 bufinfo opcode.
by Alexandre Julliard June 15, 2016

June 15, 2016

Module: wine Branch: master Commit: 688fc5f6d81993b6a942609f799b67f584af1e33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=688fc5f6d81993b6a942609f7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 13 10:39:36 2016 +0200 wined3d: Recognize SM5 bufinfo 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 dc4b169..94e19f7 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5216,6 +5216,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_BREAK */ shader_hw_break, /* WINED3DSIH_BREAKC */ shader_hw_breakc, /* WINED3DSIH_BREAKP */ NULL, + /* WINED3DSIH_BUFINFO */ NULL, /* WINED3DSIH_CALL */ shader_hw_call, /* WINED3DSIH_CALLNZ */ NULL, /* WINED3DSIH_CASE */ NULL, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7dc8fb6..0489507 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8550,6 +8550,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_BREAK */ shader_glsl_break, /* WINED3DSIH_BREAKC */ shader_glsl_breakc, /* WINED3DSIH_BREAKP */ shader_glsl_breakp, + /* WINED3DSIH_BUFINFO */ NULL, /* WINED3DSIH_CALL */ shader_glsl_call, /* WINED3DSIH_CALLNZ */ shader_glsl_callnz, /* WINED3DSIH_CASE */ shader_glsl_case, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 9e8b8d3..00c6028 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -48,6 +48,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_BREAK */ "break", /* WINED3DSIH_BREAKC */ "breakc", /* WINED3DSIH_BREAKP */ "breakp", + /* WINED3DSIH_BUFINFO */ "bufinfo", /* WINED3DSIH_CALL */ "call", /* WINED3DSIH_CALLNZ */ "callnz", /* WINED3DSIH_CASE */ "case", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index c66379d..c685e87 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -205,6 +205,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_HS_CONTROL_POINT_PHASE = 0x72, WINED3D_SM5_OP_HS_FORK_PHASE = 0x73, WINED3D_SM5_OP_HS_JOIN_PHASE = 0x74, + WINED3D_SM5_OP_BUFINFO = 0x79, WINED3D_SM5_OP_DERIV_RTX_COARSE = 0x7a, WINED3D_SM5_OP_DERIV_RTX_FINE = 0x7b, WINED3D_SM5_OP_DERIV_RTY_COARSE = 0x7c, @@ -746,6 +747,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_HS_CONTROL_POINT_PHASE, WINED3DSIH_HS_CONTROL_POINT_PHASE, "", ""}, {WINED3D_SM5_OP_HS_FORK_PHASE, WINED3DSIH_HS_FORK_PHASE, "", ""}, {WINED3D_SM5_OP_HS_JOIN_PHASE, WINED3DSIH_HS_JOIN_PHASE, "", ""}, + {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"}, {WINED3D_SM5_OP_DERIV_RTY_COARSE, WINED3DSIH_DSY_COARSE, "f", "f"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f463ce4..7e46e47 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -556,6 +556,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_BREAK, WINED3DSIH_BREAKC, WINED3DSIH_BREAKP, + WINED3DSIH_BUFINFO, WINED3DSIH_CALL, WINED3DSIH_CALLNZ, WINED3DSIH_CASE,

1 0

Józef Kucia : wined3d: Recognize SM5 ld_raw opcode.
by Alexandre Julliard June 15, 2016

June 15, 2016

Module: wine Branch: master Commit: c08dfc6836e4d8715f75b1086977e6de22c06527 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c08dfc6836e4d8715f75b1086… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 13 10:39:32 2016 +0200 wined3d: Recognize SM5 ld_raw 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 392e6ee..2b4bf45 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5301,6 +5301,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_LABEL */ shader_hw_label, /* WINED3DSIH_LD */ NULL, /* WINED3DSIH_LD2DMS */ NULL, + /* WINED3DSIH_LD_RAW */ NULL, /* WINED3DSIH_LD_STRUCTURED */ NULL, /* WINED3DSIH_LIT */ shader_hw_map2gl, /* WINED3DSIH_LOG */ shader_hw_scalar_op, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 02a8d41..c8f7608 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8635,6 +8635,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_LABEL */ shader_glsl_label, /* WINED3DSIH_LD */ shader_glsl_ld, /* WINED3DSIH_LD2DMS */ NULL, + /* WINED3DSIH_LD_RAW */ NULL, /* WINED3DSIH_LD_STRUCTURED */ NULL, /* WINED3DSIH_LIT */ shader_glsl_lit, /* WINED3DSIH_LOG */ shader_glsl_scalar_op, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 2073bcb..faae82f 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -133,6 +133,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_LABEL */ "label", /* WINED3DSIH_LD */ "ld", /* WINED3DSIH_LD2DMS */ "ld2dms", + /* WINED3DSIH_LD_RAW */ "ld_raw", /* WINED3DSIH_LD_STRUCTURED */ "ld_structured", /* WINED3DSIH_LIT */ "lit", /* WINED3DSIH_LOG */ "log", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index fe85baa..7564850 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -220,6 +220,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DCL_UAV_TYPED = 0x9c, WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED = 0xa2, WINED3D_SM5_OP_STORE_UAV_TYPED = 0xa4, + WINED3D_SM5_OP_LD_RAW = 0xa5, WINED3D_SM5_OP_STORE_RAW = 0xa6, WINED3D_SM5_OP_LD_STRUCTURED = 0xa7, }; @@ -766,6 +767,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = {WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED, WINED3DSIH_DCL_RESOURCE_STRUCTURED, "", "", shader_sm5_read_dcl_resource_structured}, {WINED3D_SM5_OP_STORE_UAV_TYPED, WINED3DSIH_STORE_UAV_TYPED, "U", "iu"}, + {WINED3D_SM5_OP_LD_RAW, WINED3DSIH_LD_RAW, "u", "iU"}, {WINED3D_SM5_OP_STORE_RAW, WINED3DSIH_STORE_RAW, "U", "iu"}, {WINED3D_SM5_OP_LD_STRUCTURED, WINED3DSIH_LD_STRUCTURED, "u", "uuR"}, }; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1bf95a6..93e9ab4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -641,6 +641,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_LABEL, WINED3DSIH_LD, WINED3DSIH_LD2DMS, + WINED3DSIH_LD_RAW, WINED3DSIH_LD_STRUCTURED, WINED3DSIH_LIT, WINED3DSIH_LOG,

1 0

Józef Kucia : wined3d: Recognize thread group shared memory register.
by Alexandre Julliard June 15, 2016

June 15, 2016

Module: wine Branch: master Commit: c2651c5617b92a2c224934ecc7c431f9f411a5ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=c2651c5617b92a2c224934ecc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jun 13 10:39:30 2016 +0200 wined3d: Recognize thread group shared memory register. 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.c | 4 ++++ dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 7 insertions(+) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 55de679..f88ccb5 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1730,6 +1730,10 @@ static void shader_dump_register(struct wined3d_string_buffer *buffer, shader_addline(buffer, "vDomainLocation"); break; + case WINED3DSPR_GROUPSHAREDMEM: + shader_addline(buffer, "g"); + break; + default: shader_addline(buffer, "<unhandled_rtype(%#x)>", reg->type); break; diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 45a3d04..4603d9a 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -242,6 +242,7 @@ enum wined3d_sm4_register_type WINED3D_SM5_RT_PATCH_CONSTANT_DATA = 0x1b, WINED3D_SM5_RT_DOMAIN_LOCATION = 0x1c, WINED3D_SM5_RT_UAV = 0x1e, + WINED3D_SM5_RT_SHARED_MEMORY = 0x1f, }; enum wined3d_sm4_output_primitive_type @@ -800,6 +801,7 @@ static const enum wined3d_shader_register_type register_type_table[] = /* WINED3D_SM5_RT_DOMAIN_LOCATION */ WINED3DSPR_TESSCOORD, /* UNKNOWN */ ~0u, /* WINED3D_SM5_RT_UAV */ WINED3DSPR_UAV, + /* WINED3D_SM5_RT_SHARED_MEMORY */ WINED3DSPR_GROUPSHAREDMEM, }; static const struct wined3d_sm4_opcode_info *get_opcode_info(enum wined3d_sm4_opcode opcode) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ffcfb81..7ad7bac 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -386,6 +386,7 @@ enum wined3d_shader_register_type WINED3DSPR_INCONTROLPOINT, WINED3DSPR_PATCHCONST, WINED3DSPR_TESSCOORD, + WINED3DSPR_GROUPSHAREDMEM, }; enum wined3d_data_type

1 0

Nikolay Sivov : riched20: Remove duplicated condition.
by Alexandre Julliard June 15, 2016

June 15, 2016

Module: wine Branch: master Commit: 7cb3b72559745d94e7b7e3a0fbb40426f93d775f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7cb3b72559745d94e7b7e3a0f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Jun 15 10:54:58 2016 +0300 riched20: Remove duplicated condition. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/richole.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 1013e67..a2f23c9 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1976,7 +1976,7 @@ static HRESULT range_Collapse(LONG bStart, LONG *start, LONG *end) if (*end == *start) return S_FALSE; - if (bStart == tomEnd || bStart == tomFalse) + if (bStart == tomEnd) *start = *end; else *end = *start;

1 0

Jacek Caban : mshtml.idl: Added IElementSelector declaration.
by Alexandre Julliard June 15, 2016

June 15, 2016

Module: wine Branch: master Commit: a2aeb36933c54fc42d1d7b1f60c2d1dcddf0bdb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2aeb36933c54fc42d1d7b1f6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 15 14:22:27 2016 +0200 mshtml.idl: Added IElementSelector declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtml.idl | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/include/mshtml.idl b/include/mshtml.idl index c73a0f5..1fe30fd 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -6100,6 +6100,28 @@ interface IHTMLElement4 : IDispatch [propget, id(DISPID_IHTMLELEMENT4_ONFOCUSOUT), displaybind, bindable] \ VARIANT onfocusout() +/***************************************************************************** + * IElementSelector interface + */ +[ + odl, + oleautomation, + dual, + uuid(30510463-98b5-11cf-bb82-00aa00bdce0b) +] +interface IElementSelector : IDispatch +{ + [id(DISPID_IELEMENTSELECTOR_QUERYSELECTOR)] + HRESULT querySelector( + [in] BSTR v, + [out, retval] IHTMLElement **pel); + + [id(DISPID_IELEMENTSELECTOR_QUERYSELECTORALL)] + HRESULT querySelectorAll( + [in] BSTR v, + [out, retval] IHTMLDOMChildrenCollection **pel); +} + #define WINE_IELEMENTSELECTOR_DISPINTERFACE_DECL \ [id(DISPID_IELEMENTSELECTOR_QUERYSELECTOR)] \ IHTMLElement *querySelector([in] BSTR v); \

1 0