[Mesa-dev] [PATCH 1/2] nvc0: remove NVC0_CB_AUX_UNK_INFO

[Ilia Mirkin]

This definitely breaks odd things at least on Kepler (which is
extremely odd, given that I have no idea what it does). Unfortunately
I don't have a record of what, but it's slightly odd things. I wonder
if it's texture buffers, which we've recently gotten some extra
information about.

On Fri, Jun 22, 2018 at 4:47 PM, Rhys Perry <pendingchaos02 at gmail.com> wrote:
> It doesn't seem to be used and removing it doesn't seem to break things on
> my GP106.
>
> Signed-off-by: Rhys Perry <pendingchaos02 at gmail.com>
> ---
>  src/gallium/drivers/nouveau/nvc0/nvc0_context.h | 3 ---
>  src/gallium/drivers/nouveau/nvc0/nvc0_screen.c  | 8 +-------
>  2 files changed, 1 insertion(+), 10 deletions(-)
>
> diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_context.h b/src/gallium/drivers/nouveau/nvc0/nvc0_context.h
> index 0729c88dff..c5ab59ad2f 100644
> --- a/src/gallium/drivers/nouveau/nvc0/nvc0_context.h
> +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_context.h
> @@ -111,9 +111,6 @@
>  /* 6 driver constbuts, at 64K each */
>  #define NVC0_CB_AUX_INFO(s)         NVC0_CB_USR_SIZE + (s << 16)
>  #define NVC0_CB_AUX_SIZE            (1 << 16)
> -/* XXX: Figure out what this UNK data is. */
> -#define NVC0_CB_AUX_UNK_INFO        0x000
> -#define NVC0_CB_AUX_UNK_SIZE        (8 * 4)
>  /* 40 textures handles (8 for GM107+ images only), at 1 32-bits integer each */
>  #define NVC0_CB_AUX_TEX_INFO(i)     0x020 + (i) * 4
>  #define NVC0_CB_AUX_TEX_SIZE        (40 * 4)
> diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
> index e1c7b3a236..6b8af6e111 100644
> --- a/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
> +++ b/src/gallium/drivers/nouveau/nvc0/nvc0_screen.c
> @@ -1254,13 +1254,7 @@ nvc0_screen_create(struct nouveau_device *dev)
>        PUSH_DATA (push, screen->uniform_bo->offset + NVC0_CB_AUX_INFO(i));
>        BEGIN_NVC0(push, NVC0_3D(CB_BIND(i)), 1);
>        PUSH_DATA (push, (15 << 4) | 1);
> -      if (screen->eng3d->oclass >= NVE4_3D_CLASS) {
> -         unsigned j;
> -         BEGIN_1IC0(push, NVC0_3D(CB_POS), 9);
> -         PUSH_DATA (push, NVC0_CB_AUX_UNK_INFO);
> -         for (j = 0; j < 8; ++j)
> -            PUSH_DATA(push, j);
> -      } else {
> +      if (screen->eng3d->oclass < NVE4_3D_CLASS) {
>           BEGIN_NVC0(push, NVC0_3D(TEX_LIMITS(i)), 1);
>           PUSH_DATA (push, 0x54);
>        }
> --
> 2.14.4
>