summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/swr
diff options
context:
space:
mode:
Diffstat (limited to 'src/gallium/drivers/swr')
-rw-r--r--src/gallium/drivers/swr/swr_context.cpp2
-rw-r--r--src/gallium/drivers/swr/swr_context.h2
-rw-r--r--src/gallium/drivers/swr/swr_fence.cpp2
-rw-r--r--src/gallium/drivers/swr/swr_fence.h12
-rw-r--r--src/gallium/drivers/swr/swr_query.cpp22
-rw-r--r--src/gallium/drivers/swr/swr_query.h2
-rw-r--r--src/gallium/drivers/swr/swr_resource.h8
-rw-r--r--src/gallium/drivers/swr/swr_screen.cpp36
-rw-r--r--src/gallium/drivers/swr/swr_screen.h2
-rw-r--r--src/gallium/drivers/swr/swr_state.cpp2
10 files changed, 45 insertions, 45 deletions
diff --git a/src/gallium/drivers/swr/swr_context.cpp b/src/gallium/drivers/swr/swr_context.cpp
index 8a1ef95c2c6..b3e67b9c18f 100644
--- a/src/gallium/drivers/swr/swr_context.cpp
+++ b/src/gallium/drivers/swr/swr_context.cpp
@@ -416,7 +416,7 @@ swr_destroy(struct pipe_context *pipe)
static void
swr_render_condition(struct pipe_context *pipe,
struct pipe_query *query,
- boolean condition,
+ bool condition,
enum pipe_render_cond_flag mode)
{
struct swr_context *ctx = swr_context(pipe);
diff --git a/src/gallium/drivers/swr/swr_context.h b/src/gallium/drivers/swr/swr_context.h
index 3b83458b947..55de8e04663 100644
--- a/src/gallium/drivers/swr/swr_context.h
+++ b/src/gallium/drivers/swr/swr_context.h
@@ -148,7 +148,7 @@ struct swr_context {
/** Conditional query object and mode */
struct pipe_query *render_cond_query;
enum pipe_render_cond_flag render_cond_mode;
- boolean render_cond_cond;
+ bool render_cond_cond;
unsigned active_queries;
unsigned num_vertex_buffers;
diff --git a/src/gallium/drivers/swr/swr_fence.cpp b/src/gallium/drivers/swr/swr_fence.cpp
index 074d82a3b47..4e2b2af874c 100644
--- a/src/gallium/drivers/swr/swr_fence.cpp
+++ b/src/gallium/drivers/swr/swr_fence.cpp
@@ -123,7 +123,7 @@ swr_fence_reference(struct pipe_screen *screen,
/*
* Wait for the fence to finish.
*/
-boolean
+bool
swr_fence_finish(struct pipe_screen *screen,
struct pipe_context *ctx,
struct pipe_fence_handle *fence_handle,
diff --git a/src/gallium/drivers/swr/swr_fence.h b/src/gallium/drivers/swr/swr_fence.h
index 4766b5b8911..2f7cd1cf9a6 100644
--- a/src/gallium/drivers/swr/swr_fence.h
+++ b/src/gallium/drivers/swr/swr_fence.h
@@ -54,14 +54,14 @@ swr_fence(struct pipe_fence_handle *fence)
}
-static INLINE boolean
+static INLINE bool
swr_is_fence_done(struct pipe_fence_handle *fence_handle)
{
struct swr_fence *fence = swr_fence(fence_handle);
return (fence->read == fence->write);
}
-static INLINE boolean
+static INLINE bool
swr_is_fence_pending(struct pipe_fence_handle *fence_handle)
{
return swr_fence(fence_handle)->pending;
@@ -76,10 +76,10 @@ void swr_fence_reference(struct pipe_screen *screen,
struct pipe_fence_handle **ptr,
struct pipe_fence_handle *f);
-boolean swr_fence_finish(struct pipe_screen *screen,
- struct pipe_context *ctx,
- struct pipe_fence_handle *fence_handle,
- uint64_t timeout);
+bool swr_fence_finish(struct pipe_screen *screen,
+ struct pipe_context *ctx,
+ struct pipe_fence_handle *fence_handle,
+ uint64_t timeout);
void
swr_fence_submit(struct swr_context *ctx, struct pipe_fence_handle *fence);
diff --git a/src/gallium/drivers/swr/swr_query.cpp b/src/gallium/drivers/swr/swr_query.cpp
index ea31de630b3..8c49a2ebb29 100644
--- a/src/gallium/drivers/swr/swr_query.cpp
+++ b/src/gallium/drivers/swr/swr_query.cpp
@@ -72,10 +72,10 @@ swr_destroy_query(struct pipe_context *pipe, struct pipe_query *q)
}
-static boolean
+static bool
swr_get_query_result(struct pipe_context *pipe,
struct pipe_query *q,
- boolean wait,
+ bool wait,
union pipe_query_result *result)
{
struct swr_query *pq = swr_query(q);
@@ -83,7 +83,7 @@ swr_get_query_result(struct pipe_context *pipe,
if (pq->fence) {
if (!wait && !swr_is_fence_done(pq->fence))
- return FALSE;
+ return false;
swr_fence_finish(pipe->screen, NULL, pq->fence, 0);
swr_fence_reference(pipe->screen, &pq->fence, NULL);
@@ -98,7 +98,7 @@ swr_get_query_result(struct pipe_context *pipe,
result->b = pq->result.core.DepthPassCount != 0;
break;
case PIPE_QUERY_GPU_FINISHED:
- result->b = TRUE;
+ result->b = true;
break;
/* Counters */
case PIPE_QUERY_OCCLUSION_COUNTER:
@@ -155,10 +155,10 @@ swr_get_query_result(struct pipe_context *pipe,
break;
}
- return TRUE;
+ return true;
}
-static boolean
+static bool
swr_begin_query(struct pipe_context *pipe, struct pipe_query *q)
{
struct swr_context *ctx = swr_context(pipe);
@@ -229,15 +229,15 @@ swr_end_query(struct pipe_context *pipe, struct pipe_query *q)
}
-boolean
+bool
swr_check_render_cond(struct pipe_context *pipe)
{
struct swr_context *ctx = swr_context(pipe);
- boolean b, wait;
+ bool b, wait;
uint64_t result;
if (!ctx->render_cond_query)
- return TRUE; /* no query predicate, draw normally */
+ return true; /* no query predicate, draw normally */
wait = (ctx->render_cond_mode == PIPE_RENDER_COND_WAIT
|| ctx->render_cond_mode == PIPE_RENDER_COND_BY_REGION_WAIT);
@@ -247,12 +247,12 @@ swr_check_render_cond(struct pipe_context *pipe)
if (b)
return ((!result) == ctx->render_cond_cond);
else
- return TRUE;
+ return true;
}
static void
-swr_set_active_query_state(struct pipe_context *pipe, boolean enable)
+swr_set_active_query_state(struct pipe_context *pipe, bool enable)
{
}
diff --git a/src/gallium/drivers/swr/swr_query.h b/src/gallium/drivers/swr/swr_query.h
index 1c736e4e1be..d838dc859e2 100644
--- a/src/gallium/drivers/swr/swr_query.h
+++ b/src/gallium/drivers/swr/swr_query.h
@@ -44,5 +44,5 @@ OSALIGNLINE(struct) swr_query {
extern void swr_query_init(struct pipe_context *pipe);
-extern boolean swr_check_render_cond(struct pipe_context *pipe);
+extern bool swr_check_render_cond(struct pipe_context *pipe);
#endif
diff --git a/src/gallium/drivers/swr/swr_resource.h b/src/gallium/drivers/swr/swr_resource.h
index 63327d6bd35..2228dff7488 100644
--- a/src/gallium/drivers/swr/swr_resource.h
+++ b/src/gallium/drivers/swr/swr_resource.h
@@ -67,12 +67,12 @@ swr_resource(struct pipe_resource *resource)
return (struct swr_resource *)resource;
}
-static INLINE boolean
+static INLINE bool
swr_resource_is_texture(const struct pipe_resource *resource)
{
switch (resource->target) {
case PIPE_BUFFER:
- return FALSE;
+ return false;
case PIPE_TEXTURE_1D:
case PIPE_TEXTURE_1D_ARRAY:
case PIPE_TEXTURE_2D:
@@ -81,10 +81,10 @@ swr_resource_is_texture(const struct pipe_resource *resource)
case PIPE_TEXTURE_3D:
case PIPE_TEXTURE_CUBE:
case PIPE_TEXTURE_CUBE_ARRAY:
- return TRUE;
+ return true;
default:
assert(0);
- return FALSE;
+ return false;
}
}
diff --git a/src/gallium/drivers/swr/swr_screen.cpp b/src/gallium/drivers/swr/swr_screen.cpp
index 9b146284672..8e02c86bec0 100644
--- a/src/gallium/drivers/swr/swr_screen.cpp
+++ b/src/gallium/drivers/swr/swr_screen.cpp
@@ -81,7 +81,7 @@ swr_get_vendor(struct pipe_screen *screen)
return "Intel Corporation";
}
-static boolean
+static bool
swr_is_format_supported(struct pipe_screen *_screen,
enum pipe_format format,
enum pipe_texture_target target,
@@ -107,23 +107,23 @@ swr_is_format_supported(struct pipe_screen *_screen,
format_desc = util_format_description(format);
if (!format_desc)
- return FALSE;
+ return false;
if ((sample_count > screen->msaa_max_count)
|| !util_is_power_of_two_or_zero(sample_count))
- return FALSE;
+ return false;
if (bind & PIPE_BIND_DISPLAY_TARGET) {
if (!winsys->is_displaytarget_format_supported(winsys, bind, format))
- return FALSE;
+ return false;
}
if (bind & PIPE_BIND_RENDER_TARGET) {
if (format_desc->colorspace == UTIL_FORMAT_COLORSPACE_ZS)
- return FALSE;
+ return false;
if (mesa_to_swr_format(format) == (SWR_FORMAT)-1)
- return FALSE;
+ return false;
/*
* Although possible, it is unnatural to render into compressed or YUV
@@ -131,25 +131,25 @@ swr_is_format_supported(struct pipe_screen *_screen,
* inside the state trackers.
*/
if (format_desc->block.width != 1 || format_desc->block.height != 1)
- return FALSE;
+ return false;
}
if (bind & PIPE_BIND_DEPTH_STENCIL) {
if (format_desc->colorspace != UTIL_FORMAT_COLORSPACE_ZS)
- return FALSE;
+ return false;
if (mesa_to_swr_format(format) == (SWR_FORMAT)-1)
- return FALSE;
+ return false;
}
if (format_desc->layout == UTIL_FORMAT_LAYOUT_BPTC ||
format_desc->layout == UTIL_FORMAT_LAYOUT_ASTC) {
- return FALSE;
+ return false;
}
if (format_desc->layout == UTIL_FORMAT_LAYOUT_ETC &&
format != PIPE_FORMAT_ETC1_RGB8) {
- return FALSE;
+ return false;
}
if ((bind & (PIPE_BIND_RENDER_TARGET | PIPE_BIND_SAMPLER_VIEW)) &&
@@ -163,7 +163,7 @@ swr_is_format_supported(struct pipe_screen *_screen,
if (format_desc->is_array &&
format_desc->nr_channels == 3 &&
format_desc->block.bits != 96) {
- return FALSE;
+ return false;
}
}
@@ -671,7 +671,7 @@ mesa_to_swr_format(enum pipe_format format)
return it->second;
}
-static boolean
+static bool
swr_displaytarget_layout(struct swr_screen *screen, struct swr_resource *res)
{
struct sw_winsys *winsys = screen->winsys;
@@ -689,7 +689,7 @@ swr_displaytarget_layout(struct swr_screen *screen, struct swr_resource *res)
&stride);
if (dt == NULL)
- return FALSE;
+ return false;
void *map = winsys->displaytarget_map(winsys, dt, 0);
@@ -702,13 +702,13 @@ swr_displaytarget_layout(struct swr_screen *screen, struct swr_resource *res)
winsys->displaytarget_unmap(winsys, dt);
- return TRUE;
+ return true;
}
static bool
swr_texture_layout(struct swr_screen *screen,
struct swr_resource *res,
- boolean allocate)
+ bool allocate)
{
struct pipe_resource *pt = &res->base;
@@ -898,7 +898,7 @@ swr_texture_layout(struct swr_screen *screen,
return true;
}
-static boolean
+static bool
swr_can_create_resource(struct pipe_screen *screen,
const struct pipe_resource *templat)
{
@@ -910,7 +910,7 @@ swr_can_create_resource(struct pipe_screen *screen,
/* Helper function that conditionally creates a single-sample resolve resource
* and attaches it to main multisample resource. */
-static boolean
+static bool
swr_create_resolve_resource(struct pipe_screen *_screen,
struct swr_resource *msaa_res)
{
diff --git a/src/gallium/drivers/swr/swr_screen.h b/src/gallium/drivers/swr/swr_screen.h
index 51826a8af12..0fa44043191 100644
--- a/src/gallium/drivers/swr/swr_screen.h
+++ b/src/gallium/drivers/swr/swr_screen.h
@@ -46,7 +46,7 @@ struct swr_screen {
struct sw_winsys *winsys;
/* Configurable environment settings */
- boolean msaa_force_enable;
+ bool msaa_force_enable;
uint8_t msaa_max_count;
uint32_t client_copy_limit;
diff --git a/src/gallium/drivers/swr/swr_state.cpp b/src/gallium/drivers/swr/swr_state.cpp
index f33f96c1840..c21e08b4a5a 100644
--- a/src/gallium/drivers/swr/swr_state.cpp
+++ b/src/gallium/drivers/swr/swr_state.cpp
@@ -651,7 +651,7 @@ swr_set_framebuffer_state(struct pipe_context *pipe,
{
struct swr_context *ctx = swr_context(pipe);
- boolean changed = !util_framebuffer_state_equal(&ctx->framebuffer, fb);
+ bool changed = !util_framebuffer_state_equal(&ctx->framebuffer, fb);
assert(fb->width <= KNOB_GUARDBAND_WIDTH);
assert(fb->height <= KNOB_GUARDBAND_HEIGHT);
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-16 05:47:33 +0000