fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 08:50:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nvc0: invalidate textures/samplers between 3D and CP on Fermi

Browse source 
Like constant buffers, samplers and textures are aliased on Fermi and
we need to invalidate the state when switching from 3D to CP and vice
versa.

This fixes rendering issues in the UE4 demos.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
This commit is contained in:
Samuel Pitoiset 2016-05-26 23:01:37 +02:00
parent 9f0bc0f2b3
commit e01a482182
2 changed files with 27 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/gallium/drivers/nouveau/nvc0/nvc0_compute.c
View file

@ -124,6 +124,11 @@ nvc0_compute_validate_samplers(struct nvc0_context *nvc0)
BEGIN_NVC0(nvc0->base.pushbuf, NVC0_CP(TSC_FLUSH), 1);
PUSH_DATA (nvc0->base.pushbuf, 0);
}
/* Invalidate all 3D samplers because they are aliased. */
for (int s = 0; s < 5; s++)
nvc0->samplers_dirty[s] = ~0;
nvc0->dirty_3d |= NVC0_NEW_3D_SAMPLERS;
}
static void
@ -134,6 +139,14 @@ nvc0_compute_validate_textures(struct nvc0_context *nvc0)
BEGIN_NVC0(nvc0->base.pushbuf, NVC0_CP(TIC_FLUSH), 1);
PUSH_DATA (nvc0->base.pushbuf, 0);
}
/* Invalidate all 3D textures because they are aliased. */
for (int s = 0; s < 5; s++) {
for (int i = 0; i < nvc0->num_textures[s]; i++)
nouveau_bufctx_reset(nvc0->bufctx_3d, NVC0_BIND_3D_TEX(s, i));
nvc0->textures_dirty[s] = ~0;
}
nvc0->dirty_3d |= NVC0_NEW_3D_TEXTURES;
}
static void

14
src/gallium/drivers/nouveau/nvc0/nvc0_tex.c
View file

@ -588,6 +588,14 @@ void nvc0_validate_textures(struct nvc0_context *nvc0)
BEGIN_NVC0(nvc0->base.pushbuf, NVC0_3D(TIC_FLUSH), 1);
PUSH_DATA (nvc0->base.pushbuf, 0);
}
if (nvc0->screen->base.class_3d < NVE4_3D_CLASS) {
/* Invalidate all CP textures because they are aliased. */
for (int i = 0; i < nvc0->num_textures[5]; i++)
nouveau_bufctx_reset(nvc0->bufctx_3d, NVC0_BIND_CP_TEX(i));
nvc0->textures_dirty[5] = ~0;
nvc0->dirty_cp |= NVC0_NEW_CP_TEXTURES;
}
}
bool
@ -700,6 +708,12 @@ void nvc0_validate_samplers(struct nvc0_context *nvc0)
BEGIN_NVC0(nvc0->base.pushbuf, NVC0_3D(TSC_FLUSH), 1);
PUSH_DATA (nvc0->base.pushbuf, 0);
}
if (nvc0->screen->base.class_3d < NVE4_3D_CLASS) {
/* Invalidate all CP samplers because they are aliased. */
nvc0->samplers_dirty[5] = ~0;
nvc0->dirty_cp |= NVC0_NEW_CP_SAMPLERS;
}
}
/* Upload the "diagonal" entries for the possible texture sources ($t == $s).