projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r600g: revert "support textures with scaled number formats"
[mesa.git]
/
src
/
gallium
/
drivers
/
nvfx
/
nvfx_fragtex.c
diff --git
a/src/gallium/drivers/nvfx/nvfx_fragtex.c
b/src/gallium/drivers/nvfx/nvfx_fragtex.c
index fd0aff6a1a06740cfc48a4295f0d83950cc9b0db..1c4901df0e2273572ae0614171337d07a4b505b5 100644
(file)
--- a/
src/gallium/drivers/nvfx/nvfx_fragtex.c
+++ b/
src/gallium/drivers/nvfx/nvfx_fragtex.c
@@
-177,6
+177,7
@@
void
nvfx_fragtex_validate(struct nvfx_context *nvfx)
{
struct nouveau_channel* chan = nvfx->screen->base.channel;
nvfx_fragtex_validate(struct nvfx_context *nvfx)
{
struct nouveau_channel* chan = nvfx->screen->base.channel;
+ struct nouveau_grobj *eng3d = nvfx->screen->eng3d;
unsigned samplers, unit;
samplers = nvfx->dirty_samplers;
unsigned samplers, unit;
samplers = nvfx->dirty_samplers;
@@
-197,9
+198,8
@@
nvfx_fragtex_validate(struct nvfx_context *nvfx)
else
nv40_fragtex_set(nvfx, unit);
} else {
else
nv40_fragtex_set(nvfx, unit);
} else {
- WAIT_RING(chan, 2);
/* this is OK for nv40 too */
/* this is OK for nv40 too */
-
OUT_RING(chan, RING_3D(NV30_3D_TEX_ENABLE(unit), 1)
);
+
BEGIN_RING(chan, eng3d, NV30_3D_TEX_ENABLE(unit), 1
);
OUT_RING(chan, 0);
nvfx->hw_samplers &= ~(1 << unit);
}
OUT_RING(chan, 0);
nvfx->hw_samplers &= ~(1 << unit);
}