December 2017 - Wine-commits

Matteo Bruni : d3d9: Stop calling wined3d_texture_generate_mipmaps().
by Alexandre Julliard 05 Dec '17

05 Dec '17

Module: wine Branch: master Commit: dfba903bb231f7357597c059b8709be74325ae09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dfba903bb231f7357597c059b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Dec 4 18:07:30 2017 +0100 d3d9: Stop calling wined3d_texture_generate_mipmaps(). 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/d3d9/texture.c | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 5080eb3..96c8bc3 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -273,13 +273,7 @@ static D3DTEXTUREFILTERTYPE WINAPI d3d9_texture_2d_GetAutoGenFilterType(IDirect3 static void WINAPI d3d9_texture_2d_GenerateMipSubLevels(IDirect3DTexture9 *iface) { - struct d3d9_texture *texture = impl_from_IDirect3DTexture9(iface); - TRACE("iface %p.\n", iface); - - wined3d_mutex_lock(); - wined3d_texture_generate_mipmaps(texture->wined3d_texture); - wined3d_mutex_unlock(); } static HRESULT WINAPI d3d9_texture_2d_GetLevelDesc(IDirect3DTexture9 *iface, UINT level, D3DSURFACE_DESC *desc) @@ -658,13 +652,7 @@ static D3DTEXTUREFILTERTYPE WINAPI d3d9_texture_cube_GetAutoGenFilterType(IDirec static void WINAPI d3d9_texture_cube_GenerateMipSubLevels(IDirect3DCubeTexture9 *iface) { - struct d3d9_texture *texture = impl_from_IDirect3DCubeTexture9(iface); - TRACE("iface %p.\n", iface); - - wined3d_mutex_lock(); - wined3d_texture_generate_mipmaps(texture->wined3d_texture); - wined3d_mutex_unlock(); } static HRESULT WINAPI d3d9_texture_cube_GetLevelDesc(IDirect3DCubeTexture9 *iface, UINT level, D3DSURFACE_DESC *desc) @@ -1055,13 +1043,7 @@ static D3DTEXTUREFILTERTYPE WINAPI d3d9_texture_3d_GetAutoGenFilterType(IDirect3 static void WINAPI d3d9_texture_3d_GenerateMipSubLevels(IDirect3DVolumeTexture9 *iface) { - struct d3d9_texture *texture = impl_from_IDirect3DVolumeTexture9(iface); - TRACE("iface %p.\n", iface); - - wined3d_mutex_lock(); - wined3d_texture_generate_mipmaps(texture->wined3d_texture); - wined3d_mutex_unlock(); } static HRESULT WINAPI d3d9_texture_3d_GetLevelDesc(IDirect3DVolumeTexture9 *iface, UINT level, D3DVOLUME_DESC *desc)

1 0

Matteo Bruni : wined3d: Implement manual mipmap generation.
by Alexandre Julliard 05 Dec '17

05 Dec '17

Module: wine Branch: master Commit: 0daea6d2a08b76ff3548d8e16c44cf629d8afa9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0daea6d2a08b76ff3548d8e16… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Dec 4 18:07:31 2017 +0100 wined3d: Implement manual mipmap generation. 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/cs.c | 30 ++++++++++++ dlls/wined3d/texture.c | 11 ----- dlls/wined3d/view.c | 102 +++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/wined3d.spec | 2 +- dlls/wined3d/wined3d_private.h | 2 + include/wine/wined3d.h | 2 +- 6 files changed, 136 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0daea6d2a08b76ff3548d…

1 0

Matteo Bruni : d3d11: Implement GenerateMips().
by Alexandre Julliard 05 Dec '17

05 Dec '17

Module: wine Branch: master Commit: bb3b55ce22f96d443c2053f6b1eb24e087ca1377 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bb3b55ce22f96d443c2053f6b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Dec 4 18:36:46 2017 +0100 d3d11: Implement GenerateMips(). 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/d3d11/device.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 7a8f3df..5281792 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1135,7 +1135,13 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_ClearDepthStencilView(ID3D static void STDMETHODCALLTYPE d3d11_immediate_context_GenerateMips(ID3D11DeviceContext *iface, ID3D11ShaderResourceView *view) { - FIXME("iface %p, view %p stub!\n", iface, view); + struct d3d_shader_resource_view *srv = unsafe_impl_from_ID3D11ShaderResourceView(view); + + TRACE("iface %p, view %p.\n", iface, view); + + wined3d_mutex_lock(); + wined3d_shader_resource_view_generate_mipmaps(srv->wined3d_view); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_SetResourceMinLOD(ID3D11DeviceContext *iface, @@ -4193,9 +4199,15 @@ static void STDMETHODCALLTYPE d3d10_device_ClearDepthStencilView(ID3D10Device1 * } static void STDMETHODCALLTYPE d3d10_device_GenerateMips(ID3D10Device1 *iface, - ID3D10ShaderResourceView *shader_resource_view) + ID3D10ShaderResourceView *view) { - FIXME("iface %p, shader_resource_view %p stub!\n", iface, shader_resource_view); + struct d3d_shader_resource_view *srv = unsafe_impl_from_ID3D10ShaderResourceView(view); + + TRACE("iface %p, view %p.\n", iface, view); + + wined3d_mutex_lock(); + wined3d_shader_resource_view_generate_mipmaps(srv->wined3d_view); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d10_device_ResolveSubresource(ID3D10Device1 *iface,

1 0

Józef Kucia : wined3d: Implement SV_ClipDistance.
by Alexandre Julliard 05 Dec '17

05 Dec '17

Module: wine Branch: master Commit: 431aa3274ca322e143c3dbc856ae1ac894f5d15e URL: http://source.winehq.org/git/wine.git/?a=commit;h=431aa3274ca322e143c3dbc85… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 5 00:26:29 2017 +0100 wined3d: Implement SV_ClipDistance. In D3D10+ all clip distances declared in a shader are always enabled. In other words, enablement of clip distances is a property of a shader. 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 | 63 ++++++++++++++++++++++++++++++++++-------- dlls/wined3d/shader.c | 36 +++++++++++++++++++++++- dlls/wined3d/wined3d_private.h | 43 ++++++++++++++-------------- 3 files changed, 109 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=431aa3274ca322e143c3d…

1 0

Józef Kucia : d3d11/tests: Add test for SV_ClipDistance.
by Alexandre Julliard 05 Dec '17

05 Dec '17

Module: wine Branch: master Commit: 75c703b47c129344988ec043413c678f2367bfa4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=75c703b47c129344988ec0434… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 5 00:26:30 2017 +0100 d3d11/tests: Add test for SV_ClipDistance. 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 | 584 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 574 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=75c703b47c129344988ec…

1 0

Józef Kucia : wined3d: Implement SV_CullDistance.
by Alexandre Julliard 05 Dec '17

05 Dec '17

Module: wine Branch: master Commit: 429e0c913087bdc2c183f74f346a9438278ec960 URL: http://source.winehq.org/git/wine.git/?a=commit;h=429e0c913087bdc2c183f74f3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 5 00:26:31 2017 +0100 wined3d: Implement SV_CullDistance. 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/directx.c | 2 ++ dlls/wined3d/glsl_shader.c | 13 +++++++++++-- dlls/wined3d/shader.c | 6 ++++++ dlls/wined3d/wined3d_gl.h | 1 + dlls/wined3d/wined3d_private.h | 3 ++- 5 files changed, 22 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index e0bf986..5058740 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -119,6 +119,7 @@ static const struct wined3d_extension_map gl_extension_map[] = {"GL_ARB_conservative_depth", ARB_CONSERVATIVE_DEPTH }, {"GL_ARB_copy_buffer", ARB_COPY_BUFFER }, {"GL_ARB_copy_image", ARB_COPY_IMAGE }, + {"GL_ARB_cull_distance", ARB_CULL_DISTANCE }, {"GL_ARB_debug_output", ARB_DEBUG_OUTPUT }, {"GL_ARB_depth_buffer_float", ARB_DEPTH_BUFFER_FLOAT }, {"GL_ARB_depth_texture", ARB_DEPTH_TEXTURE }, @@ -3916,6 +3917,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, {ARB_CLEAR_TEXTURE, MAKEDWORD_VERSION(4, 4)}, {ARB_CLIP_CONTROL, MAKEDWORD_VERSION(4, 5)}, + {ARB_CULL_DISTANCE, MAKEDWORD_VERSION(4, 5)}, {ARB_DERIVATIVE_CONTROL, MAKEDWORD_VERSION(4, 5)}, {ARB_PIPELINE_STATISTICS_QUERY, MAKEDWORD_VERSION(4, 6)}, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index b89b7aa..976c7cd 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -6930,8 +6930,10 @@ static void shader_glsl_generate_clip_or_cull_distances(struct wined3d_string_bu const struct wined3d_shader_signature_element *element, DWORD clip_or_cull_distance_mask) { unsigned int i, clip_or_cull_index; + const char *name; char reg_mask[6]; + name = element->sysval_semantic == WINED3D_SV_CLIP_DISTANCE ? "Clip" : "Cull"; /* Assign consecutive indices starting from 0. */ clip_or_cull_index = element->semantic_idx ? wined3d_popcount(clip_or_cull_distance_mask & 0xf) : 0; for (i = 0; i < 4; ++i) @@ -6940,8 +6942,8 @@ static void shader_glsl_generate_clip_or_cull_distances(struct wined3d_string_bu continue; shader_glsl_write_mask_to_str(WINED3DSP_WRITEMASK_0 << i, reg_mask); - shader_addline(buffer, "gl_ClipDistance[%u] = outputs[%u]%s;\n", - clip_or_cull_index, element->register_idx, reg_mask); + shader_addline(buffer, "gl_%sDistance[%u] = outputs[%u]%s;\n", + name, clip_or_cull_index, element->register_idx, reg_mask); ++clip_or_cull_index; } } @@ -6993,6 +6995,10 @@ static void shader_glsl_setup_sm3_rasterizer_input(struct shader_glsl_priv *priv { shader_glsl_generate_clip_or_cull_distances(buffer, output, reg_maps_out->clip_distance_mask); } + else if (output->sysval_semantic == WINED3D_SV_CULL_DISTANCE) + { + shader_glsl_generate_clip_or_cull_distances(buffer, output, reg_maps_out->cull_distance_mask); + } else if (output->sysval_semantic) { FIXME("Unhandled sysval semantic %#x.\n", output->sysval_semantic); @@ -7393,6 +7399,8 @@ static void shader_glsl_generate_alpha_test(struct wined3d_string_buffer *buffer static void shader_glsl_enable_extensions(struct wined3d_string_buffer *buffer, const struct wined3d_gl_info *gl_info) { + if (gl_info->supported[ARB_CULL_DISTANCE]) + shader_addline(buffer, "#extension GL_ARB_cull_distance : enable\n"); if (gl_info->supported[ARB_GPU_SHADER5]) shader_addline(buffer, "#extension GL_ARB_gpu_shader5 : enable\n"); if (gl_info->supported[ARB_SHADER_ATOMIC_COUNTERS]) @@ -10875,6 +10883,7 @@ static unsigned int shader_glsl_get_shader_model(const struct wined3d_gl_info *g if (shader_model_4 && gl_info->supported[ARB_COMPUTE_SHADER] + && gl_info->supported[ARB_CULL_DISTANCE] && gl_info->supported[ARB_DERIVATIVE_CONTROL] && gl_info->supported[ARB_DRAW_INDIRECT] && gl_info->supported[ARB_GPU_SHADER5] diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 7d59f8b..d976573 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -1789,6 +1789,12 @@ static HRESULT shader_get_registers_used(struct wined3d_shader *shader, const st return hr; reg_maps->clip_distance_mask |= mask; } + else if (e->sysval_semantic == WINED3D_SV_CULL_DISTANCE) + { + if (FAILED(hr = shader_calculate_clip_or_cull_distance_mask(e, &mask))) + return hr; + reg_maps->cull_distance_mask |= mask; + } } } else if (reg_maps->output_registers) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 455f415..0894c94 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -52,6 +52,7 @@ enum wined3d_gl_extension ARB_CONSERVATIVE_DEPTH, ARB_COPY_BUFFER, ARB_COPY_IMAGE, + ARB_CULL_DISTANCE, ARB_DEBUG_OUTPUT, ARB_DEPTH_BUFFER_FLOAT, ARB_DEPTH_TEXTURE, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 363118c..0e72aac 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1010,6 +1010,7 @@ struct wined3d_shader_reg_maps DWORD uav_counter_mask : 8; /* MAX_UNORDERED_ACCESS_VIEWS, 8 */ DWORD clip_distance_mask : 8; /* MAX_CLIP_DISTANCES, 8 */ + DWORD cull_distance_mask : 8; /* MAX_CLIP_DISTANCES, 8 */ DWORD usesnrm : 1; DWORD vpos : 1; DWORD usesdsx : 1; @@ -1025,7 +1026,7 @@ struct wined3d_shader_reg_maps DWORD usespow : 1; DWORD point_size : 1; DWORD vocp : 1; - DWORD padding : 25; + DWORD padding : 17; DWORD rt_mask; /* Used render targets, 32 max. */

1 0

Józef Kucia : d3d11/tests: Add test for combined clip and cull distances.
by Alexandre Julliard 05 Dec '17

05 Dec '17

Module: wine Branch: master Commit: 6eaebedc51c86d924e11c8b9e568996a10b53e72 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6eaebedc51c86d924e11c8b9e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 5 00:26:32 2017 +0100 d3d11/tests: Add test for combined clip and cull distances. 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 | 209 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 209 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6eaebedc51c86d924e11c…

1 0

Józef Kucia : wined3d: Correctly transform FFP clip planes.
by Alexandre Julliard 05 Dec '17

05 Dec '17

Module: wine Branch: master Commit: 266f1054b54e74093eb1f39196c9ebd7e3aea289 URL: http://source.winehq.org/git/wine.git/?a=commit;h=266f1054b54e74093eb1f3919… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 5 00:26:33 2017 +0100 wined3d: Correctly transform FFP clip planes. A plane isn't transformed as simply as a vector. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> 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 | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 976c7cd..18822c5 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1308,7 +1308,7 @@ static void swap_rows(float **a, float **b) *b = tmp; } -static BOOL invert_matrix(struct wined3d_matrix *out, struct wined3d_matrix *m) +static BOOL invert_matrix(struct wined3d_matrix *out, const struct wined3d_matrix *m) { float wtmp[4][8]; float m0, m1, m2, m3, s; @@ -1512,6 +1512,18 @@ static BOOL invert_matrix(struct wined3d_matrix *out, struct wined3d_matrix *m) return TRUE; } +static void transpose_matrix(struct wined3d_matrix *out, const struct wined3d_matrix *m) +{ + struct wined3d_matrix temp; + unsigned int i, j; + + for (i = 0; i < 4; ++i) + for (j = 0; j < 4; ++j) + (&temp._11)[4 * j + i] = (&m->_11)[4 * i + j]; + + *out = temp; +} + static void shader_glsl_ffp_vertex_normalmatrix_uniform(const struct wined3d_context *context, const struct wined3d_state *state, struct glsl_shader_prog_link *prog) { @@ -1709,13 +1721,18 @@ static void shader_glsl_clip_plane_uniform(const struct wined3d_context *context const struct wined3d_state *state, unsigned int index, struct glsl_shader_prog_link *prog) { const struct wined3d_gl_info *gl_info = context->gl_info; + struct wined3d_matrix matrix; struct wined3d_vec4 plane; + plane = state->clip_planes[index]; + /* Clip planes are affected by the view transform in d3d for FFP draws. */ if (!use_vs(state)) - multiply_vector_matrix(&plane, &state->clip_planes[index], &state->transforms[WINED3D_TS_VIEW]); - else - plane = state->clip_planes[index]; + { + invert_matrix(&matrix, &state->transforms[WINED3D_TS_VIEW]); + transpose_matrix(&matrix, &matrix); + multiply_vector_matrix(&plane, &plane, &matrix); + } GL_EXTCALL(glUniform4fv(prog->vs.clip_planes_location + index, 1, &plane.x)); }

1 0

Józef Kucia : ddraw: Store all 32 user clip planes.
by Alexandre Julliard 05 Dec '17

05 Dec '17

Module: wine Branch: master Commit: a7186d79d9b6d4c75ec3d5ead90613fe4dd79dcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7186d79d9b6d4c75ec3d5ead… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 5 00:26:34 2017 +0100 ddraw: Store all 32 user clip planes. 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/ddraw/ddraw_private.h | 4 ++++ dlls/ddraw/device.c | 22 ++++++++++++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index 0ae4532..0b6666a 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -38,6 +38,8 @@ #include "wine/list.h" #include "wine/wined3d.h" +#define ARRAY_SIZE(array) (sizeof(array) / sizeof((array)[0])) + extern const struct wined3d_parent_ops ddraw_null_wined3d_parent_ops DECLSPEC_HIDDEN; extern DWORD force_refresh_rate DECLSPEC_HIDDEN; @@ -341,6 +343,8 @@ struct d3d_device /* Handle management */ struct ddraw_handle_table handle_table; D3DMATRIXHANDLE world, proj, view; + + struct wined3d_vec4 user_clip_planes[D3DMAXUSERCLIPPLANES]; }; HRESULT d3d_device_create(struct ddraw *ddraw, struct ddraw_surface *target, IUnknown *rt_iface, diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 7d92df5..32a2f1a 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -6457,6 +6457,7 @@ static HRESULT WINAPI d3d_device7_GetLightEnable_FPUPreserve(IDirect3DDevice7 *i static HRESULT d3d_device7_SetClipPlane(IDirect3DDevice7 *iface, DWORD idx, D3DVALUE *plane) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); + const struct wined3d_vec4 *wined3d_plane; HRESULT hr; TRACE("iface %p, idx %u, plane %p.\n", iface, idx, plane); @@ -6464,8 +6465,16 @@ static HRESULT d3d_device7_SetClipPlane(IDirect3DDevice7 *iface, DWORD idx, D3DV if (!plane) return DDERR_INVALIDPARAMS; + wined3d_plane = (struct wined3d_vec4 *)plane; + wined3d_mutex_lock(); - hr = wined3d_device_set_clip_plane(device->wined3d_device, idx, (struct wined3d_vec4 *)plane); + hr = wined3d_device_set_clip_plane(device->wined3d_device, idx, wined3d_plane); + if (hr == WINED3DERR_INVALIDCALL && idx < ARRAY_SIZE(device->user_clip_planes)) + { + WARN("Clip plane %u is not supported.\n", idx); + device->user_clip_planes[idx] = *wined3d_plane; + hr = D3D_OK; + } wined3d_mutex_unlock(); return hr; @@ -6505,6 +6514,7 @@ static HRESULT WINAPI d3d_device7_SetClipPlane_FPUPreserve(IDirect3DDevice7 *ifa static HRESULT d3d_device7_GetClipPlane(IDirect3DDevice7 *iface, DWORD idx, D3DVALUE *plane) { struct d3d_device *device = impl_from_IDirect3DDevice7(iface); + struct wined3d_vec4 *wined3d_plane; HRESULT hr; TRACE("iface %p, idx %u, plane %p.\n", iface, idx, plane); @@ -6512,8 +6522,16 @@ static HRESULT d3d_device7_GetClipPlane(IDirect3DDevice7 *iface, DWORD idx, D3DV if (!plane) return DDERR_INVALIDPARAMS; + wined3d_plane = (struct wined3d_vec4 *)plane; + wined3d_mutex_lock(); - hr = wined3d_device_get_clip_plane(device->wined3d_device, idx, (struct wined3d_vec4 *)plane); + hr = wined3d_device_get_clip_plane(device->wined3d_device, idx, wined3d_plane); + if (hr == WINED3DERR_INVALIDCALL && idx < ARRAY_SIZE(device->user_clip_planes)) + { + WARN("Clip plane %u is not supported.\n", idx); + *wined3d_plane = device->user_clip_planes[idx]; + hr = D3D_OK; + } wined3d_mutex_unlock(); return hr;

1 0

Józef Kucia : wined3d: Store only supported user clip planes.
by Alexandre Julliard 05 Dec '17

05 Dec '17

Module: wine Branch: master Commit: 7225e601086f0cb9e33d10acf400253abe354763 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7225e601086f0cb9e33d10acf… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Dec 5 00:26:35 2017 +0100 wined3d: Store only supported user clip planes. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 10 ++-------- dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/wined3d_private.h | 4 +--- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7340488..d57758d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1757,7 +1757,7 @@ HRESULT CDECL wined3d_device_set_clip_plane(struct wined3d_device *device, { TRACE("device %p, plane_idx %u, plane %p.\n", device, plane_idx, plane); - if (plane_idx >= WINED3D_MAX_USER_CLIP_PLANES) + if (plane_idx >= device->adapter->gl_info.limits.user_clip_distances) { TRACE("Application has requested clipplane this device doesn't support.\n"); return WINED3DERR_INVALIDCALL; @@ -1774,12 +1774,6 @@ HRESULT CDECL wined3d_device_set_clip_plane(struct wined3d_device *device, device->update_state->clip_planes[plane_idx] = *plane; - if (plane_idx >= device->adapter->gl_info.limits.user_clip_distances) - { - WARN("Clip plane %u is not supported.\n", plane_idx); - return WINED3D_OK; - } - if (!device->recording) wined3d_cs_emit_set_clip_plane(device->cs, plane_idx, plane); @@ -1791,7 +1785,7 @@ HRESULT CDECL wined3d_device_get_clip_plane(const struct wined3d_device *device, { TRACE("device %p, plane_idx %u, plane %p.\n", device, plane_idx, plane); - if (plane_idx >= WINED3D_MAX_USER_CLIP_PLANES) + if (plane_idx >= device->adapter->gl_info.limits.user_clip_distances) { TRACE("Application has requested clipplane this device doesn't support.\n"); return WINED3DERR_INVALIDCALL; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index f80b875..9d61360 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -218,7 +218,7 @@ static void stateblock_savedstates_set_all(struct wined3d_saved_states *states, stateblock_set_bits(states->renderState, WINEHIGHEST_RENDER_STATE + 1); for (i = 0; i < MAX_TEXTURES; ++i) states->textureState[i] = 0x3ffff; for (i = 0; i < MAX_COMBINED_SAMPLERS; ++i) states->samplerState[i] = 0x3ffe; - states->clipplane = 0xffffffff; + states->clipplane = (1u << MAX_CLIP_DISTANCES) - 1; states->pixelShaderConstantsB = 0xffff; states->pixelShaderConstantsI = 0xffff; states->vertexShaderConstantsB = 0xffff; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0e72aac..2321b41 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -259,8 +259,6 @@ static inline enum complex_fixup get_complex_fixup(struct color_fixup_desc fixup return complex_fixup; } -#define WINED3D_MAX_USER_CLIP_PLANES 32 - /* Device caps */ #define MAX_STREAMS 16 #define MAX_TEXTURES 8 @@ -2829,7 +2827,7 @@ struct wined3d_state DWORD texture_states[MAX_TEXTURES][WINED3D_HIGHEST_TEXTURE_STATE + 1]; struct wined3d_matrix transforms[HIGHEST_TRANSFORMSTATE + 1]; - struct wined3d_vec4 clip_planes[WINED3D_MAX_USER_CLIP_PLANES]; + struct wined3d_vec4 clip_planes[MAX_CLIP_DISTANCES]; struct wined3d_material material; struct wined3d_viewport viewport; RECT scissor_rect;

1 0