On Sat, Jun 28, 2014 at 9:34 PM, Kenneth Graunke <kenn...@whitecape.org> wrote: > Apparently INTEL_DEBUG=fs has crashed on Broadwell for anything using > ARB_fragment_program since commit 9cee3ff5. We need to NULL-check the > right field. > > Signed-off-by: Kenneth Graunke <kenn...@whitecape.org> > Cc: "10.2" <mesa-sta...@lists.freedesktop.org> > --- > src/mesa/drivers/dri/i965/gen8_fs_generator.cpp | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > I could've sworn I fixed this, but apparently I was thinking about > commit 2f97119950515c841bca98a890e5110206bad945, which fixed a similar > bug in the VS visitor. > > diff --git a/src/mesa/drivers/dri/i965/gen8_fs_generator.cpp > b/src/mesa/drivers/dri/i965/gen8_fs_generator.cpp > index 4725774..ac8bf1d 100644 > --- a/src/mesa/drivers/dri/i965/gen8_fs_generator.cpp > +++ b/src/mesa/drivers/dri/i965/gen8_fs_generator.cpp > @@ -1255,7 +1255,7 @@ gen8_fs_generator::generate_code(exec_list > *instructions) > int before_size = next_inst_offset - start_offset; > > if (unlikely(INTEL_DEBUG & DEBUG_WM)) { > - if (prog) { > + if (shader_prog) { > fprintf(stderr, > "Native code for %s fragment shader %d (SIMD%d > dispatch):\n", > shader_prog->Label ? shader_prog->Label : "unnamed", > -- > 2.0.0 > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/mesa-dev
I think Eric had a patch to do the same thing in his compaction branch that never got merged... http://cgit.freedesktop.org/~anholt/mesa/commit/?h=compaction&id=83923d925dea762847382227607929ca901bc01e _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev