From ec44d56a5b20632bcd4cb19ae6fa5d615df4149f Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Tue, 17 Sep 2013 23:32:10 -0700 Subject: [PATCH] i965: Rename brw_{fs,vec4}_emit.cpp to brw_{fs,vec4}_generator.cpp. The previous names were really confusing to talk about: - brw_fs_visitor() contained methods named emit_whatever(). - brw_fs_generator() contained methods named generate_whatever(), but lived in brw_fs_emit.cpp. So when someone said "the emit layer", or "emit code", we weren't sure whether they meant the visitor's emit() functions or the generator in brw_fs_emit.cpp. By renaming these files, the method names, class names, and file names all match, which is much less confusing. Signed-off-by: Kenneth Graunke Acked-by: Paul Berry Acked-by: Eric Anholt --- src/mesa/drivers/dri/i965/Makefile.sources | 4 ++-- .../dri/i965/{brw_fs_emit.cpp => brw_fs_generator.cpp} | 4 ++-- .../dri/i965/{brw_vec4_emit.cpp => brw_vec4_generator.cpp} | 0 3 files changed, 4 insertions(+), 4 deletions(-) rename src/mesa/drivers/dri/i965/{brw_fs_emit.cpp => brw_fs_generator.cpp} (99%) rename src/mesa/drivers/dri/i965/{brw_vec4_emit.cpp => brw_vec4_generator.cpp} (100%) diff --git a/src/mesa/drivers/dri/i965/Makefile.sources b/src/mesa/drivers/dri/i965/Makefile.sources index 07c1053e84b..4063bf15b99 100644 --- a/src/mesa/drivers/dri/i965/Makefile.sources +++ b/src/mesa/drivers/dri/i965/Makefile.sources @@ -54,8 +54,8 @@ i965_FILES = \ brw_fs_channel_expressions.cpp \ brw_fs_copy_propagation.cpp \ brw_fs_cse.cpp \ - brw_fs_emit.cpp \ brw_fs_fp.cpp \ + brw_fs_generator.cpp \ brw_fs_live_variables.cpp \ brw_fs_reg_allocate.cpp \ brw_fs_vector_splitting.cpp \ @@ -87,7 +87,7 @@ i965_FILES = \ brw_util.c \ brw_vec4.cpp \ brw_vec4_copy_propagation.cpp \ - brw_vec4_emit.cpp \ + brw_vec4_generator.cpp \ brw_vec4_gs.c \ brw_vec4_gs_visitor.cpp \ brw_vec4_live_variables.cpp \ diff --git a/src/mesa/drivers/dri/i965/brw_fs_emit.cpp b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp similarity index 99% rename from src/mesa/drivers/dri/i965/brw_fs_emit.cpp rename to src/mesa/drivers/dri/i965/brw_fs_generator.cpp index bfb3d331b0a..7ce42c4b9dc 100644 --- a/src/mesa/drivers/dri/i965/brw_fs_emit.cpp +++ b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp @@ -21,9 +21,9 @@ * IN THE SOFTWARE. */ -/** @file brw_fs_emit.cpp +/** @file brw_fs_generator.cpp * - * This file supports emitting code from the FS LIR to the actual + * This file supports generating code from the FS LIR to the actual * native instructions. */ diff --git a/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp b/src/mesa/drivers/dri/i965/brw_vec4_generator.cpp similarity index 100% rename from src/mesa/drivers/dri/i965/brw_vec4_emit.cpp rename to src/mesa/drivers/dri/i965/brw_vec4_generator.cpp -- 2.30.2