diff --git a/src/gallium/auxiliary/cso_cache/cso_context.c b/src/gallium/auxiliary/cso_cache/cso_context.c
index c5d296491da..f1c1069d94a 100644
--- a/src/gallium/auxiliary/cso_cache/cso_context.c
+++ b/src/gallium/auxiliary/cso_cache/cso_context.c
@@ -1380,7 +1380,7 @@ set_sampler(struct cso_context_priv *ctx, enum pipe_shader_type shader_stage,
    if (cso_hash_iter_is_null(iter)) {
       cso = MALLOC(sizeof(struct cso_sampler));
       if (!cso)
-         return false;
+         return NULL;
 
       memcpy(&cso->state, templ, sizeof(*templ));
       cso->data = ctx->base.pipe->create_sampler_state(ctx->base.pipe, &cso->state);
@@ -1389,7 +1389,7 @@ set_sampler(struct cso_context_priv *ctx, enum pipe_shader_type shader_stage,
       iter = cso_insert_state(&ctx->cache, hash_key, CSO_SAMPLER, cso);
       if (cso_hash_iter_is_null(iter)) {
          FREE(cso);
-         return false;
+         return NULL;
       }
    } else {
       cso = cso_hash_iter_data(iter);
diff --git a/src/gallium/auxiliary/vl/vl_compositor_gfx.c b/src/gallium/auxiliary/vl/vl_compositor_gfx.c
index 4a87bff9ad3..d208f8aa37d 100644
--- a/src/gallium/auxiliary/vl/vl_compositor_gfx.c
+++ b/src/gallium/auxiliary/vl/vl_compositor_gfx.c
@@ -62,7 +62,7 @@ create_vert_shader(struct vl_compositor *c)
 
    shader = ureg_create(PIPE_SHADER_VERTEX);
    if (!shader)
-      return false;
+      return NULL;
 
    vpos = ureg_DECL_vs_input(shader, 0);
    vtex = ureg_DECL_vs_input(shader, 1);
@@ -270,7 +270,7 @@ create_frag_shader_video_buffer(struct vl_compositor *c)
 
    shader = ureg_create(PIPE_SHADER_FRAGMENT);
    if (!shader)
-      return false;
+      return NULL;
 
    texel = ureg_DECL_temporary(shader);
    fragment = ureg_DECL_output(shader, TGSI_SEMANTIC_COLOR, 0);
@@ -292,7 +292,7 @@ create_frag_shader_weave_rgb(struct vl_compositor *c)
 
    shader = ureg_create(PIPE_SHADER_FRAGMENT);
    if (!shader)
-      return false;
+      return NULL;
 
    texel = ureg_DECL_temporary(shader);
    fragment = ureg_DECL_output(shader, TGSI_SEMANTIC_COLOR, 0);
@@ -315,7 +315,7 @@ create_frag_shader_deint_yuv(struct vl_compositor *c, bool y, bool w)
 
    shader = ureg_create(PIPE_SHADER_FRAGMENT);
    if (!shader)
-      return false;
+      return NULL;
 
    texel = ureg_DECL_temporary(shader);
    fragment = ureg_DECL_output(shader, TGSI_SEMANTIC_COLOR, 0);
@@ -353,7 +353,7 @@ create_frag_shader_palette(struct vl_compositor *c, bool include_cc)
 
    shader = ureg_create(PIPE_SHADER_FRAGMENT);
    if (!shader)
-      return false;
+      return NULL;
 
    for (i = 0; include_cc && i < 3; ++i)
       csc[i] = ureg_DECL_constant(shader, i);
@@ -407,7 +407,7 @@ create_frag_shader_rgba(struct vl_compositor *c)
 
    shader = ureg_create(PIPE_SHADER_FRAGMENT);
    if (!shader)
-      return false;
+      return NULL;
 
    tc = ureg_DECL_fs_input(shader, TGSI_SEMANTIC_GENERIC, VS_O_VTEX, TGSI_INTERPOLATE_LINEAR);
    color = ureg_DECL_fs_input(shader, TGSI_SEMANTIC_COLOR, VS_O_COLOR, TGSI_INTERPOLATE_LINEAR);
@@ -442,7 +442,7 @@ create_frag_shader_rgb_yuv(struct vl_compositor *c, bool y)
 
    shader = ureg_create(PIPE_SHADER_FRAGMENT);
    if (!shader)
-      return false;
+      return NULL;
 
    for (i = 0; i < 3; ++i)
       csc[i] = ureg_DECL_constant(shader, i);