From: Dave Airlie Date: Fri, 27 May 2016 05:00:57 +0000 (+1000) Subject: i965: report bound buffer size not underlying buffer size for image size (v2) X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=96ea753d9eb802c95544c79035e89df38daf15f7;p=mesa.git i965: report bound buffer size not underlying buffer size for image size (v2) This seems to make sense, the image is bound to a subset of the buffer so the image size should be from the bound size not the underlying object. This fixes: GL44-CTS.shader_image_size.advanced-nonMS-fs-int v2: get mininum of the two values, same as we write to the hw. Reviewed-by: Francisco Jerez Signed-off-by: Dave Airlie --- diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c index 38701d04eea..2bafe9172f9 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c @@ -1384,10 +1384,10 @@ update_buffer_image_param(struct brw_context *brw, struct brw_image_param *param) { struct gl_buffer_object *obj = u->TexObj->BufferObject; - + const uint32_t size = MIN2((uint32_t)u->TexObj->BufferSize, obj->Size); update_default_image_param(brw, u, surface_idx, param); - param->size[0] = obj->Size / _mesa_get_format_bytes(u->_ActualFormat); + param->size[0] = size / _mesa_get_format_bytes(u->_ActualFormat); param->stride[0] = _mesa_get_format_bytes(u->_ActualFormat); }