Mesa (main): i915g: Allow fragment coord conventions TGSI properties to be set.

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 31ab2735dbc64c5d67b7db3ef75e9fd5969f4b2a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=31ab2735dbc64c5d67b7db3ef75e9fd5969f4b2a

Author: Emma Anholt <emma at anholt.net>
Date:   Mon Jun  7 15:09:33 2021 -0700

i915g: Allow fragment coord conventions TGSI properties to be set.

The frontend lowering handles normalizing the conventions to the only
model we support, we just need to ignore the property in the TGSI.

Reviewed-by: Adam Jackson <ajax at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11329>

---

 .../drivers/i915/ci/piglit-i915-g33-fails.txt      | 25 ----------------------
 src/gallium/drivers/i915/i915_fpc_translate.c      |  9 ++++----
 2 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/src/gallium/drivers/i915/ci/piglit-i915-g33-fails.txt b/src/gallium/drivers/i915/ci/piglit-i915-g33-fails.txt
index 3200ee36f5d..ac7b35c9e00 100644
--- a/src/gallium/drivers/i915/ci/piglit-i915-g33-fails.txt
+++ b/src/gallium/drivers/i915/ci/piglit-i915-g33-fails.txt
@@ -105,16 +105,6 @@ glx at glx_ext_import_context@make current- single process,Fail
 glx at glx_ext_import_context@query context info,Fail
 glx at glx_ext_no_config_context@no fbconfig,Fail
 glx at glx_mesa_query_renderer@coverage,Fail
-object namespace pollution at program with glbitmap,Crash
-object namespace pollution at program with glblitframebuffer,Crash
-object namespace pollution at program with glclear,Crash
-object namespace pollution at program with glcopypixels,Crash
-object namespace pollution at program with glcopytexsubimage2d,Crash
-object namespace pollution at program with gldrawpixels,Crash
-object namespace pollution at program with glgeneratemipmap,Crash
-object namespace pollution at program with glgetteximage,Crash
-object namespace pollution at program with glgetteximage-compressed,Crash
-object namespace pollution at program with gltexsubimage2d,Crash
 shaders at glsl-bug-110796,Fail
 shaders at glsl-cos,Fail
 shaders at glsl-derivs,Fail
@@ -568,8 +558,6 @@ spec at arb_color_buffer_float@gl_rgba32f-render-sanity,Crash
 spec at arb_color_buffer_float@gl_rgba32f-render-sanity-fog,Crash
 spec at arb_color_buffer_float@gl_rgba8-render,Crash
 spec at arb_color_buffer_float@gl_rgba8-render-fog,Crash
-spec at arb_color_buffer_float@gl_rgba8-render-sanity,Crash
-spec at arb_color_buffer_float@gl_rgba8-render-sanity-fog,Crash
 spec at arb_color_buffer_float@gl_rgba8_snorm-render,Crash
 spec at arb_color_buffer_float@gl_rgba8_snorm-render-fog,Crash
 spec at arb_color_buffer_float@gl_rgba8_snorm-render-sanity,Crash
@@ -611,17 +599,8 @@ spec at arb_depth_texture@texwrap formats bordercolor at GL_DEPTH_COMPONENT32- border
 spec at arb_es2_compatibility@arb_es2_compatibility-drawbuffers,Fail
 spec at arb_es2_compatibility@texwrap formats bordercolor,Fail
 spec at arb_es2_compatibility@texwrap formats bordercolor at GL_RGB565- border color only,Fail
-spec at arb_fragment_coord_conventions@fp-arb-fragment-coord-conventions-integer,Crash
-spec at arb_fragment_coord_conventions@fp-arb-fragment-coord-conventions-none,Crash
-spec at arb_fragment_program@fp-dst-aliasing-1,Crash
-spec at arb_fragment_program@fp-dst-aliasing-2,Crash
-spec at arb_fragment_program@fp-ex2-sat,Crash
-spec at arb_fragment_program@fp-fragment-position,Crash
 spec at arb_fragment_program@fp-indirections2,Fail
-spec at arb_fragment_program@fp-set-01,Crash
-spec at arb_fragment_program@kil-of-slt,Crash
 spec at arb_fragment_program@minmax,Fail
-spec at arb_fragment_program@trinity-fp1,Crash
 spec at arb_fragment_program_shadow@tex-shadow1d,Fail
 spec at arb_fragment_program_shadow@tex-shadow2d,Fail
 spec at arb_fragment_program_shadow@tex-shadow2drect,Fail
@@ -688,10 +667,6 @@ spec at arb_texture_rectangle@texwrap rect proj bordercolor,Fail
 spec at arb_texture_rectangle@texwrap rect proj bordercolor at GL_RGBA8- projected- border color only,Fail
 spec at arb_texture_storage@texture-storage,Fail
 spec at arb_texture_storage@texture-storage at 2D mipmap rendering ,Fail
-spec at ati_fragment_shader@ati_fragment_shader-error09-allconst,Crash
-spec at ati_fragment_shader@ati_fragment_shader-error10-dotx,Crash
-spec at ati_fragment_shader@ati_fragment_shader-render-constants,Crash
-spec at ati_fragment_shader@ati_fragment_shader-render-fog,Crash
 spec at ati_fragment_shader@ati_fragment_shader-render-ops,Fail
 spec at ati_fragment_shader@ati_fragment_shader-render-ops at mov 8*c0,Fail
 spec at egl 1.4 at eglterminate then unbind context,Fail
diff --git a/src/gallium/drivers/i915/i915_fpc_translate.c b/src/gallium/drivers/i915/i915_fpc_translate.c
index bc9696d9984..cbcaeeaf230 100644
--- a/src/gallium/drivers/i915/i915_fpc_translate.c
+++ b/src/gallium/drivers/i915/i915_fpc_translate.c
@@ -961,11 +961,12 @@ static void i915_translate_token(struct i915_fp_compile *p,
    struct i915_fragment_shader *ifs = p->shader;
    switch( token->Token.Type ) {
    case TGSI_TOKEN_TYPE_PROPERTY:
-      /*
-       * We only support one cbuf, but we still need to ignore the property
-       * correctly so we don't hit the assert at the end of the switch case.
-       */
+      /* Ignore properties where we only support one value. */
       assert(token->FullProperty.Property.PropertyName ==
+             TGSI_PROPERTY_FS_COORD_ORIGIN ||
+             token->FullProperty.Property.PropertyName ==
+             TGSI_PROPERTY_FS_COORD_PIXEL_CENTER ||
+             token->FullProperty.Property.PropertyName ==
              TGSI_PROPERTY_FS_COLOR0_WRITES_ALL_CBUFS);
       break;