On 10/08/2013 02:34 AM, Chris Forbes wrote:
> Some texturing ops are about to have nonconstant offset support; the
> offset in the header in these cases should be zero.
>
> Signed-off-by: Chris Forbes <chr...@ijw.co.nz>
> ---
> src/mesa/drivers/dri/i965/brw_shader.cpp | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/src/mesa/drivers/dri/i965/brw_shader.cpp
> b/src/mesa/drivers/dri/i965/brw_shader.cpp
> index 6b37f58..df7fa55 100644
> --- a/src/mesa/drivers/dri/i965/brw_shader.cpp
> +++ b/src/mesa/drivers/dri/i965/brw_shader.cpp
> @@ -370,7 +370,7 @@ brw_math_function(enum opcode op)
> uint32_t
> brw_texture_offset(ir_constant *offset)
> {
> - assert(offset != NULL);
I think we should leave this assertion, but amend it to be
/* If the driver does not support GL_ARB_gpu_shader5, the offset
* must be constant.
*/
assert(offset != NULL || ctx->Extensions.ARB_gpu_shader5);
> + if (!offset) return 0; /* nonconstant offset; caller will handle it. */
>
> signed char offsets[3];
> for (unsigned i = 0; i < offset->type->vector_elements; i++)
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
