diff options
| author | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-04-14 10:39:54 -0700 |
|---|---|---|
| committer | Jason Ekstrand <jason.ekstrand@intel.com> | 2016-04-14 10:39:54 -0700 |
| commit | 34b5db17d965b94f018189950be241e24d006421 (patch) | |
| tree | 137ddd2d8a47959b5305177d5490884d63b661be | |
| parent | 769b5614f85992c333fa87f4faf23656da439d48 (diff) | |
| download | external_mesa3d-34b5db17d965b94f018189950be241e24d006421.zip external_mesa3d-34b5db17d965b94f018189950be241e24d006421.tar.gz external_mesa3d-34b5db17d965b94f018189950be241e24d006421.tar.bz2 | |
i965: remove pointless diff with the master branch
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_program.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vec4_nir.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_program.c b/src/mesa/drivers/dri/i965/brw_program.c index b093a87..3112c0c 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 032fdaa..b67d104 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"); } |