From: Jason Ekstrand Date: Mon, 14 Sep 2015 22:36:24 +0000 (-0700) Subject: i965/fs_surface_builder: Only apply predicate to components that exist X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0c6df7a1cb593666636aed660e90be0c6aca4591;p=mesa.git i965/fs_surface_builder: Only apply predicate to components that exist In certain conditions, we have to do bounds-checking in the shader for image_load_store. The way this works for image loads is that we do a predicated load and then emit a series of selects, one per component, that gives us 0 or the loaded value depending on whether or not you're in bounds. However, we were hard-coding 4 components which may not be correct. Instead, we should be using size which is the number of components read. Reviewed-by: Francisco Jerez --- diff --git a/src/mesa/drivers/dri/i965/brw_fs_surface_builder.cpp b/src/mesa/drivers/dri/i965/brw_fs_surface_builder.cpp index 727e8d1b82a..88f22fa9c7f 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_surface_builder.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_surface_builder.cpp @@ -905,7 +905,7 @@ namespace brw { tmp = emit_untyped_read(bld, image, laddr, 1, size, pred); /* An out of bounds surface access should give zero as result. */ - for (unsigned c = 0; c < 4; ++c) + for (unsigned c = 0; c < size; ++c) set_predicate(pred, bld.SEL(offset(tmp, bld, c), offset(tmp, bld, c), fs_reg(0))); }