summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVinson Lee <vlee@freedesktop.org>2017-03-08 14:56:04 -0800
committerVinson Lee <vlee@freedesktop.org>2017-03-08 21:43:07 -0800
commitd64ded7b50d6614b88841383c37fab67d7596c4c (patch)
treede26c6be8f9f5a5699cdf9825cd85019cd62c5da
parent7d6e1a341af6d29110fbc83aa139fedade2851d1 (diff)
swr: s/uint/enum pipe_render_cond_flag/
Fix build error. swr_context.cpp: In function ‘void swr_blit(pipe_context*, const pipe_blit_info*)’: swr_context.cpp:336:44: error: invalid conversion from ‘uint {aka unsigned int}’ to ‘pipe_render_cond_flag’ [-fpermissive] ctx->render_cond_mode); ~~~~~^~~~~~~~~~~~~~~~ Fixes: b0d39384307d ("gallium: s/uint/enum pipe_render_cond_flag/ for set_render_condition()") Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=100133 Signed-off-by: Vinson Lee <vlee@freedesktop.org> Reviewed-by: Roland Scheidegger <sroland@vmware.com>
-rw-r--r--src/gallium/drivers/swr/swr_context.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/drivers/swr/swr_context.h b/src/gallium/drivers/swr/swr_context.h
index 46ca6112f9..be65a20c85 100644
--- a/src/gallium/drivers/swr/swr_context.h
+++ b/src/gallium/drivers/swr/swr_context.h
@@ -141,7 +141,7 @@ struct swr_context {
/** Conditional query object and mode */
struct pipe_query *render_cond_query;
- uint render_cond_mode;
+ enum pipe_render_cond_flag render_cond_mode;
boolean render_cond_cond;
unsigned active_queries;