From d64ded7b50d6614b88841383c37fab67d7596c4c Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Wed, 8 Mar 2017 14:56:04 -0800 Subject: [PATCH] swr: s/uint/enum pipe_render_cond_flag/ MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Roland Scheidegger --- src/gallium/drivers/swr/swr_context.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/drivers/swr/swr_context.h b/src/gallium/drivers/swr/swr_context.h index 46ca611..be65a20 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; -- 2.7.4