From 20e8760c75170f477cc1c13808e05b6576bb4d4d Mon Sep 17 00:00:00 2001 From: Konstantin Seurer Date: Thu, 21 Sep 2023 19:25:31 +0200 Subject: [PATCH] zink: Enable edge flags with points Fixes: 90a8525 ("zink: handle edgeflags") Reviewed-by: Antonino Maniscalco Acked-by: Mike Blumenkrantz Part-of: --- src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt | 8 -------- src/gallium/drivers/zink/ci/zink-lvp-fails.txt | 7 ------- src/gallium/drivers/zink/ci/zink-radv-navi10-fails.txt | 8 -------- src/gallium/drivers/zink/ci/zink-radv-polaris10-fails.txt | 8 -------- src/gallium/drivers/zink/ci/zink-radv-vangogh-fails.txt | 8 -------- src/gallium/drivers/zink/zink_program.c | 3 ++- 6 files changed, 2 insertions(+), 40 deletions(-) diff --git a/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt b/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt index b5a4bbc5b2a..64a8ad8932e 100644 --- a/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt +++ b/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt @@ -118,14 +118,6 @@ glx@glx-swap-pixmap-bad,Fail glx@glx-visuals-depth -pixmap,Crash glx@glx-visuals-stencil -pixmap,Crash -shaders@point-vertex-id divisor,Fail -shaders@point-vertex-id gl_instanceid divisor,Fail -shaders@point-vertex-id gl_instanceid,Fail -shaders@point-vertex-id gl_vertexid divisor,Fail -shaders@point-vertex-id gl_vertexid gl_instanceid divisor,Fail -shaders@point-vertex-id gl_vertexid gl_instanceid,Fail -shaders@point-vertex-id gl_vertexid,Fail - spec@!opengl 1.0@gl-1.0-no-op-paths,Fail spec@!opengl 1.0@gl-1.0-swapbuffers-behavior,Fail diff --git a/src/gallium/drivers/zink/ci/zink-lvp-fails.txt b/src/gallium/drivers/zink/ci/zink-lvp-fails.txt index e1c5510db05..63bbd2e574d 100644 --- a/src/gallium/drivers/zink/ci/zink-lvp-fails.txt +++ b/src/gallium/drivers/zink/ci/zink-lvp-fails.txt @@ -38,13 +38,6 @@ glx@glx_ext_import_context@imported context has same context id,Fail glx@glx_ext_import_context@make current- multi process,Fail glx@glx_ext_import_context@make current- single process,Fail glx@glx_ext_import_context@query context info,Fail -shaders@point-vertex-id divisor,Fail -shaders@point-vertex-id gl_instanceid,Fail -shaders@point-vertex-id gl_instanceid divisor,Fail -shaders@point-vertex-id gl_vertexid,Fail -shaders@point-vertex-id gl_vertexid divisor,Fail -shaders@point-vertex-id gl_vertexid gl_instanceid,Fail -shaders@point-vertex-id gl_vertexid gl_instanceid divisor,Fail spec@!opengl 1.0@gl-1.0-no-op-paths,Fail spec@!opengl 1.1@linestipple,Fail spec@!opengl 1.1@linestipple@Factor 2x,Fail diff --git a/src/gallium/drivers/zink/ci/zink-radv-navi10-fails.txt b/src/gallium/drivers/zink/ci/zink-radv-navi10-fails.txt index 504886369f7..ddb97c35aab 100644 --- a/src/gallium/drivers/zink/ci/zink-radv-navi10-fails.txt +++ b/src/gallium/drivers/zink/ci/zink-radv-navi10-fails.txt @@ -27,14 +27,6 @@ glx@glx-swap-pixmap-bad,Fail # #6322 spec@arb_framebuffer_object@fbo-blit-scaled-linear,Fail - -shaders@point-vertex-id divisor,Fail -shaders@point-vertex-id gl_instanceid divisor,Fail -shaders@point-vertex-id gl_instanceid,Fail -shaders@point-vertex-id gl_vertexid divisor,Fail -shaders@point-vertex-id gl_vertexid,Fail -shaders@point-vertex-id gl_vertexid gl_instanceid divisor,Fail -shaders@point-vertex-id gl_vertexid gl_instanceid,Fail spec@arb_arrays_of_arrays@execution@image_store@basic-imagestore-mixed-const-non-const-uniform-index2,Fail spec@arb_arrays_of_arrays@execution@image_store@basic-imagestore-mixed-const-non-const-uniform-index,Fail spec@arb_arrays_of_arrays@execution@image_store@basic-imagestore-non-const-uniform-index,Fail diff --git a/src/gallium/drivers/zink/ci/zink-radv-polaris10-fails.txt b/src/gallium/drivers/zink/ci/zink-radv-polaris10-fails.txt index f7132983356..4c32936c11f 100644 --- a/src/gallium/drivers/zink/ci/zink-radv-polaris10-fails.txt +++ b/src/gallium/drivers/zink/ci/zink-radv-polaris10-fails.txt @@ -27,14 +27,6 @@ glx@glx-swap-pixmap-bad,Fail # #6322 spec@arb_framebuffer_object@fbo-blit-scaled-linear,Fail - -shaders@point-vertex-id divisor,Fail -shaders@point-vertex-id gl_instanceid divisor,Fail -shaders@point-vertex-id gl_instanceid,Fail -shaders@point-vertex-id gl_vertexid divisor,Fail -shaders@point-vertex-id gl_vertexid,Fail -shaders@point-vertex-id gl_vertexid gl_instanceid divisor,Fail -shaders@point-vertex-id gl_vertexid gl_instanceid,Fail spec@arb_arrays_of_arrays@execution@image_store@basic-imagestore-mixed-const-non-const-uniform-index2,Fail spec@arb_arrays_of_arrays@execution@image_store@basic-imagestore-mixed-const-non-const-uniform-index,Fail spec@arb_arrays_of_arrays@execution@image_store@basic-imagestore-non-const-uniform-index,Fail diff --git a/src/gallium/drivers/zink/ci/zink-radv-vangogh-fails.txt b/src/gallium/drivers/zink/ci/zink-radv-vangogh-fails.txt index 00810a940f8..9f2b0642805 100644 --- a/src/gallium/drivers/zink/ci/zink-radv-vangogh-fails.txt +++ b/src/gallium/drivers/zink/ci/zink-radv-vangogh-fails.txt @@ -27,14 +27,6 @@ glx@glx-swap-pixmap-bad,Fail # #6322 spec@arb_framebuffer_object@fbo-blit-scaled-linear,Fail - -shaders@point-vertex-id divisor,Fail -shaders@point-vertex-id gl_instanceid divisor,Fail -shaders@point-vertex-id gl_instanceid,Fail -shaders@point-vertex-id gl_vertexid divisor,Fail -shaders@point-vertex-id gl_vertexid,Fail -shaders@point-vertex-id gl_vertexid gl_instanceid divisor,Fail -shaders@point-vertex-id gl_vertexid gl_instanceid,Fail spec@arb_arrays_of_arrays@execution@image_store@basic-imagestore-mixed-const-non-const-uniform-index2,Fail spec@arb_arrays_of_arrays@execution@image_store@basic-imagestore-mixed-const-non-const-uniform-index,Fail spec@arb_arrays_of_arrays@execution@image_store@basic-imagestore-non-const-uniform-index,Fail diff --git a/src/gallium/drivers/zink/zink_program.c b/src/gallium/drivers/zink/zink_program.c index 90aa5cbad85..9a26e4bffee 100644 --- a/src/gallium/drivers/zink/zink_program.c +++ b/src/gallium/drivers/zink/zink_program.c @@ -2317,7 +2317,8 @@ has_edge_flags(struct zink_context *ctx) default: break; } - return ctx->gfx_pipeline_state.rast_prim == MESA_PRIM_LINES && + return (ctx->gfx_pipeline_state.rast_prim == MESA_PRIM_LINES || + ctx->gfx_pipeline_state.rast_prim == MESA_PRIM_POINTS) && ctx->gfx_stages[MESA_SHADER_VERTEX]->has_edgeflags; } -- 2.34.1