From 34b5db17d965b94f018189950be241e24d006421 Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Thu, 14 Apr 2016 10:39:54 -0700 Subject: [PATCH] i965: remove pointless diff with the master branch --- src/mesa/drivers/dri/i965/brw_program.c | 2 +- src/mesa/drivers/dri/i965/brw_vec4_nir.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mesa/drivers/dri/i965/brw_program.c b/src/mesa/drivers/dri/i965/brw_program.c index b093a87bb82..3112c0c4014 100644 --- a/src/mesa/drivers/dri/i965/brw_program.c +++ b/src/mesa/drivers/dri/i965/brw_program.c @@ -279,7 +279,7 @@ brw_get_scratch_bo(struct brw_context *brw, void brwInitFragProgFuncs( struct dd_function_table *functions ) { - /* assert(functions->ProgramStringNotify == _tnl_program_string); */ + assert(functions->ProgramStringNotify == _tnl_program_string); functions->NewProgram = brwNewProgram; functions->DeleteProgram = brwDeleteProgram; diff --git a/src/mesa/drivers/dri/i965/brw_vec4_nir.cpp b/src/mesa/drivers/dri/i965/brw_vec4_nir.cpp index 032fdaa4d23..b67d104c340 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_nir.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_nir.cpp @@ -1647,6 +1647,7 @@ vec4_visitor::nir_emit_jump(nir_jump_instr *instr) break; case nir_jump_return: + /* fall through */ default: unreachable("unknown jump"); } -- 2.30.2