diff options
| author | Jonathan Marek <[email protected]> | 2019-12-19 18:03:09 -0500 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2019-12-19 23:21:01 +0000 |
| commit | b9d4c10e4b26b6bb6bd1365d3fc8b3c6288c8da7 (patch) | |
| tree | e80fe670d52b516c02ba74001484f9398951792a /src/freedreno/vulkan | |
| parent | d71cd245d7445121342a4933cc6ed8ce3fc6e568 (diff) | |
turnip: minor warning fixes
Signed-off-by: Jonathan Marek <[email protected]>
Reviewed-by: Kristian H. Kristensen <[email protected]>
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3177>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3177>
Diffstat (limited to 'src/freedreno/vulkan')
| -rw-r--r-- | src/freedreno/vulkan/tu_pass.c | 2 | ||||
| -rw-r--r-- | src/freedreno/vulkan/tu_pipeline.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/freedreno/vulkan/tu_pass.c b/src/freedreno/vulkan/tu_pass.c index f8a24fd85cf..72fe1bf06e6 100644 --- a/src/freedreno/vulkan/tu_pass.c +++ b/src/freedreno/vulkan/tu_pass.c @@ -61,7 +61,7 @@ compute_gmem_offsets(struct tu_render_pass *pass, uint32_t gmem_size) * result: nblocks = {12, 52}, pixels = 196608 * optimal: nblocks = {13, 51}, pixels = 208896 */ - uint32_t block_total = 0, gmem_blocks = gmem_size / GMEM_ALIGN; + uint32_t gmem_blocks = gmem_size / GMEM_ALIGN; uint32_t offset = 0, pixels = ~0u; for (uint32_t i = 0; i < pass->attachment_count; i++) { struct tu_render_pass_attachment *att = &pass->attachments[i]; diff --git a/src/freedreno/vulkan/tu_pipeline.c b/src/freedreno/vulkan/tu_pipeline.c index 0c84c567210..799b0b2a3de 100644 --- a/src/freedreno/vulkan/tu_pipeline.c +++ b/src/freedreno/vulkan/tu_pipeline.c @@ -874,7 +874,7 @@ tu6_emit_fs_outputs(struct tu_cs *cs, uint32_t gras_su_depth_plane_cntl = 0; uint32_t rb_depth_plane_cntl = 0; - if (fs->no_earlyz | fs->writes_pos) { + if (fs->no_earlyz || fs->writes_pos) { gras_su_depth_plane_cntl |= A6XX_GRAS_SU_DEPTH_PLANE_CNTL_FRAG_WRITES_Z; rb_depth_plane_cntl |= A6XX_RB_DEPTH_PLANE_CNTL_FRAG_WRITES_Z; } |