Mesa (master): swr: fix clang warnings
Tim Rowley
torowley at kemper.freedesktop.org
Fri Apr 22 23:15:04 UTC 2016
Module: Mesa
Branch: master
Commit: 5815c8b3d3b7fe3311ac51533438f24f09768ad6
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5815c8b3d3b7fe3311ac51533438f24f09768ad6
Author: Tim Rowley <timothy.o.rowley at intel.com>
Date: Thu Apr 21 11:50:40 2016 -0500
swr: fix clang warnings
v2: use alternate logic version in swr_check_render_cond
Reviewed-by: Bruce Cherniak <bruce.cherniak at intel.com>
---
src/gallium/drivers/swr/swr_query.cpp | 2 +-
src/gallium/drivers/swr/swr_shader.h | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/gallium/drivers/swr/swr_query.cpp b/src/gallium/drivers/swr/swr_query.cpp
index ff4d9b3..f038a6e 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 3f79570..11d50c3 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);
More information about the mesa-commit
mailing list