radeonsi/nir: Don't lower constant arrays to uniforms

[mesa.git] / src / gallium / drivers / radeonsi / si_get.c

diff --git a/src/gallium/drivers/radeonsi/si_get.c b/src/gallium/drivers/radeonsi/si_get.c
index 6beca2e0744a9bd6dd1d5685aef6fb6d5446b1cb..09dfcebbbb745a920ef62f4d81a07d400a7856fe 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_get.c
+++ b/src/gallium/drivers/radeonsi/si_get.c
@@ -156,16 +156,19 @@ static int si_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
        case PIPE_CAP_FBFETCH:
        case PIPE_CAP_COMPUTE_GRID_INFO_LAST_BLOCK:
        case PIPE_CAP_IMAGE_LOAD_FORMATTED:
-       case PIPE_CAP_PREFER_COMPUTE_BLIT_FOR_MULTIMEDIA:
-        case PIPE_CAP_TGSI_DIV:
+       case PIPE_CAP_PREFER_COMPUTE_FOR_MULTIMEDIA:
+       case PIPE_CAP_TGSI_DIV:
                return 1;
 
        case PIPE_CAP_QUERY_SO_OVERFLOW:
-               return sscreen->info.chip_class <= GFX9;
+               return !sscreen->use_ngg_streamout;
 
        case PIPE_CAP_POST_DEPTH_COVERAGE:
                return sscreen->info.chip_class >= GFX10;
 
+       case PIPE_CAP_GRAPHICS:
+               return sscreen->info.has_graphics;
+
        case PIPE_CAP_RESOURCE_FROM_USER_MEMORY:
                return !SI_BIG_ENDIAN && sscreen->info.has_userptr;
 
@@ -211,10 +214,16 @@ static int si_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
                                RADEON_SPARSE_PAGE_SIZE : 0;
 
        case PIPE_CAP_PACKED_UNIFORMS:
+       case PIPE_CAP_SHADER_SAMPLES_IDENTICAL:
                if (sscreen->options.enable_nir)
                        return 1;
                return 0;
 
+       case PIPE_CAP_PREFER_IMM_ARRAYS_AS_CONSTBUF:
+               if (sscreen->options.enable_nir)
+                       return 0;
+               return 1;
+
        /* Unsupported features. */
        case PIPE_CAP_BUFFER_SAMPLER_VIEW_RGBA_ONLY:
        case PIPE_CAP_TGSI_FS_COORD_ORIGIN_LOWER_LEFT:
@@ -335,6 +344,8 @@ static int si_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
                return sscreen->info.pci_dev;
        case PIPE_CAP_PCI_FUNCTION:
                return sscreen->info.pci_func;
+       case PIPE_CAP_TGSI_ATOMINC_WRAP:
+               return HAVE_LLVM >= 0x1000;
 
        default:
                return u_pipe_screen_get_param_defaults(pscreen, param);
@@ -503,9 +514,7 @@ static const struct nir_shader_compiler_options nir_options = {
        .lower_sub = true,
        .lower_ffma = true,
        .lower_fmod = true,
-       .lower_pack_snorm_2x16 = true,
        .lower_pack_snorm_4x8 = true,
-       .lower_pack_unorm_2x16 = true,
        .lower_pack_unorm_4x8 = true,
        .lower_unpack_snorm_2x16 = true,
        .lower_unpack_snorm_4x8 = true,
@@ -639,9 +648,7 @@ static int si_get_video_param(struct pipe_screen *screen,
                                return profile == PIPE_VIDEO_PROFILE_HEVC_MAIN;
                        return false;
                case PIPE_VIDEO_FORMAT_JPEG:
-                       if (sscreen->info.family == CHIP_RAVEN ||
-                           sscreen->info.family == CHIP_RAVEN2 ||
-                           sscreen->info.family == CHIP_NAVI10)
+                       if (sscreen->info.family >= CHIP_RAVEN)
                                return true;
                        if (sscreen->info.family < CHIP_CARRIZO || sscreen->info.family >= CHIP_VEGA10)
                                return false;