diff --git a/libweston/renderer-gl/gl-shader-config-color-transformation.c b/libweston/renderer-gl/gl-shader-config-color-transformation.c
index 423eec04a..0bd3dd356 100644
--- a/libweston/renderer-gl/gl-shader-config-color-transformation.c
+++ b/libweston/renderer-gl/gl-shader-config-color-transformation.c
@@ -375,7 +375,6 @@ gl_shader_config_set_color_transform(struct gl_renderer *gr,
 				     struct weston_color_transform *xform)
 {
 	const struct gl_renderer_color_transform *gl_xform;
-	bool ret = false;
 
 	gl_xform = gl_renderer_color_transform_from(gr, xform);
 	if (!gl_xform)
@@ -389,20 +388,6 @@ gl_shader_config_set_color_transform(struct gl_renderer *gr,
 
 	sconf->req.color_mapping = gl_xform->mapping.type;
 	sconf->color_mapping = gl_xform->mapping.u;
-	switch (gl_xform->mapping.type) {
-	case SHADER_COLOR_MAPPING_3DLUT:
-		assert(sconf->color_mapping.lut3d.scale > 0.0);
-		assert(sconf->color_mapping.lut3d.offset > 0.0);
-		ret = true;
-		break;
-	case SHADER_COLOR_MAPPING_MATRIX:
-		assert(sconf->req.color_mapping == SHADER_COLOR_MAPPING_MATRIX);
-		ret = true;
-		break;
-	case SHADER_COLOR_MAPPING_IDENTITY:
-		ret = true;
-		break;
-	}
 
-	return ret;
+	return true;
 }
diff --git a/libweston/renderer-gl/gl-shaders.c b/libweston/renderer-gl/gl-shaders.c
index 2e85ffbad..5e93c17af 100644
--- a/libweston/renderer-gl/gl-shaders.c
+++ b/libweston/renderer-gl/gl-shaders.c
@@ -672,8 +672,11 @@ gl_shader_load_config_mapping(struct weston_compositor *compositor,
 		return;
 	case SHADER_COLOR_MAPPING_3DLUT:
 		assert(unif->lut3d.tex_uniform != -1);
-		assert(sconf->lut3d.tex3d != 0);
 		assert(unif->lut3d.scale_offset_uniform != -1);
+		assert(sconf->lut3d.tex3d != 0);
+		assert(sconf->lut3d.scale > 0.0);
+		assert(sconf->lut3d.offset > 0.0);
+
 		glActiveTexture(GL_TEXTURE0 + TEX_UNIT_COLOR_MAPPING);
 		glBindTexture(GL_TEXTURE_3D, sconf->lut3d.tex3d);
 		glUniform1i(unif->lut3d.tex_uniform, TEX_UNIT_COLOR_MAPPING);