30 lines
1.3 KiB
Diff
30 lines
1.3 KiB
Diff
|
From: Max Staudt <mstaudt@suse.de>
|
||
|
|
Date: Wed Oct 5 18:51:38 2016 +0200
|
||
|
|
Subject: [PATCH 5/5]Use nv50_render_condition() in nv50_blitctx_post_blit()
|
||
|
|
Patch-mainline: N/A
|
||
|
|
References: boo#997171
|
||
|
|
Signed-off-by: Max Staudt <mstaudt@suse.de>
|
||
|
|
|
||
|
|
Analogous to what happens in nvc0_blitctx_post_blit()
|
||
|
|
|
||
|
|
Signed-off-by: Max Staudt <mstaudt@suse.de>
|
||
|
|
---
|
||
|
|
src/gallium/drivers/nouveau/nv50/nv50_surface.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/gallium/drivers/nouveau/nv50/nv50_surface.c b/src/gallium/drivers/nouveau/nv50/nv50_surface.c
|
||
|
|
index d6b9de0..36cd72b 100644
|
||
|
|
--- a/src/gallium/drivers/nouveau/nv50/nv50_surface.c
|
||
|
|
+++ b/src/gallium/drivers/nouveau/nv50/nv50_surface.c
|
||
|
|
@@ -1328,8 +1328,8 @@ nv50_blitctx_post_blit(struct nv50_blitctx *blit)
|
||
|
|
nv50->samplers[2][1] = blit->saved.sampler[1];
|
||
|
|
|
||
|
|
if (nv50->cond_query && !blit->render_condition_enable)
|
||
|
|
- nv50->base.pipe.render_condition(&nv50->base.pipe, nv50->cond_query,
|
||
|
|
- nv50->cond_cond, nv50->cond_mode);
|
||
|
|
+ nv50_render_condition(&nv50->base.pipe, nv50->cond_query,
|
||
|
|
+ nv50->cond_cond, nv50->cond_mode);
|
||
|
|
|
||
|
|
nouveau_bufctx_reset(nv50->bufctx_3d, NV50_BIND_3D_FB);
|
||
|
|
nouveau_bufctx_reset(nv50->bufctx_3d, NV50_BIND_3D_TEXTURES);
|