From: Vinson Lee <vlee@freedesktop.org>
Date: Wed, 8 Mar 2017 22:56:04 +0000 (-0800)
Subject: swr: s/uint/enum pipe_render_cond_flag/
X-Git-Tag: upstream/17.1.0~1578
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d64ded7b50d6614b88841383c37fab67d7596c4c;p=platform%2Fupstream%2Fmesa.git

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>
---

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;