fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-03 00:00:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

d3d12: Only force point sampling for emulated shadow samplers

Browse source 
Reviewed-by: Bill Kristiansen <billkris@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14981>
This commit is contained in:
Jesse Natalie 2022-02-10 12:58:18 -08:00 • committed by Marge Bot
parent e2a5e2d5a0
commit 9dba60f397
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gallium/drivers/d3d12/ci/d3d12-quick_gl.txt
View file

@ -200,6 +200,7 @@ spec/!opengl 2.0/max-samplers: fail
spec/!opengl 2.0/max-samplers border: fail
spec/!opengl 3.0/bound-resource-limits: fail
spec/!opengl 3.0/required-sized-texture-formats: fail
spec/!opengl 3.0/sampler-cube-shadow: fail
spec/!opengl 3.1/default-vao: fail
spec/!opengl 3.1/draw-buffers-errors: skip
spec/!opengl 3.1/genned-names: fail
@ -1679,6 +1680,7 @@ spec/arb_texture_cube_map/copyteximage cube samples=4: skip
spec/arb_texture_cube_map/copyteximage cube samples=6: skip
spec/arb_texture_cube_map/copyteximage cube samples=8: skip
spec/arb_texture_cube_map_array/arb_texture_cube_map_array-cubemap: fail
spec/arb_texture_cube_map_array/arb_texture_cube_map_array-sampler-cube-array-shadow: fail
spec/arb_texture_float/multisample-formats 32 gl_arb_texture_float: skip
spec/arb_texture_gather/texturegather/fs-r-none-float-2d: fail
spec/arb_texture_gather/texturegather/fs-r-none-float-2darray: fail
@ -3525,8 +3527,8 @@ wgl/wgl-sanity: skip
summary:
name: results
---- --------
pass: 17841
fail: 2046
pass: 17839
fail: 2048
crash: 7
skip: 1452
timeout: 0

7
src/gallium/drivers/d3d12/d3d12_context.cpp
View file

@ -653,14 +653,13 @@ d3d12_create_sampler_state(struct pipe_context *pctx,
if (state->compare_mode == PIPE_TEX_COMPARE_R_TO_TEXTURE) {
desc.ComparisonFunc = compare_op((pipe_compare_func) state->compare_func);
desc.Filter = D3D12_FILTER_COMPARISON_MIN_MAG_MIP_POINT;
} else if (state->compare_mode == PIPE_TEX_COMPARE_NONE) {
desc.ComparisonFunc = D3D12_COMPARISON_FUNC_ALWAYS;
desc.Filter = get_filter(state);
} else
unreachable("unexpected comparison mode");
desc.MaxAnisotropy = state->max_anisotropy;
desc.Filter = get_filter(state);
desc.AddressU = sampler_address_mode((pipe_tex_wrap) state->wrap_s,
(pipe_tex_filter) state->min_img_filter);
@ -677,9 +676,7 @@ d3d12_create_sampler_state(struct pipe_context *pctx,
if (state->compare_mode == PIPE_TEX_COMPARE_R_TO_TEXTURE) {
desc.ComparisonFunc = D3D12_COMPARISON_FUNC_ALWAYS;
struct pipe_sampler_state fake_state = *state;
fake_state.compare_mode = PIPE_TEX_COMPARE_NONE;
desc.Filter = get_filter(&fake_state);
desc.Filter = D3D12_FILTER_COMPARISON_MIN_MAG_MIP_POINT;
d3d12_descriptor_pool_alloc_handle(ctx->sampler_pool,
&ss->handle_without_shadow);