From 3eacbc52d51789f7c58dfe5ca1317962eb9d1a6a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Tue, 21 Jun 2016 21:29:39 +0200 Subject: [PATCH] radeonsi: boolean -> bool, TRUE -> true, FALSE -> false MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Alex Deucher Reviewed-by: Vedran Miletić Reviewed-by: Nicolai Hähnle --- src/gallium/drivers/radeonsi/si_blit.c | 2 +- src/gallium/drivers/radeonsi/si_pipe.c | 6 +++--- src/gallium/drivers/radeonsi/si_pipe.h | 2 +- src/gallium/drivers/radeonsi/si_state.c | 20 ++++++++++---------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/gallium/drivers/radeonsi/si_blit.c b/src/gallium/drivers/radeonsi/si_blit.c index 73a72e0ead4..46daeac4ac0 100644 --- a/src/gallium/drivers/radeonsi/si_blit.c +++ b/src/gallium/drivers/radeonsi/si_blit.c @@ -849,7 +849,7 @@ void si_resource_copy_region(struct pipe_context *ctx, util_blitter_blit_generic(sctx->blitter, dst_view, &dstbox, src_view, src_box, src_width0, src_height0, PIPE_MASK_RGBAZS, PIPE_TEX_FILTER_NEAREST, NULL, - FALSE); + false); si_blitter_end(ctx); pipe_surface_reference(&dst_view, NULL); diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index e025df435ff..06703724f1f 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -164,7 +164,7 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen, sctx->ce_suballocator = u_suballocator_create(&sctx->b.b, 1024 * 1024, PIPE_BIND_CUSTOM, - PIPE_USAGE_DEFAULT, FALSE); + PIPE_USAGE_DEFAULT, false); if (!sctx->ce_suballocator) goto fail; } @@ -704,7 +704,7 @@ struct pipe_screen *radeonsi_screen_create(struct radeon_winsys *ws) return NULL; } - if (!debug_get_bool_option("RADEON_DISABLE_PERFCOUNTERS", FALSE)) + if (!debug_get_bool_option("RADEON_DISABLE_PERFCOUNTERS", false)) si_init_perfcounters(sscreen); sscreen->b.has_cp_dma = true; @@ -714,7 +714,7 @@ struct pipe_screen *radeonsi_screen_create(struct radeon_winsys *ws) HAVE_LLVM < 0x0308 || (sscreen->b.debug_flags & DBG_MONOLITHIC_SHADERS) != 0; - if (debug_get_bool_option("RADEON_DUMP_SHADERS", FALSE)) + if (debug_get_bool_option("RADEON_DUMP_SHADERS", false)) sscreen->b.debug_flags |= DBG_FS | DBG_VS | DBG_GS | DBG_PS | DBG_CS; /* Create the auxiliary context. This must be done last. */ diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h index fe92c6a318e..d1819058b92 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.h +++ b/src/gallium/drivers/radeonsi/si_pipe.h @@ -309,7 +309,7 @@ struct si_context { /* Scratch buffer */ struct r600_resource *scratch_buffer; - boolean emit_scratch_reloc; + bool emit_scratch_reloc; unsigned scratch_waves; unsigned spi_tmpring_size; diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index 04e9f19fa3f..e6d1025c672 100644 --- a/src/gallium/drivers/radeonsi/si_state.c +++ b/src/gallium/drivers/radeonsi/si_state.c @@ -1290,7 +1290,7 @@ static uint32_t si_translate_texformat(struct pipe_screen *screen, bool enable_compressed_formats = (sscreen->b.info.drm_major == 2 && sscreen->b.info.drm_minor >= 31) || sscreen->b.info.drm_major == 3; - boolean uniform = TRUE; + bool uniform = true; int i; /* Colorspace (return non-RGB formats directly). */ @@ -1751,7 +1751,7 @@ static bool si_is_vertex_format_supported(struct pipe_screen *screen, enum pipe_ static bool si_is_colorbuffer_format_supported(enum pipe_format format) { return si_translate_colorformat(format) != V_028C70_COLOR_INVALID && - r600_translate_colorswap(format, FALSE) != ~0U; + r600_translate_colorswap(format, false) != ~0U; } static bool si_is_zs_format_supported(enum pipe_format format) @@ -1769,15 +1769,15 @@ boolean si_is_format_supported(struct pipe_screen *screen, if (target >= PIPE_MAX_TEXTURE_TYPES) { R600_ERR("r600: unsupported texture type %d\n", target); - return FALSE; + return false; } if (!util_format_is_supported(format, usage)) - return FALSE; + return false; if (sample_count > 1) { if (!screen->get_param(screen, PIPE_CAP_TEXTURE_MULTISAMPLE)) - return FALSE; + return false; switch (sample_count) { case 2: @@ -1786,11 +1786,11 @@ boolean si_is_format_supported(struct pipe_screen *screen, break; case 16: if (format == PIPE_FORMAT_NONE) - return TRUE; + return true; else - return FALSE; + return false; default: - return FALSE; + return false; } } @@ -2014,7 +2014,7 @@ static void si_initialize_color_surface(struct si_context *sctx, R600_ERR("Invalid CB format: %d, disabling CB.\n", surf->base.format); } assert(format != V_028C70_COLOR_INVALID); - swap = r600_translate_colorswap(surf->base.format, FALSE); + swap = r600_translate_colorswap(surf->base.format, false); endian = si_colorformat_endian_swap(format); /* blend clamp should be set for all NORM/SRGB types */ @@ -2798,7 +2798,7 @@ si_make_texture_descriptor(struct si_screen *screen, state[7] = 0; if (tex->dcc_offset) { - unsigned swap = r600_translate_colorswap(pipe_format, FALSE); + unsigned swap = r600_translate_colorswap(pipe_format, false); state[6] = S_008F28_ALPHA_IS_ON_MSB(swap <= 1); } else { -- 2.30.2