Module: Mesa
Branch: master
Commit: 5f2deba9f3f3f9230a9fdd2848e20c1e23e98b8f
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=5f2deba9f3f3f9230a9fdd2848e20c1e23e98b8f
Author: Brian Paul <bri...@vmware.com>
Date: Wed Jun 8 08:05:40 2011 -0600
gallium: s/bool/boolean/
---
src/gallium/auxiliary/gallivm/lp_bld_tgsi_info.c | 2 +-
src/gallium/auxiliary/util/u_linkage.h | 2 +-
src/gallium/auxiliary/util/u_staging.c | 2 +-
src/gallium/auxiliary/util/u_staging.h | 2 +-
src/gallium/drivers/i915/i915_batchbuffer.h | 2 +-
src/gallium/drivers/nvfx/nvfx_surface.c | 4 ++--
src/gallium/drivers/nvfx/nvfx_transfer.c | 2 +-
src/gallium/drivers/r300/r300_state_derived.c | 2 +-
src/gallium/drivers/r600/r600_asm.c | 4 ++--
src/gallium/drivers/r600/r600_pipe.h | 10 +++++-----
src/gallium/tests/unit/u_format_test.c | 4 ++--
src/gallium/winsys/r600/drm/r600_bomgr.c | 2 +-
src/gallium/winsys/r600/drm/r600_priv.h | 4 ++--
13 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_info.c
b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_info.c
index ad51446..5ad32d9 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_tgsi_info.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_tgsi_info.c
@@ -105,7 +105,7 @@ analyse_tex(struct analysis_context *ctx,
if (info->num_texs < Elements(info->tex)) {
struct lp_tgsi_texture_info *tex_info = &info->tex[info->num_texs];
- bool indirect = FALSE;
+ boolean indirect = FALSE;
unsigned readmask = 0;
tex_info->target = inst->Texture.Texture;
diff --git a/src/gallium/auxiliary/util/u_linkage.h
b/src/gallium/auxiliary/util/u_linkage.h
index 4720e0e..43ec917 100644
--- a/src/gallium/auxiliary/util/u_linkage.h
+++ b/src/gallium/auxiliary/util/u_linkage.h
@@ -35,7 +35,7 @@ struct util_semantic_set
unsigned long masks[256 / 8 / sizeof(unsigned long)];
};
-static INLINE bool
+static INLINE boolean
util_semantic_set_contains(struct util_semantic_set *set, unsigned char value)
{
return !!(set->masks[value / (sizeof(long) * 8)] & (1 << (value /
(sizeof(long) * 8))));
diff --git a/src/gallium/auxiliary/util/u_staging.c
b/src/gallium/auxiliary/util/u_staging.c
index b6bf241..b5e3793 100644
--- a/src/gallium/auxiliary/util/u_staging.c
+++ b/src/gallium/auxiliary/util/u_staging.c
@@ -55,7 +55,7 @@ util_staging_transfer_init(struct pipe_context *pipe,
unsigned level,
unsigned usage,
const struct pipe_box *box,
- bool direct, struct util_staging_transfer *tx)
+ boolean direct, struct util_staging_transfer *tx)
{
struct pipe_screen *pscreen = pipe->screen;
diff --git a/src/gallium/auxiliary/util/u_staging.h
b/src/gallium/auxiliary/util/u_staging.h
index 49839d2..ddbb334 100644
--- a/src/gallium/auxiliary/util/u_staging.h
+++ b/src/gallium/auxiliary/util/u_staging.h
@@ -55,7 +55,7 @@ util_staging_transfer_init(struct pipe_context *pipe,
unsigned level,
unsigned usage,
const struct pipe_box *box,
- bool direct, struct util_staging_transfer *tx);
+ boolean direct, struct util_staging_transfer *tx);
void
util_staging_transfer_destroy(struct pipe_context *pipe, struct pipe_transfer
*ptx);
diff --git a/src/gallium/drivers/i915/i915_batchbuffer.h
b/src/gallium/drivers/i915/i915_batchbuffer.h
index 7855403..14ae749 100644
--- a/src/gallium/drivers/i915/i915_batchbuffer.h
+++ b/src/gallium/drivers/i915/i915_batchbuffer.h
@@ -95,7 +95,7 @@ static INLINE int
i915_winsys_batchbuffer_reloc(struct i915_winsys_batchbuffer *batch,
struct i915_winsys_buffer *buffer,
enum i915_winsys_buffer_usage usage,
- size_t offset, bool fenced)
+ size_t offset, boolean fenced)
{
return batch->iws->batchbuffer_reloc(batch, buffer, usage, offset, fenced);
}
diff --git a/src/gallium/drivers/nvfx/nvfx_surface.c
b/src/gallium/drivers/nvfx/nvfx_surface.c
index ced2649..339906e 100644
--- a/src/gallium/drivers/nvfx/nvfx_surface.c
+++ b/src/gallium/drivers/nvfx/nvfx_surface.c
@@ -84,7 +84,7 @@ nvfx_region_set_format(struct nv04_region* rgn, enum
pipe_format format)
}
static INLINE void
-nvfx_region_init_for_surface(struct nv04_region* rgn, struct nvfx_surface*
surf, unsigned x, unsigned y, bool for_write)
+nvfx_region_init_for_surface(struct nv04_region* rgn, struct nvfx_surface*
surf, unsigned x, unsigned y, boolean for_write)
{
rgn->x = x;
rgn->y = y;
@@ -120,7 +120,7 @@ nvfx_region_init_for_surface(struct nv04_region* rgn,
struct nvfx_surface* surf,
}
static INLINE void
-nvfx_region_init_for_subresource(struct nv04_region* rgn, struct
pipe_resource* pt, unsigned level, unsigned x, unsigned y, unsigned z, bool
for_write)
+nvfx_region_init_for_subresource(struct nv04_region* rgn, struct
pipe_resource* pt, unsigned level, unsigned x, unsigned y, unsigned z, boolean
for_write)
{
if(pt->target != PIPE_BUFFER)
{
diff --git a/src/gallium/drivers/nvfx/nvfx_transfer.c
b/src/gallium/drivers/nvfx/nvfx_transfer.c
index 2debcb6..cc4b51e 100644
--- a/src/gallium/drivers/nvfx/nvfx_transfer.c
+++ b/src/gallium/drivers/nvfx/nvfx_transfer.c
@@ -56,7 +56,7 @@ nvfx_transfer_new(struct pipe_context *pipe,
else
{
struct nvfx_staging_transfer* tx;
- bool direct = !nvfx_resource_on_gpu(pt) && pt->flags &
NVFX_RESOURCE_FLAG_LINEAR;
+ boolean direct = !nvfx_resource_on_gpu(pt) && pt->flags &
NVFX_RESOURCE_FLAG_LINEAR;
tx = CALLOC_STRUCT(nvfx_staging_transfer);
if(!tx)
diff --git a/src/gallium/drivers/r300/r300_state_derived.c
b/src/gallium/drivers/r300/r300_state_derived.c
index 04499c7..121409b 100644
--- a/src/gallium/drivers/r300/r300_state_derived.c
+++ b/src/gallium/drivers/r300/r300_state_derived.c
@@ -438,7 +438,7 @@ static void r300_update_rs_block(struct r300_context *r300)
/* Rasterize texture coordinates. */
for (i = 0; i < ATTR_GENERIC_COUNT && tex_count < 8; i++) {
- bool sprite_coord = false;
+ boolean sprite_coord = false;
if (fs_inputs->generic[i] != ATTR_UNUSED) {
sprite_coord = !!(r300->sprite_coord_enable & (1 << i));
diff --git a/src/gallium/drivers/r600/r600_asm.c
b/src/gallium/drivers/r600/r600_asm.c
index 65e539e..3196d97 100644
--- a/src/gallium/drivers/r600/r600_asm.c
+++ b/src/gallium/drivers/r600/r600_asm.c
@@ -1088,7 +1088,7 @@ static int r600_bc_alloc_kcache_lines(struct r600_bc *bc,
struct r600_bc_alu *al
/* Collect required cache lines. */
for (i = 0; i < 3; ++i) {
- bool found = false;
+ boolean found = false;
unsigned int line;
if (alu->src[i].sel < 512)
@@ -1140,7 +1140,7 @@ static int r600_bc_alloc_kcache_lines(struct r600_bc *bc,
struct r600_bc_alu *al
/* Setup the kcache lines. */
for (i = 0; i < count; ++i) {
- bool found = false;
+ boolean found = false;
for (j = 0; j < 2; ++j) {
if (kcache[j].mode == V_SQ_CF_KCACHE_LOCK_2 &&
diff --git a/src/gallium/drivers/r600/r600_pipe.h
b/src/gallium/drivers/r600/r600_pipe.h
index f40d6fd..d92b74e 100644
--- a/src/gallium/drivers/r600/r600_pipe.h
+++ b/src/gallium/drivers/r600/r600_pipe.h
@@ -87,7 +87,7 @@ struct r600_pipe_sampler_view {
struct r600_pipe_rasterizer {
struct r600_pipe_state rstate;
- bool flatshade;
+ boolean flatshade;
unsigned sprite_coord_enable;
float offset_units;
float offset_scale;
@@ -193,17 +193,17 @@ struct r600_pipe_context {
struct r600_pipe_state spi;
/* shader information */
unsigned sprite_coord_enable;
- bool flatshade;
- bool export_16bpc;
+ boolean flatshade;
+ boolean export_16bpc;
unsigned alpha_ref;
- bool alpha_ref_dirty;
+ boolean alpha_ref_dirty;
struct r600_textures_info ps_samplers;
struct r600_pipe_fences fences;
struct u_vbuf_mgr *vbuf_mgr;
struct util_slab_mempool pool_transfers;
- bool blit;
+ boolean blit;
};
diff --git a/src/gallium/tests/unit/u_format_test.c
b/src/gallium/tests/unit/u_format_test.c
index ba0dd17..f831e5d 100644
--- a/src/gallium/tests/unit/u_format_test.c
+++ b/src/gallium/tests/unit/u_format_test.c
@@ -638,7 +638,7 @@ test_one_func(const struct util_format_description
*format_desc,
const char *suffix)
{
unsigned i;
- bool success = TRUE;
+ boolean success = TRUE;
printf("Testing util_format_%s_%s ...\n",
format_desc->short_name, suffix);
@@ -662,7 +662,7 @@ static boolean
test_all(void)
{
enum pipe_format format;
- bool success = TRUE;
+ boolean success = TRUE;
for (format = 1; format < PIPE_FORMAT_COUNT; ++format) {
const struct util_format_description *format_desc;
diff --git a/src/gallium/winsys/r600/drm/r600_bomgr.c
b/src/gallium/winsys/r600/drm/r600_bomgr.c
index 446ef0f..4918d5e 100644
--- a/src/gallium/winsys/r600/drm/r600_bomgr.c
+++ b/src/gallium/winsys/r600/drm/r600_bomgr.c
@@ -116,7 +116,7 @@ void r600_bomgr_bo_init(struct r600_bomgr *mgr, struct
r600_bo *bo)
bo->manager_id = 1;
}
-bool r600_bomgr_bo_destroy(struct r600_bomgr *mgr, struct r600_bo *bo)
+boolean r600_bomgr_bo_destroy(struct r600_bomgr *mgr, struct r600_bo *bo)
{
bo->start = os_time_get();
bo->end = bo->start + mgr->usecs;
diff --git a/src/gallium/winsys/r600/drm/r600_priv.h
b/src/gallium/winsys/r600/drm/r600_priv.h
index 082370a..45bc64f 100644
--- a/src/gallium/winsys/r600/drm/r600_priv.h
+++ b/src/gallium/winsys/r600/drm/r600_priv.h
@@ -197,7 +197,7 @@ void r600_bo_destroy(struct radeon *radeon, struct r600_bo
*bo);
*/
struct r600_bomgr *r600_bomgr_create(struct radeon *radeon, unsigned usecs);
void r600_bomgr_destroy(struct r600_bomgr *mgr);
-bool r600_bomgr_bo_destroy(struct r600_bomgr *mgr, struct r600_bo *bo);
+boolean r600_bomgr_bo_destroy(struct r600_bomgr *mgr, struct r600_bo *bo);
void r600_bomgr_bo_init(struct r600_bomgr *mgr, struct r600_bo *bo);
struct r600_bo *r600_bomgr_bo_create(struct r600_bomgr *mgr,
unsigned size,
@@ -230,7 +230,7 @@ static inline void radeon_bo_unmap(struct radeon *radeon,
struct radeon_bo *bo)
/*
* fence
*/
-static inline bool fence_is_after(unsigned fence, unsigned ofence)
+static inline boolean fence_is_after(unsigned fence, unsigned ofence)
{
/* handle wrap around */
if (fence < 0x80000000 && ofence > 0x80000000)
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
