From 1665af3066f3d58c42e9d5b13098f13615a7672c Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Sun, 18 Nov 2012 13:18:03 -0800 Subject: [PATCH] i965/gen4: Fix crash with fragment programs and texture rectangle. This was a regression in the brw_fs_fp.cpp change. We just need to return something good enough to get the IR generation to the end without crashing, but ir->type isn't initialized and we wanted something of the coordinate's type anyway. Fixes around 30 piglit cases on my ilk system in drawpixels and framebuffer blit. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=56962 Reviewed-by: Kenneth Graunke --- src/mesa/drivers/dri/i965/brw_fs_visitor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp index edadd3513c9..1b797b58305 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp @@ -1175,7 +1175,7 @@ fs_visitor::rescale_texcoord(ir_texture *ir, fs_reg coordinate, if (c->dispatch_width == 16) { fail("rectangle scale uniform setup not supported on 16-wide\n"); - return fs_reg(this, ir->type); + return coordinate; } scale_x = fs_reg(UNIFORM, c->prog_data.nr_params); -- 2.30.2