KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gallivm: Remove format desc null checks 

Signed-off-by: Konstantin Seurer <konstantin.seurer@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17490>
This commit is contained in:
Konstantin Seurer 2022-07-12 14:38:35 +02:00 committed by Marge Bot
parent 630df88a74
commit 927f863364
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c
View File

@ -3258,7 +3258,6 @@ static struct lp_type
lp_build_texel_type(struct lp_type texel_type,
const struct util_format_description *format_desc)
{
assert(format_desc != NULL);
/* always using the first channel hopefully should be safe,
* if not things WILL break in other places anyway.
*/
@ -3384,8 +3383,6 @@ lp_build_sample_soa_code(struct gallivm_state *gallivm,
bld.format_desc = util_format_description(static_texture_state->format);
bld.dims = dims;
assert(bld.format_desc);
if (gallivm_perf & GALLIVM_PERF_NO_QUAD_LOD || op_is_lodq) {
bld.no_quad_lod = TRUE;
}
@ -4000,7 +3997,7 @@ lp_build_sample_gen_func(struct gallivm_state *gallivm,
if (dynamic_state->cache_ptr) {
const struct util_format_description *format_desc;
format_desc = util_format_description(static_texture_state->format);
if (format_desc && format_desc->layout == UTIL_FORMAT_LAYOUT_S3TC) {
if (format_desc->layout == UTIL_FORMAT_LAYOUT_S3TC) {
need_cache = TRUE;
}
}
@ -4129,7 +4126,7 @@ lp_build_sample_soa_func(struct gallivm_state *gallivm,
if (dynamic_state->cache_ptr) {
const struct util_format_description *format_desc;
format_desc = util_format_description(static_texture_state->format);
if (format_desc && format_desc->layout == UTIL_FORMAT_LAYOUT_S3TC) {
if (format_desc->layout == UTIL_FORMAT_LAYOUT_S3TC) {
need_cache = TRUE;
}
}
@ -4301,9 +4298,9 @@ lp_build_sample_soa(const struct lp_static_texture_state *static_texture_state,
if (USE_TEX_FUNC_CALL) {
const struct util_format_description *format_desc =
util_format_description(static_texture_state->format);
const boolean simple_format = !format_desc ||
(util_format_is_rgba8_variant(format_desc) &&
format_desc->colorspace == UTIL_FORMAT_COLORSPACE_RGB);
const boolean simple_format =
(util_format_is_rgba8_variant(format_desc) &&
format_desc->colorspace == UTIL_FORMAT_COLORSPACE_RGB);
const enum lp_sampler_op_type op_type =
(params->sample_key & LP_SAMPLER_OP_TYPE_MASK) >>
LP_SAMPLER_OP_TYPE_SHIFT;
@ -4313,7 +4310,7 @@ lp_build_sample_soa(const struct lp_static_texture_state *static_texture_state,
static_texture_state->level_zero_only == TRUE) &&
static_sampler_state->min_img_filter == static_sampler_state->mag_img_filter);
use_tex_func = format_desc && !(simple_format && simple_tex);
use_tex_func = !(simple_format && simple_tex);
}
if (use_tex_func) {