Re: [Mesa-dev] [PATCH] swr: s/uint/enum pipe_render_cond_flag/

2017-03-08 Thread Roland Scheidegger
Reviewed-by: Roland Scheidegger 

Am 09.03.2017 um 00:06 schrieb Vinson Lee:
> 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 
> ---
>  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 46ca6112f91d..be65a20c85b7 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;
>  
> 

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev


[Mesa-dev] [PATCH] swr: s/uint/enum pipe_render_cond_flag/

2017-03-08 Thread Vinson Lee
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 
---
 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 46ca6112f91d..be65a20c85b7 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.9.3

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev