diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2023-01-23 14:46:57 -0800 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2023-01-28 20:42:13 -0800 |
| commit | d3a95f0f713ff3a0216f0dfa634798a1db55ef27 (patch) | |
| tree | 1fbc156827f0a476bdda521247cc5089ec46d145 /src/gallium/drivers/i915 | |
| parent | 17b610771dd158cd8a6b737b0de5f72162c57312 (diff) | |
gallium/draw: Enable aapoint NIR helpers to generate bool1, bool32, or float32 Booleans
Fixes arb_point_parameters-point-attenuation on G33. The crash in
point-line-no-cull is fixed, but the test still fails.
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20869>
Diffstat (limited to 'src/gallium/drivers/i915')
| -rw-r--r-- | src/gallium/drivers/i915/ci/i915-g33-fails.txt | 7 | ||||
| -rw-r--r-- | src/gallium/drivers/i915/i915_context.c | 2 |
2 files changed, 3 insertions, 6 deletions
diff --git a/src/gallium/drivers/i915/ci/i915-g33-fails.txt b/src/gallium/drivers/i915/ci/i915-g33-fails.txt index caa0ea55084..e450f4d3782 100644 --- a/src/gallium/drivers/i915/ci/i915-g33-fails.txt +++ b/src/gallium/drivers/i915/ci/i915-g33-fails.txt @@ -203,8 +203,8 @@ spec@!opengl 1.1@linestipple@Factor 3x,Fail spec@!opengl 1.1@linestipple@Line loop,Fail spec@!opengl 1.1@linestipple@Line strip,Fail -# "../src/compiler/nir/nir_lower_int_to_float.c:102: lower_alu_instr: Assertion `nir_alu_type_get_base_type(info->output_type) != nir_type_int && nir_alu_type_get_base_type(info->output_type) != nir_type_uint' failed." -spec@!opengl 1.1@point-line-no-cull,Crash +# Test no longer crashes on an assertion in NIR, but it still fails. +spec@!opengl 1.1@point-line-no-cull,Fail spec@!opengl 1.1@polygon-mode-offset,Fail spec@!opengl 1.1@polygon-mode-offset@config 3: Expected white pixel on bottom edge,Fail @@ -403,9 +403,6 @@ spec@arb_pixel_buffer_object@cubemap npot pbo,Fail spec@arb_pixel_buffer_object@fbo-pbo-readpixels-small,Fail spec@arb_pixel_buffer_object@pbo-getteximage,Fail -# nir_lower_aapoint_impl() uses b32csel instead of fcsel. -spec@arb_point_parameters@arb_point_parameters-point-attenuation,Crash - spec@arb_point_parameters@arb_point_parameters-point-attenuation@Aliased combinations,Fail spec@arb_provoking_vertex@arb-provoking-vertex-render,Fail spec@arb_sampler_objects@gl_ext_texture_srgb_decode,Fail diff --git a/src/gallium/drivers/i915/i915_context.c b/src/gallium/drivers/i915/i915_context.c index e283a42f279..dfaa111e725 100644 --- a/src/gallium/drivers/i915/i915_context.c +++ b/src/gallium/drivers/i915/i915_context.c @@ -237,7 +237,7 @@ i915_create_context(struct pipe_screen *screen, void *priv, unsigned flags) i915->no_log_program_errors = false; draw_install_aaline_stage(i915->draw, &i915->base); - draw_install_aapoint_stage(i915->draw, &i915->base); + draw_install_aapoint_stage(i915->draw, &i915->base, nir_type_float32); draw_enable_point_sprites(i915->draw, true); i915->dirty = ~0; |