summaryrefslogtreecommitdiff
path: root/lib/mesa/src/gallium/drivers/softpipe/sp_flush.c
diff options
context:
space:
mode:
authorJonathan Gray <jsg@cvs.openbsd.org>2017-12-31 07:12:27 +0000
committerJonathan Gray <jsg@cvs.openbsd.org>2017-12-31 07:12:27 +0000
commit051645c92924bf915d82bf219f2ed67309b5577a (patch)
tree4aae126dd8e5a18c6a9926a5468d1561e6038a07 /lib/mesa/src/gallium/drivers/softpipe/sp_flush.c
parent2dae6fe6f74cf7fb9fd65285302c0331d9786b00 (diff)
Merge Mesa 17.2.8
Diffstat (limited to 'lib/mesa/src/gallium/drivers/softpipe/sp_flush.c')
-rw-r--r--lib/mesa/src/gallium/drivers/softpipe/sp_flush.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/mesa/src/gallium/drivers/softpipe/sp_flush.c b/lib/mesa/src/gallium/drivers/softpipe/sp_flush.c
index 656d8a325..3bf8c4992 100644
--- a/lib/mesa/src/gallium/drivers/softpipe/sp_flush.c
+++ b/lib/mesa/src/gallium/drivers/softpipe/sp_flush.c
@@ -169,7 +169,7 @@ softpipe_flush_resource(struct pipe_context *pipe,
return TRUE;
}
-void softpipe_texture_barrier(struct pipe_context *pipe)
+void softpipe_texture_barrier(struct pipe_context *pipe, unsigned flags)
{
struct softpipe_context *softpipe = softpipe_context(pipe);
uint i, sh;
@@ -192,5 +192,5 @@ void softpipe_texture_barrier(struct pipe_context *pipe)
void softpipe_memory_barrier(struct pipe_context *pipe, unsigned flags)
{
- softpipe_texture_barrier(pipe);
+ softpipe_texture_barrier(pipe, 0);
}