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

Józef Kucia : d3d11/tests: Add test for face culling.
by Alexandre Julliard July 28, 2016

July 28, 2016

Module: wine Branch: master Commit: 0bcd9a5a4bb3d8e5251ca9f3f6001193f2ab441f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0bcd9a5a4bb3d8e5251ca9f3f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 27 23:33:45 2016 +0200 d3d11/tests: Add test for face culling. 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 | 231 ++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 186 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0bcd9a5a4bb3d8e5251ca…

1 0

Józef Kucia : wined3d: Add FIXMEs for unhandled sysval semantics.
by Alexandre Julliard July 28, 2016

July 28, 2016

Module: wine Branch: master Commit: 79dc5128c326538ecf9eb4bfc45a5de458d05e52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79dc5128c326538ecf9eb4bfc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 27 23:33:44 2016 +0200 wined3d: Add FIXMEs for unhandled sysval semantics. 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 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 498c41c..ece9b72 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1784,6 +1784,8 @@ static void shader_glsl_declare_generic_vertex_attribute(struct wined3d_string_b index); return; } + if (e->sysval_semantic) + FIXME("Unhandled sysval semantic %#x.\n", e->sysval_semantic); if (shader_glsl_use_explicit_attrib_location(gl_info)) shader_addline(buffer, "layout(location = %u) ", index); @@ -5306,18 +5308,28 @@ static void shader_glsl_input_pack(const struct wined3d_shader *shader, struct w if (args->vp_mode == vertexshader) { if (input->sysval_semantic == WINED3D_SV_POSITION && !semantic_idx) + { shader_addline(buffer, "ps_in[%u]%s = vpos%s;\n", shader->u.ps.input_reg_map[input->register_idx], reg_mask, reg_mask); + } else if (args->pointsprite && shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_TEXCOORD)) + { shader_addline(buffer, "ps_in[%u] = vec4(gl_PointCoord.xy, 0.0, 0.0);\n", input->register_idx); + } else if (input->sysval_semantic == WINED3D_SV_IS_FRONT_FACE) + { shader_addline(buffer, "ps_in[%u] = vec4(" "uintBitsToFloat(gl_FrontFacing ? 0xffffffffu : 0u), 0.0, 0.0, 0.0);\n", input->register_idx); + } else + { + if (input->sysval_semantic) + FIXME("Unhandled sysval semantic %#x.\n", input->sysval_semantic); shader_addline(buffer, "ps_in[%u]%s = ps_link[%u]%s;\n", shader->u.ps.input_reg_map[input->register_idx], reg_mask, shader->u.ps.input_reg_map[input->register_idx], reg_mask); + } } else if (shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_TEXCOORD)) { @@ -5595,6 +5607,10 @@ static void shader_glsl_setup_sm3_rasterizer_input(struct shader_glsl_priv *priv shader_addline(buffer, "gl_PointSize = clamp(shader_out[%u].%c, " "ffp_point.size_min, ffp_point.size_max);\n", output->register_idx, reg_mask[1]); } + else if (output->sysval_semantic) + { + FIXME("Unhandled sysval semantic %#x.\n", output->sysval_semantic); + } } /* Then, setup the pixel shader input. */

1 0

Józef Kucia : wined3d: Implement SV_IsFrontFace input sysval semantic.
by Alexandre Julliard July 28, 2016

July 28, 2016

Module: wine Branch: master Commit: a5852dec9c81ae28b02f7f4f8c3b2997677bfa37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5852dec9c81ae28b02f7f4f8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 27 23:33:43 2016 +0200 wined3d: Implement SV_IsFrontFace input sysval semantic. 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 | 4 ++++ dlls/wined3d/shader.c | 10 +++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index dba3460..498c41c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -5310,6 +5310,10 @@ static void shader_glsl_input_pack(const struct wined3d_shader *shader, struct w shader->u.ps.input_reg_map[input->register_idx], reg_mask, reg_mask); else if (args->pointsprite && shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_TEXCOORD)) shader_addline(buffer, "ps_in[%u] = vec4(gl_PointCoord.xy, 0.0, 0.0);\n", input->register_idx); + else if (input->sysval_semantic == WINED3D_SV_IS_FRONT_FACE) + shader_addline(buffer, "ps_in[%u] = vec4(" + "uintBitsToFloat(gl_FrontFacing ? 0xffffffffu : 0u), 0.0, 0.0, 0.0);\n", + input->register_idx); else shader_addline(buffer, "ps_in[%u]%s = ps_link[%u]%s;\n", shader->u.ps.input_reg_map[input->register_idx], reg_mask, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index f1940c6..28d5972 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1311,9 +1311,13 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st for (i = 0; i < input_signature->element_count; ++i) { reg_maps->input_registers |= 1u << input_signature->elements[i].register_idx; - if (shader_version.type == WINED3D_SHADER_TYPE_PIXEL - && input_signature->elements[i].sysval_semantic == WINED3D_SV_POSITION) - reg_maps->vpos = 1; + if (shader_version.type == WINED3D_SHADER_TYPE_PIXEL) + { + if (input_signature->elements[i].sysval_semantic == WINED3D_SV_POSITION) + reg_maps->vpos = 1; + else if (input_signature->elements[i].sysval_semantic == WINED3D_SV_IS_FRONT_FACE) + reg_maps->usesfacing = 1; + } } } else if (!input_signature->elements && reg_maps->input_registers)

1 0

Henri Verbeet : wined3d: Pass a texture and sub-resource index to wined3d_volume_download_data().
by Alexandre Julliard July 28, 2016

July 28, 2016

Module: wine Branch: master Commit: 858e0913898c9a4f196df21dded35836a6058ab9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=858e0913898c9a4f196df21dd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jul 28 13:29:38 2016 +0200 wined3d: Pass a texture and sub-resource index to wined3d_volume_download_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/volume.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 98e184d..72ebd19 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -88,10 +88,10 @@ void wined3d_volume_upload_data(struct wined3d_texture *texture, unsigned int su } /* Context activation is done by the caller. */ -static void wined3d_volume_download_data(struct wined3d_volume *volume, +static void texture3d_download_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_context *context, const struct wined3d_bo_address *data) { - const struct wined3d_format *format = volume->container->resource.format; + const struct wined3d_format *format = texture->resource.format; const struct wined3d_gl_info *gl_info = context->gl_info; if (format->convert) @@ -107,7 +107,7 @@ static void wined3d_volume_download_data(struct wined3d_volume *volume, checkGLcall("glBindBuffer"); } - gl_info->gl_ops.gl.p_glGetTexImage(GL_TEXTURE_3D, volume->texture_level, + gl_info->gl_ops.gl.p_glGetTexImage(GL_TEXTURE_3D, sub_resource_idx, format->glFormat, format->glType, data->addr); checkGLcall("glGetTexImage"); @@ -144,6 +144,7 @@ static DWORD volume_access_from_location(DWORD location) static void wined3d_volume_srgb_transfer(struct wined3d_volume *volume, struct wined3d_context *context, BOOL dest_is_srgb) { + unsigned int sub_resource_idx = volume->texture_level; struct wined3d_texture *texture = volume->container; struct wined3d_bo_address data; /* Optimizations are possible, but the effort should be put into either @@ -155,13 +156,13 @@ static void wined3d_volume_srgb_transfer(struct wined3d_volume *volume, WARN_(d3d_perf)("Performing slow rgb/srgb volume transfer.\n"); data.buffer_object = 0; - if (!(data.addr = HeapAlloc(GetProcessHeap(), 0, texture->sub_resources[volume->texture_level].size))) + if (!(data.addr = HeapAlloc(GetProcessHeap(), 0, texture->sub_resources[sub_resource_idx].size))) return; wined3d_texture_bind_and_dirtify(texture, context, !dest_is_srgb); - wined3d_volume_download_data(volume, context, &data); + texture3d_download_data(texture, sub_resource_idx, context, &data); wined3d_texture_bind_and_dirtify(texture, context, dest_is_srgb); - wined3d_volume_upload_data(texture, volume->texture_level, context, wined3d_const_bo_address(&data)); + wined3d_volume_upload_data(texture, sub_resource_idx, context, wined3d_const_bo_address(&data)); HeapFree(GetProcessHeap(), 0, data.addr); } @@ -248,7 +249,7 @@ BOOL wined3d_volume_load_location(struct wined3d_volume *volume, else wined3d_texture_bind_and_dirtify(texture, context, TRUE); - wined3d_volume_download_data(volume, context, &data); + texture3d_download_data(texture, sub_resource_idx, context, &data); ++texture->download_count; } else @@ -269,7 +270,7 @@ BOOL wined3d_volume_load_location(struct wined3d_volume *volume, else wined3d_texture_bind_and_dirtify(texture, context, TRUE); - wined3d_volume_download_data(volume, context, &data); + texture3d_download_data(texture, sub_resource_idx, context, &data); } else {

1 0

Piotr Caban : ucrtbase: Add _get_narrow_winmain_command_line tests.
by Alexandre Julliard July 28, 2016

July 28, 2016

Module: wine Branch: master Commit: 52a3a3b20633bf3a08860d43c8a9130a693cbedb URL: http://source.winehq.org/git/wine.git/?a=commit;h=52a3a3b20633bf3a08860d43c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jul 28 12:24:43 2016 +0200 ucrtbase: Add _get_narrow_winmain_command_line tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/misc.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 0111d2b..ad22699 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -73,6 +73,7 @@ static _invalid_parameter_handler (CDECL *p__get_invalid_parameter_handler)(void static _invalid_parameter_handler (CDECL *p__set_thread_local_invalid_parameter_handler)(_invalid_parameter_handler); static _invalid_parameter_handler (CDECL *p__get_thread_local_invalid_parameter_handler)(void); static int (CDECL *p__ltoa_s)(LONG, char*, size_t, int); +static char* (CDECL *p__get_narrow_winmain_command_line)(void); static void test__initialize_onexit_table(void) { @@ -312,6 +313,38 @@ static void test_invalid_parameter_handler(void) ok(ret == global_invalid_parameter_handler, "ret = %p\n", ret); } +static void test__get_narrow_winmain_command_line(char *path) +{ + PROCESS_INFORMATION proc; + STARTUPINFOA startup; + char cmd[MAX_PATH+32]; + char *ret, *cmdline, *name; + int len; + + ret = p__get_narrow_winmain_command_line(); + cmdline = GetCommandLineA(); + len = strlen(cmdline); + ok(ret>cmdline && ret<cmdline+len, "ret = %p, cmdline = %p (len = %d)\n", ret, cmdline, len); + + if(!path) { + ok(!lstrcmpA(ret, "\"misc\" cmd"), "ret = %s\n", ret); + return; + } + + for(len = strlen(path); len>0; len--) + if(path[len-1]=='\\' || path[len-1]=='/') break; + if(len) name = path+len; + else name = path; + + sprintf(cmd, "\"\"%c\"\"\"%s\" \t \"misc\" cmd", name[0], name+1); + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + CreateProcessA(path, cmd, NULL, NULL, TRUE, + CREATE_DEFAULT_ERROR_MODE|NORMAL_PRIORITY_CLASS, + NULL, NULL, &startup, &proc); + winetest_wait_child_process(proc.hProcess); +} + static BOOL init(void) { HMODULE module = LoadLibraryA("ucrtbase.dll"); @@ -331,18 +364,29 @@ static BOOL init(void) p__set_thread_local_invalid_parameter_handler = (void*)GetProcAddress(module, "_set_thread_local_invalid_parameter_handler"); p__get_thread_local_invalid_parameter_handler = (void*)GetProcAddress(module, "_get_thread_local_invalid_parameter_handler"); p__ltoa_s = (void*)GetProcAddress(module, "_ltoa_s"); + p__get_narrow_winmain_command_line = (void*)GetProcAddress(GetModuleHandleA("ucrtbase.dll"), "_get_narrow_winmain_command_line"); return TRUE; } START_TEST(misc) { + int arg_c; + char** arg_v; + if(!init()) return; + arg_c = winetest_get_mainargs(&arg_v); + if(arg_c == 3) { + test__get_narrow_winmain_command_line(NULL); + return; + } + test_invalid_parameter_handler(); test__initialize_onexit_table(); test__register_onexit_function(); test__execute_onexit_table(); test___fpe_flt_rounds(); + test__get_narrow_winmain_command_line(arg_v[0]); }

1 0

Nikolay Sivov : ucrtbase: Implement _get_narrow_winmain_command_line/ _get_wide_winmain_command_line.
by Alexandre Julliard July 28, 2016

July 28, 2016

Module: wine Branch: master Commit: 1411d800ee660b92798a0edbbc414e51a090da59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1411d800ee660b92798a0edbb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jul 28 12:24:24 2016 +0200 ucrtbase: Implement _get_narrow_winmain_command_line/_get_wide_winmain_command_line. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-runtime-l1-1-0.spec | 4 +- dlls/msvcrt/data.c | 54 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 4 +- 3 files changed, 58 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec index 17b9861..cbda9ce 100644 --- a/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec +++ b/dlls/api-ms-win-crt-runtime-l1-1-0/api-ms-win-crt-runtime-l1-1-0.spec @@ -43,11 +43,11 @@ @ cdecl _get_initial_narrow_environment() ucrtbase._get_initial_narrow_environment @ cdecl _get_initial_wide_environment() ucrtbase._get_initial_wide_environment @ cdecl _get_invalid_parameter_handler() ucrtbase._get_invalid_parameter_handler -@ stub _get_narrow_winmain_command_line +@ cdecl _get_narrow_winmain_command_line() ucrtbase._get_narrow_winmain_command_line @ cdecl _get_pgmptr(ptr) ucrtbase._get_pgmptr @ cdecl _get_terminate() ucrtbase._get_terminate @ cdecl _get_thread_local_invalid_parameter_handler() ucrtbase._get_thread_local_invalid_parameter_handler -@ stub _get_wide_winmain_command_line +@ cdecl _get_wide_winmain_command_line() ucrtbase._get_wide_winmain_command_line @ cdecl _get_wpgmptr(ptr) ucrtbase._get_wpgmptr @ cdecl _getdllprocaddr(long str long) ucrtbase._getdllprocaddr @ cdecl _getpid() ucrtbase._getpid diff --git a/dlls/msvcrt/data.c b/dlls/msvcrt/data.c index fafbc38..5de80f4 100644 --- a/dlls/msvcrt/data.c +++ b/dlls/msvcrt/data.c @@ -692,3 +692,57 @@ int CDECL _initialize_wide_environment(void) FIXME("stub\n"); return 0; } + +/********************************************************************* + * _get_narrow_winmain_command_line (UCRTBASE.@) + */ +char* CDECL _get_narrow_winmain_command_line(void) +{ + static char *narrow_command_line; + char *s; + + if (narrow_command_line) + return narrow_command_line; + + s = GetCommandLineA(); + while (*s && *s != ' ' && *s != '\t') + { + if (*s++ == '"') + { + while (*s && *s++ != '"') + ; + } + } + + while (*s == ' ' || *s == '\t') + s++; + + return narrow_command_line = s; +} + +/********************************************************************* + * _get_wide_winmain_command_line (UCRTBASE.@) + */ +MSVCRT_wchar_t* CDECL _get_wide_winmain_command_line(void) +{ + static MSVCRT_wchar_t *wide_command_line; + MSVCRT_wchar_t *s; + + if (wide_command_line) + return wide_command_line; + + s = GetCommandLineW(); + while (*s && *s != ' ' && *s != '\t') + { + if (*s++ == '"') + { + while (*s && *s++ != '"') + ; + } + } + + while (*s == ' ' || *s == '\t') + s++; + + return wide_command_line = s; +} diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 90639a2..2a34404 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -368,7 +368,7 @@ @ cdecl _get_initial_narrow_environment() @ cdecl _get_initial_wide_environment() @ cdecl _get_invalid_parameter_handler() -@ stub _get_narrow_winmain_command_line +@ cdecl _get_narrow_winmain_command_line() @ cdecl _get_osfhandle(long) MSVCRT__get_osfhandle @ cdecl _get_pgmptr(ptr) @ cdecl _get_printf_count_output() MSVCRT__get_printf_count_output @@ -379,7 +379,7 @@ @ cdecl _get_timezone(ptr) @ cdecl _get_tzname(ptr str long long) MSVCRT__get_tzname @ cdecl _get_unexpected() MSVCRT__get_unexpected -@ stub _get_wide_winmain_command_line +@ cdecl _get_wide_winmain_command_line() @ cdecl _get_wpgmptr(ptr) @ cdecl _getc_nolock(ptr) MSVCRT__fgetc_nolock @ cdecl _getch()

1 0

Huw Davies : gdi32: Pass a DC pointer to get_pixel_color().
by Alexandre Julliard July 28, 2016

July 28, 2016

Module: wine Branch: master Commit: d8e353f99f2110d0136dfdd2ddca1505aa90c596 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8e353f99f2110d0136dfdd2d… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 28 10:49:47 2016 +0100 gdi32: Pass a DC pointer to get_pixel_color(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/dibdrv/dibdrv.h | 2 +- dlls/gdi32/dibdrv/graphics.c | 52 ++++++++++++++++++++++++-------------------- dlls/gdi32/dibdrv/objects.c | 52 ++++++++++++++++++++++++-------------------- dlls/gdi32/font.c | 2 +- dlls/gdi32/gdi_private.h | 2 +- 5 files changed, 59 insertions(+), 51 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d8e353f99f2110d0136df…

1 0

Huw Davies : gdi32: Pass a DC pointer to get_mono_dc_colors().
by Alexandre Julliard July 28, 2016

July 28, 2016

Module: wine Branch: master Commit: cf386b8b6442d41074d78c1fe5fe8920e070490e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf386b8b6442d41074d78c1fe… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Jul 28 10:49:46 2016 +0100 gdi32: Pass a DC pointer to get_mono_dc_colors(). Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/bitblt.c | 12 ++++++------ dlls/gdi32/dib.c | 2 +- dlls/gdi32/dibdrv/bitblt.c | 3 ++- dlls/gdi32/gdi_private.h | 2 +- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/gdi32/bitblt.c b/dlls/gdi32/bitblt.c index 7e9a096..2506c02 100644 --- a/dlls/gdi32/bitblt.c +++ b/dlls/gdi32/bitblt.c @@ -222,10 +222,10 @@ static DWORD blend_bits( const BITMAPINFO *src_info, const struct gdi_image_bits } /* helper to retrieve either both colors or only the background color for monochrome blits */ -void get_mono_dc_colors( HDC hdc, BITMAPINFO *info, int count ) +void get_mono_dc_colors( DC *dc, BITMAPINFO *info, int count ) { RGBQUAD *colors = info->bmiColors; - COLORREF color = GetBkColor( hdc ); + COLORREF color = dc->backgroundColor; colors[count - 1].rgbRed = GetRValue( color ); colors[count - 1].rgbGreen = GetGValue( color ); @@ -234,7 +234,7 @@ void get_mono_dc_colors( HDC hdc, BITMAPINFO *info, int count ) if (count > 1) { - color = GetTextColor( hdc ); + color = dc->textColor; colors[0].rgbRed = GetRValue( color ); colors[0].rgbGreen = GetGValue( color ); colors[0].rgbBlue = GetBValue( color ); @@ -275,7 +275,7 @@ BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, /* 1-bpp source without a color table uses the destination DC colors */ if (src_info->bmiHeader.biBitCount == 1 && !src_info->bmiHeader.biClrUsed) - get_mono_dc_colors( dst_dev->hdc, src_info, 2 ); + get_mono_dc_colors( dc_dst, src_info, 2 ); if (dst_info->bmiHeader.biBitCount == 1 && !dst_colors) { @@ -283,9 +283,9 @@ BOOL nulldrv_StretchBlt( PHYSDEV dst_dev, struct bitblt_coords *dst, * that contains only the background color; except with a 1-bpp source, * in which case it uses the source colors */ if (src_info->bmiHeader.biBitCount > 1) - get_mono_dc_colors( src_dev->hdc, dst_info, 1 ); + get_mono_dc_colors( dc_src, dst_info, 1 ); else - get_mono_dc_colors( src_dev->hdc, dst_info, 2 ); + get_mono_dc_colors( dc_src, dst_info, 2 ); } if (!(err = convert_bits( src_info, src, dst_info, &bits ))) diff --git a/dlls/gdi32/dib.c b/dlls/gdi32/dib.c index 9a1414e..c47729d 100644 --- a/dlls/gdi32/dib.c +++ b/dlls/gdi32/dib.c @@ -581,7 +581,7 @@ INT nulldrv_StretchDIBits( PHYSDEV dev, INT xDst, INT yDst, INT widthDst, INT he if (dst_info->bmiHeader.biBitCount == 1 && !dst_colors) { if (src_info->bmiHeader.biBitCount > 1) - get_mono_dc_colors( dev->hdc, dst_info, 1 ); + get_mono_dc_colors( dc, dst_info, 1 ); else { memcpy( dst_info->bmiColors, src_info->bmiColors, 2 * sizeof(dst_info->bmiColors[0]) ); diff --git a/dlls/gdi32/dibdrv/bitblt.c b/dlls/gdi32/dibdrv/bitblt.c index 41311fa..d865ffb 100644 --- a/dlls/gdi32/dibdrv/bitblt.c +++ b/dlls/gdi32/dibdrv/bitblt.c @@ -985,6 +985,7 @@ DWORD dibdrv_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info, const struct gdi_image_bits *bits, struct bitblt_coords *src, struct bitblt_coords *dst, DWORD rop ) { + DC *dc = get_physdev_dc( dev ); struct clipped_rects clipped_rects; DWORD ret = ERROR_SUCCESS; dib_info src_dib; @@ -1000,7 +1001,7 @@ DWORD dibdrv_PutImage( PHYSDEV dev, HRGN clip, BITMAPINFO *info, /* For mask_rect, 1-bpp source without a color table uses the destination DC colors */ if (info->bmiHeader.biBitCount == 1 && pdev->dib.bit_count != 1 && !info->bmiHeader.biClrUsed) - get_mono_dc_colors( dev->hdc, info, 2 ); + get_mono_dc_colors( dc, info, 2 ); init_dib_info_from_bitmapinfo( &src_dib, info, bits->ptr ); src_dib.bits.is_copy = bits->is_copy; diff --git a/dlls/gdi32/gdi_private.h b/dlls/gdi32/gdi_private.h index a837215..de8db4c 100644 --- a/dlls/gdi32/gdi_private.h +++ b/dlls/gdi32/gdi_private.h @@ -199,7 +199,7 @@ extern BOOL intersect_vis_rectangles( struct bitblt_coords *dst, struct bitblt_c extern DWORD stretch_bits( const BITMAPINFO *src_info, struct bitblt_coords *src, BITMAPINFO *dst_info, struct bitblt_coords *dst, struct gdi_image_bits *bits, int mode ) DECLSPEC_HIDDEN; -extern void get_mono_dc_colors( HDC hdc, BITMAPINFO *info, int count ) DECLSPEC_HIDDEN; +extern void get_mono_dc_colors( DC *dc, BITMAPINFO *info, int count ) DECLSPEC_HIDDEN; /* brush.c */ extern BOOL store_brush_pattern( LOGBRUSH *brush, struct brush_pattern *pattern ) DECLSPEC_HIDDEN;

1 0

Józef Kucia : d3d10core/tests: Add test for face culling.
by Alexandre Julliard July 28, 2016

July 28, 2016

Module: wine Branch: master Commit: 0ce9055263367716d6b99f55d97ff90490772f0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ce9055263367716d6b99f55d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 27 23:33:46 2016 +0200 d3d10core/tests: Add test for face culling. 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 | 229 +++++++++++++++++++++++++++++++++--------- 1 file changed, 184 insertions(+), 45 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0ce9055263367716d6b99…

1 0

Józef Kucia : d3d11: Add support for FrontCounterClockwise.
by Alexandre Julliard July 28, 2016

July 28, 2016

Module: wine Branch: master Commit: 3449c79d139c841b33d19551a67b7976d47e533d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3449c79d139c841b33d19551a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Wed Jul 27 23:33:42 2016 +0200 d3d11: Add support for FrontCounterClockwise. 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/d3d11_private.h | 1 + dlls/d3d11/device.c | 6 +++--- dlls/d3d11/state.c | 20 +++++++++++++++++--- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index cdada42..e9837cc 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -419,6 +419,7 @@ struct d3d_rasterizer_state LONG refcount; struct wined3d_private_store private_store; + struct wined3d_rasterizer_state *wined3d_state; D3D11_RASTERIZER_DESC desc; struct wine_rb_entry entry; ID3D11Device *device; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 7f819db8..41a0319 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -834,6 +834,7 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon wined3d_mutex_lock(); if (!(device->rasterizer_state = unsafe_impl_from_ID3D11RasterizerState(rasterizer_state))) { + wined3d_device_set_rasterizer_state(device->wined3d_device, NULL); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_FILLMODE, WINED3D_FILL_SOLID); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_CULLMODE, WINED3D_CULL_CCW); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_SCISSORTESTENABLE, FALSE); @@ -843,12 +844,11 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSSetState(ID3D11DeviceCon return; } + wined3d_device_set_rasterizer_state(device->wined3d_device, device->rasterizer_state->wined3d_state); + desc = &device->rasterizer_state->desc; wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_FILLMODE, desc->FillMode); wined3d_device_set_render_state(device->wined3d_device, WINED3D_RS_CULLMODE, desc->CullMode); - /* glFrontFace() */ - if (desc->FrontCounterClockwise) - FIXME("Ignoring FrontCounterClockwise %#x.\n", desc->FrontCounterClockwise); /* OpenGL style depth bias. */ if (desc->DepthBias || desc->SlopeScaledDepthBias) FIXME("Ignoring depth bias.\n"); diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 68ad1bd..d702d98 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -664,9 +664,10 @@ static ULONG STDMETHODCALLTYPE d3d11_rasterizer_state_Release(ID3D11RasterizerSt struct d3d_device *device = impl_from_ID3D11Device(state->device); wined3d_mutex_lock(); wine_rb_remove(&device->rasterizer_states, &state->desc); - ID3D11Device_Release(state->device); + wined3d_rasterizer_state_decref(state->wined3d_state); wined3d_private_store_cleanup(&state->private_store); wined3d_mutex_unlock(); + ID3D11Device_Release(state->device); HeapFree(GetProcessHeap(), 0, state); } @@ -849,6 +850,9 @@ static const struct ID3D10RasterizerStateVtbl d3d10_rasterizer_state_vtbl = HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, struct d3d_device *device, const D3D11_RASTERIZER_DESC *desc) { + struct wined3d_rasterizer_state_desc wined3d_desc; + HRESULT hr; + state->ID3D11RasterizerState_iface.lpVtbl = &d3d11_rasterizer_state_vtbl; state->ID3D10RasterizerState_iface.lpVtbl = &d3d10_rasterizer_state_vtbl; state->refcount = 1; @@ -856,17 +860,27 @@ HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, struct d3d wined3d_private_store_init(&state->private_store); state->desc = *desc; + wined3d_desc.front_ccw = desc->FrontCounterClockwise; + if (FAILED(hr = wined3d_rasterizer_state_create(device->wined3d_device, + &wined3d_desc, &state->wined3d_state))) + { + WARN("Failed to create wined3d rasterizer state, hr %#x.\n", hr); + wined3d_private_store_cleanup(&state->private_store); + wined3d_mutex_unlock(); + return hr; + } + if (wine_rb_put(&device->rasterizer_states, desc, &state->entry) == -1) { ERR("Failed to insert rasterizer state entry.\n"); wined3d_private_store_cleanup(&state->private_store); + wined3d_rasterizer_state_decref(state->wined3d_state); wined3d_mutex_unlock(); return E_FAIL; } wined3d_mutex_unlock(); - state->device = &device->ID3D11Device_iface; - ID3D11Device_AddRef(state->device); + ID3D11Device_AddRef(state->device = &device->ID3D11Device_iface); return S_OK; }

1 0