March 2019 - Wine-Commits - list.winehq.org

Piotr Caban : oleaut32: Don't use strcasecmp.
by Alexandre Julliard March 29, 2019

March 29, 2019

Module: wine Branch: master Commit: fb30510352508b6cd48ebd6f58243d0949557be2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fb30510352508b6cd48ebd6f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 29 16:28:07 2019 +0100 oleaut32: Don't use strcasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/typelib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index acd4d07..521f1a3 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -3090,7 +3090,7 @@ static BOOL find_ne_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid, if (!(typeInfo->type_id & 0x8000)) { BYTE *p = resTab + typeInfo->type_id; - if ((*p == len) && !strncasecmp( (char*)p+1, typeid, len )) goto found_type; + if ((*p == len) && !_strnicmp( (char*)p+1, typeid, len )) goto found_type; } typeInfo = (NE_TYPEINFO *)((char *)(typeInfo + 1) + typeInfo->count * sizeof(NE_NAMEINFO)); @@ -3120,7 +3120,7 @@ static BOOL find_ne_resource( HFILE lzfd, LPCSTR typeid, LPCSTR resid, { BYTE *p = resTab + nameInfo->id; if (nameInfo->id & 0x8000) continue; - if ((*p == len) && !strncasecmp( (char*)p+1, resid, len )) goto found_name; + if ((*p == len) && !_strnicmp( (char*)p+1, resid, len )) goto found_name; } } else /* numeric resource id */

1 0

Piotr Caban : wldap32: Don't use strcasecmp.
by Alexandre Julliard March 29, 2019

March 29, 2019

Module: wine Branch: master Commit: db2f338bcc4c7bc7e335a00b6ad4b4e8c95d8288 URL: https://source.winehq.org/git/wine.git/?a=commit;h=db2f338bcc4c7bc7e335a00b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Mar 29 16:31:28 2019 +0100 wldap32: Don't use strcasecmp. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wldap32/init.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wldap32/init.c b/dlls/wldap32/init.c index fdb7908..d3508e3 100644 --- a/dlls/wldap32/init.c +++ b/dlls/wldap32/init.c @@ -30,6 +30,7 @@ #include "windef.h" #include "winbase.h" #include "winnls.h" +#include "winternl.h" #include "winldap_private.h" #include "wldap32.h" @@ -114,10 +115,10 @@ oom: /* Determine if a URL starts with a known LDAP scheme */ static BOOL has_ldap_scheme( char *url ) { - return !strncasecmp( url, "ldap://", 7 ) || - !strncasecmp( url, "ldaps://", 8 ) || - !strncasecmp( url, "ldapi://", 8 ) || - !strncasecmp( url, "cldap://", 8 ); + return !_strnicmp( url, "ldap://", 7 ) || + !_strnicmp( url, "ldaps://", 8 ) || + !_strnicmp( url, "ldapi://", 8 ) || + !_strnicmp( url, "cldap://", 8 ); } /* Flatten an array of hostnames into a space separated string of URLs.

1 0

Józef Kucia : wined3d: Avoid using gl_info in wined3d_get_device_caps().
by Alexandre Julliard March 29, 2019

March 29, 2019

Module: wine Branch: master Commit: f6c2d9d75f60eb030543a345cd4e7176b5a3dd3c URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6c2d9d75f60eb030543a345… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 29 13:00:16 2019 +0100 wined3d: Avoid using gl_info in wined3d_get_device_caps(). 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/adapter_gl.c | 23 +++++++++++++++++++++++ dlls/wined3d/directx.c | 26 +++++++++----------------- 2 files changed, 32 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 873971e..1b64402 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4383,6 +4383,29 @@ static void adapter_gl_get_wined3d_caps(const struct wined3d_adapter *adapter, s } caps->MaxAnisotropy = gl_info->limits.anisotropy; + + if (caps->VertexShaderVersion >= 3) + { + caps->MaxVertexShader30InstructionSlots + = max(caps->MaxVertexShader30InstructionSlots, gl_info->limits.arb_vs_instructions); + } + if (caps->VertexShaderVersion >= 2) + { + caps->VS20Caps.temp_count = max(caps->VS20Caps.temp_count, gl_info->limits.arb_vs_temps); + + if (gl_info->supported[ARB_HALF_FLOAT_VERTEX]) + caps->DeclTypes |= WINED3DDTCAPS_FLOAT16_2 | WINED3DDTCAPS_FLOAT16_4; + } + + if (caps->PixelShaderVersion >= 3) + { + caps->MaxPixelShader30InstructionSlots + = max(caps->MaxPixelShader30InstructionSlots, gl_info->limits.arb_ps_instructions); + } + if (caps->PixelShaderVersion >= 2) + { + caps->PS20Caps.temp_count = max(caps->PS20Caps.temp_count, gl_info->limits.arb_ps_temps); + } } static BOOL wined3d_check_pixel_format_color(const struct wined3d_pixel_format *cfg, diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0676dca..fbbda18 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1747,7 +1747,6 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, unsigned in { const struct wined3d_d3d_info *d3d_info; struct wined3d_vertex_caps vertex_caps; - const struct wined3d_gl_info *gl_info; const struct wined3d_adapter *adapter; DWORD ckey_caps, blit_caps, fx_caps; struct fragment_caps fragment_caps; @@ -1761,7 +1760,6 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, unsigned in adapter = wined3d->adapters[adapter_idx]; d3d_info = &adapter->d3d_info; - gl_info = &adapter->gl_info; caps->DeviceType = (device_type == WINED3D_DEVICE_TYPE_HAL) ? WINED3D_DEVICE_TYPE_HAL : WINED3D_DEVICE_TYPE_REF; caps->AdapterOrdinal = adapter_idx; @@ -2005,26 +2003,26 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, unsigned in caps->VS20Caps.caps = WINED3DVS20CAPS_PREDICATION; /* VS 3.0 requires MAX_DYNAMICFLOWCONTROLDEPTH (24) */ caps->VS20Caps.dynamic_flow_control_depth = WINED3DVS20_MAX_DYNAMICFLOWCONTROLDEPTH; - caps->VS20Caps.temp_count = max(32, gl_info->limits.arb_vs_temps); + caps->VS20Caps.temp_count = 32; /* level of nesting in loops / if-statements; VS 3.0 requires MAX (4) */ caps->VS20Caps.static_flow_control_depth = WINED3DVS20_MAX_STATICFLOWCONTROLDEPTH; caps->MaxVShaderInstructionsExecuted = 65535; /* VS 3.0 needs at least 65535, some cards even use 2^32-1 */ - caps->MaxVertexShader30InstructionSlots = max(512, gl_info->limits.arb_vs_instructions); + caps->MaxVertexShader30InstructionSlots = 512; caps->VertexTextureFilterCaps = WINED3DPTFILTERCAPS_MINFPOINT | WINED3DPTFILTERCAPS_MAGFPOINT; } else if (caps->VertexShaderVersion == 2) { caps->VS20Caps.caps = 0; caps->VS20Caps.dynamic_flow_control_depth = WINED3DVS20_MIN_DYNAMICFLOWCONTROLDEPTH; - caps->VS20Caps.temp_count = max(12, gl_info->limits.arb_vs_temps); + caps->VS20Caps.temp_count = 12; caps->VS20Caps.static_flow_control_depth = 1; caps->MaxVShaderInstructionsExecuted = 65535; caps->MaxVertexShader30InstructionSlots = 0; } - else - { /* VS 1.x */ + else /* VS 1.x */ + { caps->VS20Caps.caps = 0; caps->VS20Caps.dynamic_flow_control_depth = 0; caps->VS20Caps.temp_count = 0; @@ -2051,22 +2049,21 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, unsigned in WINED3DPS20CAPS_NOTEXINSTRUCTIONLIMIT; /* PS 3.0 requires MAX_DYNAMICFLOWCONTROLDEPTH (24) */ caps->PS20Caps.dynamic_flow_control_depth = WINED3DPS20_MAX_DYNAMICFLOWCONTROLDEPTH; - caps->PS20Caps.temp_count = max(32, gl_info->limits.arb_ps_temps); + caps->PS20Caps.temp_count = 32; /* PS 3.0 requires MAX_STATICFLOWCONTROLDEPTH (4) */ caps->PS20Caps.static_flow_control_depth = WINED3DPS20_MAX_STATICFLOWCONTROLDEPTH; /* PS 3.0 requires MAX_NUMINSTRUCTIONSLOTS (512) */ caps->PS20Caps.instruction_slot_count = WINED3DPS20_MAX_NUMINSTRUCTIONSLOTS; caps->MaxPShaderInstructionsExecuted = 65535; - caps->MaxPixelShader30InstructionSlots = max(WINED3DMIN30SHADERINSTRUCTIONS, - gl_info->limits.arb_ps_instructions); + caps->MaxPixelShader30InstructionSlots = WINED3DMIN30SHADERINSTRUCTIONS; } - else if(caps->PixelShaderVersion == 2) + else if (caps->PixelShaderVersion == 2) { /* Below we assume PS2.0 specs, not extended 2.0a(GeforceFX)/2.0b(Radeon R3xx) ones */ caps->PS20Caps.caps = 0; caps->PS20Caps.dynamic_flow_control_depth = 0; /* WINED3DVS20_MIN_DYNAMICFLOWCONTROLDEPTH = 0 */ - caps->PS20Caps.temp_count = max(12, gl_info->limits.arb_ps_temps); + caps->PS20Caps.temp_count = 12; caps->PS20Caps.static_flow_control_depth = WINED3DPS20_MIN_STATICFLOWCONTROLDEPTH; /* Minimum: 1 */ /* Minimum number (64 ALU + 32 Texture), a GeforceFX uses 512 */ caps->PS20Caps.instruction_slot_count = WINED3DPS20_MIN_NUMINSTRUCTIONSLOTS; @@ -2099,11 +2096,6 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, unsigned in WINED3DDTCAPS_UBYTE4N | WINED3DDTCAPS_SHORT2N | WINED3DDTCAPS_SHORT4N; - if (gl_info->supported[ARB_HALF_FLOAT_VERTEX]) - { - caps->DeclTypes |= WINED3DDTCAPS_FLOAT16_2 | - WINED3DDTCAPS_FLOAT16_4; - } } else {

1 0

Józef Kucia : wined3d: Pass wined3d_adapter to fragment_pipe->get_caps().
by Alexandre Julliard March 29, 2019

March 29, 2019

Module: wine Branch: master Commit: 89fbb64fb8cbacf5294fbce01cb74b19b6fbe4f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=89fbb64fb8cbacf5294fbce0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 29 13:00:15 2019 +0100 wined3d: Pass wined3d_adapter to fragment_pipe->get_caps(). 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/adapter_gl.c | 2 +- dlls/wined3d/arb_program_shader.c | 6 ++++-- dlls/wined3d/ati_fragment_shader.c | 2 +- dlls/wined3d/directx.c | 2 +- dlls/wined3d/glsl_shader.c | 7 ++++--- dlls/wined3d/nvidia_texture_shader.c | 4 +++- dlls/wined3d/shader.c | 2 +- dlls/wined3d/state.c | 6 ++++-- dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 10 files changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index d88236e..873971e 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3729,7 +3729,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, d3d_info->limits.active_light_count = vertex_caps.max_active_lights; d3d_info->emulated_flatshading = vertex_caps.emulated_flatshading; - adapter->fragment_pipe->get_caps(gl_info, &fragment_caps); + adapter->fragment_pipe->get_caps(adapter, &fragment_caps); d3d_info->limits.ffp_blend_stages = fragment_caps.MaxTextureBlendStages; d3d_info->limits.ffp_textures = fragment_caps.MaxSimultaneousTextures; d3d_info->shader_color_key = !!(fragment_caps.wined3d_caps & WINED3D_FRAGMENT_CAP_COLOR_KEY); diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 97117db..a05bb2f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4812,7 +4812,7 @@ static HRESULT shader_arb_alloc(struct wined3d_device *device, const struct wine priv->vertex_pipe = vertex_pipe; priv->fragment_pipe = fragment_pipe; - fragment_pipe->get_caps(&device->adapter->gl_info, &fragment_caps); + fragment_pipe->get_caps(device->adapter, &fragment_caps); priv->ffp_proj_control = fragment_caps.wined3d_caps & WINED3D_FRAGMENT_CAP_PROJ_CONTROL; device->vertex_priv = vertex_priv; @@ -5736,8 +5736,10 @@ static void arbfp_free(struct wined3d_device *device, struct wined3d_context *co heap_free(device->fragment_priv); } -static void arbfp_get_caps(const struct wined3d_gl_info *gl_info, struct fragment_caps *caps) +static void arbfp_get_caps(const struct wined3d_adapter *adapter, struct fragment_caps *caps) { + const struct wined3d_gl_info *gl_info = &adapter->gl_info; + caps->wined3d_caps = WINED3D_FRAGMENT_CAP_PROJ_CONTROL | WINED3D_FRAGMENT_CAP_SRGB_WRITE | WINED3D_FRAGMENT_CAP_COLOR_KEY; diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 2837322..959f4f8 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -1263,7 +1263,7 @@ static void atifs_enable(const struct wined3d_gl_info *gl_info, BOOL enable) } } -static void atifs_get_caps(const struct wined3d_gl_info *gl_info, struct fragment_caps *caps) +static void atifs_get_caps(const struct wined3d_adapter *adapter, struct fragment_caps *caps) { caps->wined3d_caps = WINED3D_FRAGMENT_CAP_PROJ_CONTROL; caps->PrimitiveMiscCaps = WINED3DPMISCCAPS_TSSARGTEMP | diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index a3a8486..0676dca 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1968,7 +1968,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, unsigned in caps->VertexTextureFilterCaps = 0; adapter->shader_backend->shader_get_caps(adapter, &shader_caps); - adapter->fragment_pipe->get_caps(gl_info, &fragment_caps); + adapter->fragment_pipe->get_caps(adapter, &fragment_caps); adapter->vertex_pipe->vp_get_caps(adapter, &vertex_caps); /* Add shader misc caps. Only some of them belong to the shader parts of the pipeline */ diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5c0d9ae..7c41158 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -11189,7 +11189,6 @@ static HRESULT shader_glsl_alloc(struct wined3d_device *device, const struct win const struct fragment_pipeline *fragment_pipe) { SIZE_T stack_size = wined3d_log2i(max(WINED3D_MAX_VS_CONSTS_F, WINED3D_MAX_PS_CONSTS_F)) + 1; - const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct fragment_caps fragment_caps; void *vertex_priv, *fragment_priv; struct shader_glsl_priv *priv; @@ -11243,7 +11242,7 @@ static HRESULT shader_glsl_alloc(struct wined3d_device *device, const struct win priv->next_constant_version = 1; priv->vertex_pipe = vertex_pipe; priv->fragment_pipe = fragment_pipe; - fragment_pipe->get_caps(gl_info, &fragment_caps); + fragment_pipe->get_caps(device->adapter, &fragment_caps); priv->ffp_proj_control = fragment_caps.wined3d_caps & WINED3D_FRAGMENT_CAP_PROJ_CONTROL; priv->legacy_lighting = device->wined3d->flags & WINED3D_LEGACY_FFP_LIGHTING; @@ -12171,8 +12170,10 @@ static void glsl_fragment_pipe_enable(const struct wined3d_gl_info *gl_info, BOO /* Nothing to do. */ } -static void glsl_fragment_pipe_get_caps(const struct wined3d_gl_info *gl_info, struct fragment_caps *caps) +static void glsl_fragment_pipe_get_caps(const struct wined3d_adapter *adapter, struct fragment_caps *caps) { + const struct wined3d_gl_info *gl_info = &adapter->gl_info; + caps->wined3d_caps = WINED3D_FRAGMENT_CAP_PROJ_CONTROL | WINED3D_FRAGMENT_CAP_SRGB_WRITE | WINED3D_FRAGMENT_CAP_COLOR_KEY; diff --git a/dlls/wined3d/nvidia_texture_shader.c b/dlls/wined3d/nvidia_texture_shader.c index f5dbb25..fd80224 100644 --- a/dlls/wined3d/nvidia_texture_shader.c +++ b/dlls/wined3d/nvidia_texture_shader.c @@ -687,8 +687,10 @@ static void nvts_enable(const struct wined3d_gl_info *gl_info, BOOL enable) } } -static void nvrc_fragment_get_caps(const struct wined3d_gl_info *gl_info, struct fragment_caps *caps) +static void nvrc_fragment_get_caps(const struct wined3d_adapter *adapter, struct fragment_caps *caps) { + const struct wined3d_gl_info *gl_info = &adapter->gl_info; + caps->wined3d_caps = 0; caps->PrimitiveMiscCaps = WINED3DPMISCCAPS_TSSARGTEMP; diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 060b3fd..8fae8e2 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3236,7 +3236,7 @@ static HRESULT shader_none_alloc(struct wined3d_device *device, const struct win priv->vertex_pipe = vertex_pipe; priv->fragment_pipe = fragment_pipe; - fragment_pipe->get_caps(&device->adapter->gl_info, &fragment_caps); + fragment_pipe->get_caps(device->adapter, &fragment_caps); priv->ffp_proj_control = fragment_caps.wined3d_caps & WINED3D_FRAGMENT_CAP_PROJ_CONTROL; device->vertex_priv = vertex_priv; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 98be4cf..d995fe8 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5238,8 +5238,10 @@ const struct wined3d_vertex_pipe_ops ffp_vertex_pipe = vp_ffp_states, }; -static void ffp_fragment_get_caps(const struct wined3d_gl_info *gl_info, struct fragment_caps *caps) +static void ffp_fragment_get_caps(const struct wined3d_adapter *adapter, struct fragment_caps *caps) { + const struct wined3d_gl_info *gl_info = &adapter->gl_info; + caps->wined3d_caps = 0; caps->PrimitiveMiscCaps = 0; caps->TextureOpCaps = WINED3DTEXOPCAPS_ADD @@ -5340,7 +5342,7 @@ const struct wined3d_vertex_pipe_ops none_vertex_pipe = NULL, }; -static void fp_none_get_caps(const struct wined3d_gl_info *gl_info, struct fragment_caps *caps) +static void fp_none_get_caps(const struct wined3d_adapter *adapter, struct fragment_caps *caps) { memset(caps, 0, sizeof(*caps)); } diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index ea59d4f..a242283 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3138,7 +3138,7 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win unsigned int i, j; BOOL srgb_write; - adapter->fragment_pipe->get_caps(gl_info, &fragment_caps); + adapter->fragment_pipe->get_caps(adapter, &fragment_caps); adapter->shader_backend->shader_get_caps(adapter, &shader_caps); srgb_write = (fragment_caps.wined3d_caps & WINED3D_FRAGMENT_CAP_SRGB_WRITE) && (shader_caps.wined3d_caps & WINED3D_SHADER_CAP_SRGB_WRITE); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 253b395..f5bf96f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2060,7 +2060,7 @@ struct fragment_caps struct fragment_pipeline { void (*enable_extension)(const struct wined3d_gl_info *gl_info, BOOL enable); - void (*get_caps)(const struct wined3d_gl_info *gl_info, struct fragment_caps *caps); + void (*get_caps)(const struct wined3d_adapter *adapter, struct fragment_caps *caps); DWORD (*get_emul_mask)(const struct wined3d_gl_info *gl_info); void *(*alloc_private)(const struct wined3d_shader_backend_ops *shader_backend, void *shader_priv); void (*free_private)(struct wined3d_device *device, struct wined3d_context *context);

1 0

Józef Kucia : wined3d: Pass wined3d_adapter to vp_get_caps().
by Alexandre Julliard March 29, 2019

March 29, 2019

Module: wine Branch: master Commit: 9502b8e843cf3589f7d2786a5d7e21a4f8ecc289 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9502b8e843cf3589f7d2786a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 29 13:00:14 2019 +0100 wined3d: Pass wined3d_adapter to vp_get_caps(). 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/adapter_gl.c | 2 +- dlls/wined3d/directx.c | 2 +- dlls/wined3d/glsl_shader.c | 4 +++- dlls/wined3d/state.c | 6 ++++-- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 59d035e..d88236e 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3722,7 +3722,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, d3d_info->viewport_array_index_any_shader = !!gl_info->supported[ARB_SHADER_VIEWPORT_LAYER_ARRAY]; - adapter->vertex_pipe->vp_get_caps(gl_info, &vertex_caps); + adapter->vertex_pipe->vp_get_caps(adapter, &vertex_caps); d3d_info->xyzrhw = vertex_caps.xyzrhw; d3d_info->ffp_generic_attributes = vertex_caps.ffp_generic_attributes; d3d_info->limits.ffp_vertex_blend_matrices = vertex_caps.max_vertex_blend_matrices; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index d23691b..a3a8486 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1969,7 +1969,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, unsigned in adapter->shader_backend->shader_get_caps(adapter, &shader_caps); adapter->fragment_pipe->get_caps(gl_info, &fragment_caps); - adapter->vertex_pipe->vp_get_caps(gl_info, &vertex_caps); + adapter->vertex_pipe->vp_get_caps(adapter, &vertex_caps); /* Add shader misc caps. Only some of them belong to the shader parts of the pipeline */ caps->PrimitiveMiscCaps |= fragment_caps.PrimitiveMiscCaps; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 603ccc6..5c0d9ae 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -11677,8 +11677,10 @@ const struct wined3d_shader_backend_ops glsl_shader_backend = static void glsl_vertex_pipe_vp_enable(const struct wined3d_gl_info *gl_info, BOOL enable) {} -static void glsl_vertex_pipe_vp_get_caps(const struct wined3d_gl_info *gl_info, struct wined3d_vertex_caps *caps) +static void glsl_vertex_pipe_vp_get_caps(const struct wined3d_adapter *adapter, struct wined3d_vertex_caps *caps) { + const struct wined3d_gl_info *gl_info = &adapter->gl_info; + caps->xyzrhw = TRUE; caps->emulated_flatshading = !needs_legacy_glsl_syntax(gl_info); caps->ffp_generic_attributes = TRUE; diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index fcad10f..98be4cf 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5200,8 +5200,10 @@ static void *ffp_alloc(const struct wined3d_shader_backend_ops *shader_backend, static void ffp_free(struct wined3d_device *device, struct wined3d_context *context) {} -static void vp_ffp_get_caps(const struct wined3d_gl_info *gl_info, struct wined3d_vertex_caps *caps) +static void vp_ffp_get_caps(const struct wined3d_adapter *adapter, struct wined3d_vertex_caps *caps) { + const struct wined3d_gl_info *gl_info = &adapter->gl_info; + caps->xyzrhw = FALSE; caps->ffp_generic_attributes = FALSE; caps->max_active_lights = gl_info->limits.lights; @@ -5318,7 +5320,7 @@ static void *none_alloc(const struct wined3d_shader_backend_ops *shader_backend, static void none_free(struct wined3d_device *device, struct wined3d_context *context) {} -static void vp_none_get_caps(const struct wined3d_gl_info *gl_info, struct wined3d_vertex_caps *caps) +static void vp_none_get_caps(const struct wined3d_adapter *adapter, struct wined3d_vertex_caps *caps) { memset(caps, 0, sizeof(*caps)); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1b89aff..253b395 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2087,7 +2087,7 @@ struct wined3d_vertex_caps struct wined3d_vertex_pipe_ops { void (*vp_enable)(const struct wined3d_gl_info *gl_info, BOOL enable); - void (*vp_get_caps)(const struct wined3d_gl_info *gl_info, struct wined3d_vertex_caps *caps); + void (*vp_get_caps)(const struct wined3d_adapter *adapter, struct wined3d_vertex_caps *caps); DWORD (*vp_get_emul_mask)(const struct wined3d_gl_info *gl_info); void *(*vp_alloc)(const struct wined3d_shader_backend_ops *shader_backend, void *shader_priv); void (*vp_free)(struct wined3d_device *device, struct wined3d_context *context);

1 0

Józef Kucia : wined3d: Pass wined3d_adapter to shader_get_caps().
by Alexandre Julliard March 29, 2019

March 29, 2019

Module: wine Branch: master Commit: 20a94e69983d8d0f01bc0c8208e9cc2137012320 URL: https://source.winehq.org/git/wine.git/?a=commit;h=20a94e69983d8d0f01bc0c82… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Mar 29 13:00:13 2019 +0100 wined3d: Pass wined3d_adapter to shader_get_caps(). Suggested by Henri Verbeet. 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/adapter_gl.c | 2 +- dlls/wined3d/arb_program_shader.c | 4 +++- dlls/wined3d/directx.c | 2 +- dlls/wined3d/glsl_shader.c | 3 ++- dlls/wined3d/shader.c | 14 ++------------ dlls/wined3d/utils.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 7 files changed, 11 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 8cf90d5..59d035e 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3707,7 +3707,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, d3d_info->limits.max_rt_count = gl_info->limits.buffers; d3d_info->limits.max_clip_distances = gl_info->limits.user_clip_distances; - adapter->shader_backend->shader_get_caps(gl_info, &shader_caps); + adapter->shader_backend->shader_get_caps(adapter, &shader_caps); d3d_info->vs_clipping = shader_caps.wined3d_caps & WINED3D_SHADER_CAP_VS_CLIPPING; d3d_info->limits.vs_version = shader_caps.vs_version; d3d_info->limits.hs_version = shader_caps.hs_version; diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 92c6e47..97117db 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -4862,8 +4862,10 @@ static void shader_arb_free_context_data(struct wined3d_context *context) static void shader_arb_init_context_state(struct wined3d_context *context) {} -static void shader_arb_get_caps(const struct wined3d_gl_info *gl_info, struct shader_caps *caps) +static void shader_arb_get_caps(const struct wined3d_adapter *adapter, struct shader_caps *caps) { + const struct wined3d_gl_info *gl_info = &adapter->gl_info; + if (gl_info->supported[ARB_VERTEX_PROGRAM]) { DWORD vs_consts; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 13014d1..d23691b 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1967,7 +1967,7 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, unsigned in WINED3DPTFILTERCAPS_MAGFLINEAR; caps->VertexTextureFilterCaps = 0; - adapter->shader_backend->shader_get_caps(gl_info, &shader_caps); + adapter->shader_backend->shader_get_caps(adapter, &shader_caps); adapter->fragment_pipe->get_caps(gl_info, &fragment_caps); adapter->vertex_pipe->vp_get_caps(gl_info, &vertex_caps); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6c9ed16..603ccc6 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -11337,8 +11337,9 @@ static unsigned int shader_glsl_get_shader_model(const struct wined3d_gl_info *g return 2; } -static void shader_glsl_get_caps(const struct wined3d_gl_info *gl_info, struct shader_caps *caps) +static void shader_glsl_get_caps(const struct wined3d_adapter *adapter, struct shader_caps *caps) { + const struct wined3d_gl_info *gl_info = &adapter->gl_info; unsigned int shader_model = shader_glsl_get_shader_model(gl_info); TRACE("Shader model %u.\n", shader_model); diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 379ca63..060b3fd 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3260,20 +3260,10 @@ static BOOL shader_none_allocate_context_data(struct wined3d_context *context) return TRUE; } -static void shader_none_get_caps(const struct wined3d_gl_info *gl_info, struct shader_caps *caps) +static void shader_none_get_caps(const struct wined3d_adapter *adapter, struct shader_caps *caps) { /* Set the shader caps to 0 for the none shader backend */ - caps->vs_version = 0; - caps->hs_version = 0; - caps->ds_version = 0; - caps->gs_version = 0; - caps->ps_version = 0; - caps->cs_version = 0; - caps->vs_uniform_count = 0; - caps->ps_uniform_count = 0; - caps->ps_1x_max_value = 0.0f; - caps->varying_count = 0; - caps->wined3d_caps = 0; + memset(caps, 0, sizeof(*caps)); } static BOOL shader_none_color_fixup_supported(struct color_fixup_desc fixup) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 872b0f7..ea59d4f 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -3139,7 +3139,7 @@ static BOOL init_format_texture_info(struct wined3d_adapter *adapter, struct win BOOL srgb_write; adapter->fragment_pipe->get_caps(gl_info, &fragment_caps); - adapter->shader_backend->shader_get_caps(gl_info, &shader_caps); + adapter->shader_backend->shader_get_caps(adapter, &shader_caps); srgb_write = (fragment_caps.wined3d_caps & WINED3D_FRAGMENT_CAP_SRGB_WRITE) && (shader_caps.wined3d_caps & WINED3D_SHADER_CAP_SRGB_WRITE); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 88885fe..1b89aff 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1435,7 +1435,7 @@ struct wined3d_shader_backend_ops BOOL (*shader_allocate_context_data)(struct wined3d_context *context); void (*shader_free_context_data)(struct wined3d_context *context); void (*shader_init_context_state)(struct wined3d_context *context); - void (*shader_get_caps)(const struct wined3d_gl_info *gl_info, struct shader_caps *caps); + void (*shader_get_caps)(const struct wined3d_adapter *adapter, struct shader_caps *caps); BOOL (*shader_color_fixup_supported)(struct color_fixup_desc fixup); BOOL (*shader_has_ffp_proj_control)(void *shader_priv); };

1 0

Paul Gofman : ddraw/tests: Test specular lighting with zero shininess in ddraw2.
by Alexandre Julliard March 29, 2019

March 29, 2019

Module: wine Branch: master Commit: d18f051ac49fa6d304bb189833eaae9873f1976d URL: https://source.winehq.org/git/wine.git/?a=commit;h=d18f051ac49fa6d304bb1898… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Mar 29 13:56:41 2019 +0300 ddraw/tests: Test specular lighting with zero shininess in ddraw2. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw2.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 4fbb6f0..4ae04d1 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -7373,25 +7373,25 @@ static void test_specular_lighting(void) {320, 360, 0x002c2c2c}, {480, 360, 0x006e6e6e}, }, - expected_point_side[] = + expected_point_far[] = { {160, 120, 0x00000000}, {320, 120, 0x00000000}, {480, 120, 0x00000000}, {160, 240, 0x00000000}, - {320, 240, 0x00000000}, + {320, 240, 0x00ffffff}, {480, 240, 0x00000000}, {160, 360, 0x00000000}, {320, 360, 0x00000000}, {480, 360, 0x00000000}, }, - expected_point_far[] = + expected_zero[] = { {160, 120, 0x00000000}, {320, 120, 0x00000000}, {480, 120, 0x00000000}, {160, 240, 0x00000000}, - {320, 240, 0x00ffffff}, + {320, 240, 0x00000000}, {480, 240, 0x00000000}, {160, 360, 0x00000000}, {320, 360, 0x00000000}, @@ -7410,8 +7410,13 @@ static void test_specular_lighting(void) {&point, 30.0f, expected_point_local, ARRAY_SIZE(expected_point_local)}, {&spot, 30.0f, expected_spot_local, ARRAY_SIZE(expected_spot_local)}, {&parallelpoint, 30.0f, expected_parallelpoint, ARRAY_SIZE(expected_parallelpoint)}, - {&point_side, 0.0f, expected_point_side, ARRAY_SIZE(expected_point_side)}, + {&point_side, 0.0f, expected_zero, ARRAY_SIZE(expected_zero)}, {&point_far, 1.0f, expected_point_far, ARRAY_SIZE(expected_point_far)}, + {&directional, 0.0f, expected_zero, ARRAY_SIZE(expected_zero)}, + {&point, 0.0f, expected_zero, ARRAY_SIZE(expected_zero)}, + {&spot, 0.0f, expected_zero, ARRAY_SIZE(expected_zero)}, + {&parallelpoint, 0.0f, expected_zero, ARRAY_SIZE(expected_zero)}, + {&point_far, 0.0f, expected_zero, ARRAY_SIZE(expected_zero)}, }; IDirect3D2 *d3d; IDirect3DDevice2 *device;

1 0

Paul Gofman : ddraw/tests: Test specular lighting with zero shininess in ddraw4.
by Alexandre Julliard March 29, 2019

March 29, 2019

Module: wine Branch: master Commit: 9411bc524c845a03ae5373fafdf949d53da57691 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9411bc524c845a03ae5373fa… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Mar 29 13:56:40 2019 +0300 ddraw/tests: Test specular lighting with zero shininess in ddraw4. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw4.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index f60d606..263679d 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -4374,25 +4374,25 @@ static void test_specular_lighting(void) {320, 360, 0x002c2c2c}, {480, 360, 0x006e6e6e}, }, - expected_point_side[] = + expected_point_far[] = { {160, 120, 0x00000000}, {320, 120, 0x00000000}, {480, 120, 0x00000000}, {160, 240, 0x00000000}, - {320, 240, 0x00000000}, + {320, 240, 0x00ffffff}, {480, 240, 0x00000000}, {160, 360, 0x00000000}, {320, 360, 0x00000000}, {480, 360, 0x00000000}, }, - expected_point_far[] = + expected_zero[] = { {160, 120, 0x00000000}, {320, 120, 0x00000000}, {480, 120, 0x00000000}, {160, 240, 0x00000000}, - {320, 240, 0x00ffffff}, + {320, 240, 0x00000000}, {480, 240, 0x00000000}, {160, 360, 0x00000000}, {320, 360, 0x00000000}, @@ -4415,8 +4415,14 @@ static void test_specular_lighting(void) {&point, TRUE, 30.0f, expected_point, ARRAY_SIZE(expected_point)}, {&spot, TRUE, 30.0f, expected_spot, ARRAY_SIZE(expected_spot)}, {&parallelpoint, TRUE, 30.0f, expected_parallelpoint, ARRAY_SIZE(expected_parallelpoint)}, - {&point_side, TRUE, 0.0f, expected_point_side, ARRAY_SIZE(expected_point_side)}, + {&point_side, TRUE, 0.0f, expected_zero, ARRAY_SIZE(expected_zero)}, {&point_far, TRUE, 1.0f, expected_point_far, ARRAY_SIZE(expected_point_far)}, + {&directional, FALSE, 0.0f, expected_zero, ARRAY_SIZE(expected_zero)}, + {&directional, TRUE, 0.0f, expected_zero, ARRAY_SIZE(expected_zero)}, + {&point, TRUE, 0.0f, expected_zero, ARRAY_SIZE(expected_zero)}, + {&spot, TRUE, 0.0f, expected_zero, ARRAY_SIZE(expected_zero)}, + {&parallelpoint, TRUE, 0.0f, expected_zero, ARRAY_SIZE(expected_zero)}, + {&point_far, TRUE, 0.0f, expected_zero, ARRAY_SIZE(expected_zero)}, }; IDirect3D3 *d3d; IDirect3DDevice3 *device;

1 0

Paul Gofman : ddraw/tests: Test specular lighting with zero shininess in ddraw7.
by Alexandre Julliard March 29, 2019

March 29, 2019

Module: wine Branch: master Commit: ce316dfd5fce338c4a7e29accef15431e04ce123 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ce316dfd5fce338c4a7e29ac… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Mar 29 13:56:39 2019 +0300 ddraw/tests: Test specular lighting with zero shininess in ddraw7. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw7.c | 81 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 74 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index c199994..423dba5 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -4005,6 +4005,66 @@ static void test_specular_lighting(void) {160, 360, 0x00000000}, {320, 360, 0x00000000}, {480, 360, 0x00000000}, + }, + expected_directional_0[] = + { + {160, 120, 0x00ffffff}, + {320, 120, 0x00ffffff}, + {480, 120, 0x00ffffff}, + {160, 240, 0x00ffffff}, + {320, 240, 0x00ffffff}, + {480, 240, 0x00ffffff}, + {160, 360, 0x00ffffff}, + {320, 360, 0x00ffffff}, + {480, 360, 0x00ffffff}, + }, + expected_directional_local_0[] = + { + {160, 120, 0x00ffffff}, + {320, 120, 0x00ffffff}, + {480, 120, 0x00ffffff}, + {160, 240, 0x00ffffff}, + {320, 240, 0x00ffffff}, + {480, 240, 0x00ffffff}, + {160, 360, 0x00ffffff}, + {320, 360, 0x00ffffff}, + {480, 360, 0x00ffffff}, + }, + expected_point_0[] = + { + {160, 120, 0x00aaaaaa}, + {320, 120, 0x00cccccc}, + {480, 120, 0x00aaaaaa}, + {160, 240, 0x00cccccc}, + {320, 240, 0x00ffffff}, + {480, 240, 0x00cccccc}, + {160, 360, 0x00aaaaaa}, + {320, 360, 0x00cccccc}, + {480, 360, 0x00aaaaaa}, + }, + expected_spot_0[] = + { + {160, 120, 0x00000000}, + {320, 120, 0x002e2e2e}, + {480, 120, 0x00000000}, + {160, 240, 0x002e2e2e}, + {320, 240, 0x00ffffff}, + {480, 240, 0x002e2e2e}, + {160, 360, 0x00000000}, + {320, 360, 0x002e2e2e}, + {480, 360, 0x00000000}, + }, + expected_point_range_0[] = + { + {160, 120, 0x00000000}, + {320, 120, 0x00cccccc}, + {480, 120, 0x00000000}, + {160, 240, 0x00cccccc}, + {320, 240, 0x00ffffff}, + {480, 240, 0x00cccccc}, + {160, 360, 0x00000000}, + {320, 360, 0x00cccccc}, + {480, 360, 0x00000000}, }; static const struct { @@ -4016,14 +4076,21 @@ static void test_specular_lighting(void) } tests[] = { - {&directional, FALSE, 30.0f, expected_directional, ARRAY_SIZE(expected_directional)}, + {&directional, FALSE, 30.0f, expected_directional, ARRAY_SIZE(expected_directional)}, {&directional, TRUE, 30.0f, expected_directional_local, ARRAY_SIZE(expected_directional_local)}, - {&point, FALSE, 30.0f, expected_point, ARRAY_SIZE(expected_point)}, - {&point, TRUE, 30.0f, expected_point_local, ARRAY_SIZE(expected_point_local)}, - {&spot, FALSE, 30.0f, expected_spot, ARRAY_SIZE(expected_spot)}, - {&spot, TRUE, 30.0f, expected_spot_local, ARRAY_SIZE(expected_spot_local)}, - {&point_range, FALSE, 30.0f, expected_point_range, ARRAY_SIZE(expected_point_range)}, - {&point_side, TRUE, 0.0f, expected_point_side, ARRAY_SIZE(expected_point_side)}, + {&point, FALSE, 30.0f, expected_point, ARRAY_SIZE(expected_point)}, + {&point, TRUE, 30.0f, expected_point_local, ARRAY_SIZE(expected_point_local)}, + {&spot, FALSE, 30.0f, expected_spot, ARRAY_SIZE(expected_spot)}, + {&spot, TRUE, 30.0f, expected_spot_local, ARRAY_SIZE(expected_spot_local)}, + {&point_range, FALSE, 30.0f, expected_point_range, ARRAY_SIZE(expected_point_range)}, + {&point_side, TRUE, 0.0f, expected_point_side, ARRAY_SIZE(expected_point_side)}, + {&directional, FALSE, 0.0f, expected_directional_0, ARRAY_SIZE(expected_directional_0)}, + {&directional, TRUE, 0.0f, expected_directional_local_0, ARRAY_SIZE(expected_directional_local_0)}, + {&point, FALSE, 0.0f, expected_point_0, ARRAY_SIZE(expected_point_0)}, + {&point, TRUE, 0.0f, expected_point_0, ARRAY_SIZE(expected_point_0)}, + {&spot, FALSE, 0.0f, expected_spot_0, ARRAY_SIZE(expected_spot_0)}, + {&spot, TRUE, 0.0f, expected_spot_0, ARRAY_SIZE(expected_spot_0)}, + {&point_range, FALSE, 0.0f, expected_point_range_0, ARRAY_SIZE(expected_point_range_0)}, }; IDirect3DDevice7 *device; IDirectDrawSurface7 *rt;

1 0

Paul Gofman : d3d8/tests: Test specular lighting with zero shininess.
by Alexandre Julliard March 29, 2019

March 29, 2019

Module: wine Branch: master Commit: aaf3ea3d9f5bf363619703a3ee4836e64b84bb49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aaf3ea3d9f5bf363619703a3… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Mar 29 13:56:38 2019 +0300 d3d8/tests: Test specular lighting with zero shininess. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 67 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 377f8e0..474dc69 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -720,6 +720,66 @@ static void test_specular_lighting(void) {160, 360, 0x00000000}, {320, 360, 0x00000000}, {480, 360, 0x00000000}, + }, + expected_directional_0[] = + { + {160, 120, 0x00ffffff}, + {320, 120, 0x00ffffff}, + {480, 120, 0x00ffffff}, + {160, 240, 0x00ffffff}, + {320, 240, 0x00ffffff}, + {480, 240, 0x00ffffff}, + {160, 360, 0x00ffffff}, + {320, 360, 0x00ffffff}, + {480, 360, 0x00ffffff}, + }, + expected_directional_local_0[] = + { + {160, 120, 0x00ffffff}, + {320, 120, 0x00ffffff}, + {480, 120, 0x00ffffff}, + {160, 240, 0x00ffffff}, + {320, 240, 0x00ffffff}, + {480, 240, 0x00ffffff}, + {160, 360, 0x00ffffff}, + {320, 360, 0x00ffffff}, + {480, 360, 0x00ffffff}, + }, + expected_point_0[] = + { + {160, 120, 0x00aaaaaa}, + {320, 120, 0x00cccccc}, + {480, 120, 0x00aaaaaa}, + {160, 240, 0x00cccccc}, + {320, 240, 0x00ffffff}, + {480, 240, 0x00cccccc}, + {160, 360, 0x00aaaaaa}, + {320, 360, 0x00cccccc}, + {480, 360, 0x00aaaaaa}, + }, + expected_spot_0[] = + { + {160, 120, 0x00000000}, + {320, 120, 0x002e2e2e}, + {480, 120, 0x00000000}, + {160, 240, 0x002e2e2e}, + {320, 240, 0x00ffffff}, + {480, 240, 0x002e2e2e}, + {160, 360, 0x00000000}, + {320, 360, 0x002e2e2e}, + {480, 360, 0x00000000}, + }, + expected_point_range_0[] = + { + {160, 120, 0x00000000}, + {320, 120, 0x00cccccc}, + {480, 120, 0x00000000}, + {160, 240, 0x00cccccc}, + {320, 240, 0x00ffffff}, + {480, 240, 0x00cccccc}, + {160, 360, 0x00000000}, + {320, 360, 0x00cccccc}, + {480, 360, 0x00000000}, }; static const struct { @@ -739,6 +799,13 @@ static void test_specular_lighting(void) {&spot, TRUE, 30.0f, expected_spot_local, ARRAY_SIZE(expected_spot_local)}, {&point_range, FALSE, 30.0f, expected_point_range, ARRAY_SIZE(expected_point_range)}, {&point_side, TRUE, 0.0f, expected_point_side, ARRAY_SIZE(expected_point_side)}, + {&directional, FALSE, 0.0f, expected_directional_0, ARRAY_SIZE(expected_directional_0)}, + {&directional, TRUE, 0.0f, expected_directional_local_0, ARRAY_SIZE(expected_directional_local_0)}, + {&point, FALSE, 0.0f, expected_point_0, ARRAY_SIZE(expected_point_0)}, + {&point, TRUE, 0.0f, expected_point_0, ARRAY_SIZE(expected_point_0)}, + {&spot, FALSE, 0.0f, expected_spot_0, ARRAY_SIZE(expected_spot_0)}, + {&spot, TRUE, 0.0f, expected_spot_0, ARRAY_SIZE(expected_spot_0)}, + {&point_range, FALSE, 0.0f, expected_point_range_0, ARRAY_SIZE(expected_point_range_0)}, }; IDirect3DDevice8 *device; D3DMATERIAL8 material;

1 0