From: Tim Rowley <timothy.o.rowley@intel.com>
Date: Thu, 21 Apr 2016 16:50:40 +0000 (-0500)
Subject: swr: fix clang warnings
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5815c8b3d3b7fe3311ac51533438f24f09768ad6;p=mesa.git

swr: fix clang warnings

v2: use alternate logic version in swr_check_render_cond

Reviewed-by: Bruce Cherniak <bruce.cherniak@intel.com>
---

diff --git a/src/gallium/drivers/swr/swr_query.cpp b/src/gallium/drivers/swr/swr_query.cpp
index ff4d9b35018..f038a6e6390 100644
--- a/src/gallium/drivers/swr/swr_query.cpp
+++ b/src/gallium/drivers/swr/swr_query.cpp
@@ -315,7 +315,7 @@ swr_check_render_cond(struct pipe_context *pipe)
    b = pipe->get_query_result(
       pipe, ctx->render_cond_query, wait, (union pipe_query_result *)&result);
    if (b)
-      return (!result == ctx->render_cond_cond);
+      return ((!result) == ctx->render_cond_cond);
    else
       return TRUE;
 }
diff --git a/src/gallium/drivers/swr/swr_shader.h b/src/gallium/drivers/swr/swr_shader.h
index 3f79570bbd9..11d50c3848f 100644
--- a/src/gallium/drivers/swr/swr_shader.h
+++ b/src/gallium/drivers/swr/swr_shader.h
@@ -23,10 +23,10 @@
 
 #pragma once
 
-class swr_vertex_shader;
-class swr_fragment_shader;
-class swr_jit_fs_key;
-class swr_jit_vs_key;
+struct swr_vertex_shader;
+struct swr_fragment_shader;
+struct swr_jit_fs_key;
+struct swr_jit_vs_key;
 
 PFN_VERTEX_FUNC
 swr_compile_vs(struct swr_context *ctx, swr_jit_vs_key &key);