mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-05-07 20:08:06 +02:00
radeonsi: fix RB+ and gfx11 issues with framebuffer state
This fixes most gfx11 test failures. Fixes:9fecac091f- radeonsi/gfx11: scattered register deltas Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23687> (cherry picked from commitd891bd7c3a)
This commit is contained in:
Marek Olšák
Eric Engestrom
parent
a2a63c5339
commit
cf19bd944d
3 changed files with 11 additions and 43 deletions
|
|
@ -751,7 +751,7 @@
|
|||
"description": "radeonsi: fix RB+ and gfx11 issues with framebuffer state",
|
||||
"nominated": true,
|
||||
"nomination_type": 1,
|
||||
"resolution": 0,
|
||||
"resolution": 1,
|
||||
"main_sha": null,
|
||||
"because_sha": "9fecac091f3159eb50a3e3dea2312218bb87d8c1"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -137,11 +137,8 @@ KHR-Single-GL46.enhanced_layouts.xfb_capture_inactive_output_component,Fail
|
|||
# gfx11-only failures
|
||||
|
||||
spec@!opengl 1.1@line-smooth-stipple,Fail
|
||||
spec@arb_framebuffer_no_attachments@arb_framebuffer_no_attachments-atomic,Fail
|
||||
spec@arb_framebuffer_no_attachments@arb_framebuffer_no_attachments-atomic@Per-sample,Fail
|
||||
spec@egl 1.4@egl-ext_egl_image_storage,Crash
|
||||
|
||||
KHR-GL46.gl_spirv.spirv_validation_builtin_variable_decorations_test,Fail
|
||||
KHR-GL46.packed_pixels.pbo_rectangle.r11f_g11f_b10f,Fail
|
||||
KHR-GL46.packed_pixels.pbo_rectangle.r16,Fail
|
||||
KHR-GL46.packed_pixels.pbo_rectangle.r16_snorm,Fail
|
||||
|
|
@ -182,7 +179,6 @@ KHR-GL46.packed_pixels.pbo_rectangle.rgba8,Fail
|
|||
KHR-GL46.packed_pixels.pbo_rectangle.rgba8_snorm,Fail
|
||||
KHR-GL46.packed_pixels.pbo_rectangle.srgb8,Fail
|
||||
KHR-GL46.packed_pixels.pbo_rectangle.srgb8_alpha8,Fail
|
||||
KHR-GL46.texture_view.view_sampling,Fail
|
||||
KHR-GL46.transform_feedback_overflow_query_ARB.advanced-single-stream-interleaved-attribs,Fail
|
||||
KHR-GL46.transform_feedback_overflow_query_ARB.advanced-single-stream-separate-attribs,Fail
|
||||
KHR-GL46.transform_feedback_overflow_query_ARB.multiple-streams-multiple-buffers-per-stream,Crash
|
||||
|
|
@ -215,48 +211,10 @@ dEQP-GLES3.functional.texture.specification.texsubimage3d_pbo.rgb5_a1_2d_array,F
|
|||
dEQP-GLES3.functional.texture.specification.texsubimage3d_pbo.rgb5_a1_3d,Fail
|
||||
dEQP-GLES3.functional.texture.specification.texsubimage3d_pbo.rgba4_2d_array,Fail
|
||||
dEQP-GLES3.functional.texture.specification.texsubimage3d_pbo.rgba4_3d,Fail
|
||||
dEQP-GLES31.functional.sample_shading.min_sample_shading.multisample_renderbuffer_samples_2_color,Fail
|
||||
dEQP-GLES31.functional.sample_shading.min_sample_shading.multisample_renderbuffer_samples_2_discard,Fail
|
||||
dEQP-GLES31.functional.sample_shading.min_sample_shading.multisample_renderbuffer_samples_4_color,Fail
|
||||
dEQP-GLES31.functional.sample_shading.min_sample_shading.multisample_renderbuffer_samples_4_discard,Fail
|
||||
dEQP-GLES31.functional.sample_shading.min_sample_shading.multisample_renderbuffer_samples_8_color,Fail
|
||||
dEQP-GLES31.functional.sample_shading.min_sample_shading.multisample_renderbuffer_samples_8_discard,Fail
|
||||
dEQP-GLES31.functional.sample_shading.min_sample_shading.multisample_texture_samples_2_color,Fail
|
||||
dEQP-GLES31.functional.sample_shading.min_sample_shading.multisample_texture_samples_2_discard,Fail
|
||||
dEQP-GLES31.functional.sample_shading.min_sample_shading.multisample_texture_samples_4_color,Fail
|
||||
dEQP-GLES31.functional.sample_shading.min_sample_shading.multisample_texture_samples_4_discard,Fail
|
||||
dEQP-GLES31.functional.sample_shading.min_sample_shading.multisample_texture_samples_8_color,Fail
|
||||
dEQP-GLES31.functional.sample_shading.min_sample_shading.multisample_texture_samples_8_discard,Fail
|
||||
dEQP-GLES31.functional.separate_shader.random.113,Fail
|
||||
dEQP-GLES31.functional.separate_shader.random.82,Fail
|
||||
dEQP-GLES31.functional.separate_shader.random.17,Fail
|
||||
dEQP-GLES31.functional.separate_shader.random.45,Fail
|
||||
dEQP-GLES31.functional.shaders.multisample_interpolation.sample_qualifier.multisample_rbo_1,Fail
|
||||
dEQP-GLES31.functional.shaders.multisample_interpolation.sample_qualifier.multisample_rbo_2,Fail
|
||||
dEQP-GLES31.functional.shaders.multisample_interpolation.sample_qualifier.multisample_rbo_4,Fail
|
||||
dEQP-GLES31.functional.shaders.multisample_interpolation.sample_qualifier.multisample_rbo_8,Fail
|
||||
dEQP-GLES31.functional.shaders.multisample_interpolation.sample_qualifier.multisample_texture_1,Fail
|
||||
dEQP-GLES31.functional.shaders.multisample_interpolation.sample_qualifier.multisample_texture_2,Fail
|
||||
dEQP-GLES31.functional.shaders.multisample_interpolation.sample_qualifier.multisample_texture_4,Fail
|
||||
dEQP-GLES31.functional.shaders.multisample_interpolation.sample_qualifier.multisample_texture_8,Fail
|
||||
dEQP-GLES31.functional.shaders.sample_variables.sample_id.multisample_rbo_1,Fail
|
||||
dEQP-GLES31.functional.shaders.sample_variables.sample_id.multisample_rbo_2,Fail
|
||||
dEQP-GLES31.functional.shaders.sample_variables.sample_id.multisample_rbo_4,Fail
|
||||
dEQP-GLES31.functional.shaders.sample_variables.sample_id.multisample_texture_2,Fail
|
||||
dEQP-GLES31.functional.shaders.sample_variables.sample_id.multisample_texture_4,Fail
|
||||
dEQP-GLES31.functional.shaders.sample_variables.sample_mask_in.bit_count_per_sample.multisample_rbo_4,Fail
|
||||
dEQP-GLES31.functional.shaders.sample_variables.sample_mask_in.bit_count_per_sample.multisample_rbo_8,Fail
|
||||
dEQP-GLES31.functional.shaders.sample_variables.sample_mask_in.bit_count_per_sample.multisample_texture_4,Fail
|
||||
dEQP-GLES31.functional.shaders.sample_variables.sample_mask_in.bit_count_per_sample.multisample_texture_8,Fail
|
||||
dEQP-GLES31.functional.shaders.sample_variables.sample_mask_in.bits_unique_per_sample.multisample_texture_1,Fail
|
||||
dEQP-GLES31.functional.shaders.sample_variables.sample_mask_in.bits_unique_per_sample.multisample_texture_2,Fail
|
||||
dEQP-GLES31.functional.shaders.sample_variables.sample_mask_in.bits_unique_per_sample.multisample_texture_8,Fail
|
||||
dEQP-GLES31.functional.shaders.sample_variables.sample_mask_in.bits_unique_per_two_samples.multisample_texture_4,Fail
|
||||
dEQP-GLES31.functional.shaders.sample_variables.sample_mask_in.bits_unique_per_two_samples.multisample_texture_8,Fail
|
||||
dEQP-GLES31.functional.shaders.sample_variables.sample_pos.distribution.multisample_texture_1,Fail
|
||||
dEQP-GLES31.functional.shaders.sample_variables.sample_pos.distribution.multisample_texture_2,Fail
|
||||
dEQP-GLES31.functional.shaders.sample_variables.sample_pos.distribution.multisample_texture_4,Fail
|
||||
dEQP-GLES31.functional.shaders.sample_variables.sample_pos.distribution.multisample_texture_8,Fail
|
||||
dEQP-GLES31.functional.texture.specification.teximage3d_pbo.rgb565_cube_array,Fail
|
||||
dEQP-GLES31.functional.texture.specification.teximage3d_pbo.rgb5_a1_cube_array,Fail
|
||||
dEQP-GLES31.functional.texture.specification.teximage3d_pbo.rgba4_cube_array,Fail
|
||||
|
|
|
|||
|
|
|
@ -476,8 +476,18 @@ void si_begin_new_gfx_cs(struct si_context *ctx, bool first_cs)
|
|||
ctx->framebuffer.dirty_zsbuf = true;
|
||||
}
|
||||
|
||||
/* RB+ depth-only rendering needs to set CB_COLOR0_INFO differently from CLEAR_STATE. */
|
||||
if (ctx->screen->info.rbplus_allowed)
|
||||
ctx->framebuffer.dirty_cbufs |= 0x1;
|
||||
|
||||
/* GFX11+ needs to set NUM_SAMPLES differently from CLEAR_STATE. */
|
||||
if (ctx->gfx_level >= GFX11)
|
||||
ctx->framebuffer.dirty_zsbuf = true;
|
||||
|
||||
/* Even with shadowed registers, we have to add buffers to the buffer list.
|
||||
* These atoms are the only ones that add buffers.
|
||||
*
|
||||
* The framebuffer state also needs to set PA_SC_WINDOW_SCISSOR_BR differently from CLEAR_STATE.
|
||||
*/
|
||||
si_mark_atom_dirty(ctx, &ctx->atoms.s.framebuffer);
|
||||
si_mark_atom_dirty(ctx, &ctx->atoms.s.render_cond);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue