summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTim Rowley <[email protected]>2016-04-21 11:50:40 -0500
committerTim Rowley <[email protected]>2016-04-22 18:03:41 -0500
commit5815c8b3d3b7fe3311ac51533438f24f09768ad6 (patch)
treeb9d37d67a163e93c873fbfa2f8d73e5188e9badb /src
parente85bef8b128eef7ae549a95bac197601435da9cd (diff)
swr: fix clang warnings
v2: use alternate logic version in swr_check_render_cond Reviewed-by: Bruce Cherniak <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/gallium/drivers/swr/swr_query.cpp2
-rw-r--r--src/gallium/drivers/swr/swr_shader.h8
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 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);