From 02f8f90cc2261167ea025cbb69f8856c33444007 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Tue, 28 Oct 2014 17:18:55 -0700 Subject: [PATCH] i965: Rename brw_gs{,_emit}.[ch] to brw_ff_gs{,_emit}.[ch]. The brw_gs.[ch] and brw_gs_emit.c source files contain code for emulating fixed-function unit functionality (VF primitive decomposition or SOL) using the GS unit. They do not contain code to support proper geometry shaders. We've taken to calling that code "ff_gs" (see brw_ff_gs_prog_key, brw_ff_gs_prog_data, brw_context::ff_gs, brw_ff_gs_compile, brw_ff_gs_prog). So it makes sense to make the filenames match. Signed-off-by: Kenneth Graunke Acked-by: Matt Turner Acked-by: Jason Ekstrand Acked-by: Iago Toral Quiroga --- src/mesa/drivers/dri/i965/Makefile.sources | 4 ++-- src/mesa/drivers/dri/i965/{brw_gs.c => brw_ff_gs.c} | 2 +- src/mesa/drivers/dri/i965/{brw_gs.h => brw_ff_gs.h} | 0 src/mesa/drivers/dri/i965/{brw_gs_emit.c => brw_ff_gs_emit.c} | 2 +- src/mesa/drivers/dri/i965/brw_vec4_gs.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename src/mesa/drivers/dri/i965/{brw_gs.c => brw_ff_gs.c} (99%) rename src/mesa/drivers/dri/i965/{brw_gs.h => brw_ff_gs.h} (100%) rename src/mesa/drivers/dri/i965/{brw_gs_emit.c => brw_ff_gs_emit.c} (99%) diff --git a/src/mesa/drivers/dri/i965/Makefile.sources b/src/mesa/drivers/dri/i965/Makefile.sources index 9c006daa0e3..9f29551256c 100644 --- a/src/mesa/drivers/dri/i965/Makefile.sources +++ b/src/mesa/drivers/dri/i965/Makefile.sources @@ -50,6 +50,8 @@ i965_FILES = \ brw_eu_compact.c \ brw_eu_emit.c \ brw_eu_util.c \ + brw_ff_gs.c \ + brw_ff_gs_emit.c \ brw_fs.cpp \ brw_fs_channel_expressions.cpp \ brw_fs_copy_propagation.cpp \ @@ -65,8 +67,6 @@ i965_FILES = \ brw_fs_sel_peephole.cpp \ brw_fs_vector_splitting.cpp \ brw_fs_visitor.cpp \ - brw_gs.c \ - brw_gs_emit.c \ brw_gs_state.c \ brw_gs_surface_state.c \ brw_interpolation_map.c \ diff --git a/src/mesa/drivers/dri/i965/brw_gs.c b/src/mesa/drivers/dri/i965/brw_ff_gs.c similarity index 99% rename from src/mesa/drivers/dri/i965/brw_gs.c rename to src/mesa/drivers/dri/i965/brw_ff_gs.c index c0c4c13f13c..6ca9e7f51e9 100644 --- a/src/mesa/drivers/dri/i965/brw_gs.c +++ b/src/mesa/drivers/dri/i965/brw_ff_gs.c @@ -41,7 +41,7 @@ #include "brw_eu.h" #include "brw_util.h" #include "brw_state.h" -#include "brw_gs.h" +#include "brw_ff_gs.h" #include "util/ralloc.h" diff --git a/src/mesa/drivers/dri/i965/brw_gs.h b/src/mesa/drivers/dri/i965/brw_ff_gs.h similarity index 100% rename from src/mesa/drivers/dri/i965/brw_gs.h rename to src/mesa/drivers/dri/i965/brw_ff_gs.h diff --git a/src/mesa/drivers/dri/i965/brw_gs_emit.c b/src/mesa/drivers/dri/i965/brw_ff_gs_emit.c similarity index 99% rename from src/mesa/drivers/dri/i965/brw_gs_emit.c rename to src/mesa/drivers/dri/i965/brw_ff_gs_emit.c index 91986c3a6cc..3f315972289 100644 --- a/src/mesa/drivers/dri/i965/brw_gs_emit.c +++ b/src/mesa/drivers/dri/i965/brw_ff_gs_emit.c @@ -40,7 +40,7 @@ #include "brw_defines.h" #include "brw_context.h" #include "brw_eu.h" -#include "brw_gs.h" +#include "brw_ff_gs.h" /** * Allocate registers for GS. diff --git a/src/mesa/drivers/dri/i965/brw_vec4_gs.c b/src/mesa/drivers/dri/i965/brw_vec4_gs.c index c8814fe70cc..93c9d37cc59 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_gs.c +++ b/src/mesa/drivers/dri/i965/brw_vec4_gs.c @@ -31,7 +31,7 @@ #include "brw_context.h" #include "brw_vec4_gs_visitor.h" #include "brw_state.h" -#include "brw_gs.h" +#include "brw_ff_gs.h" static bool -- 2.30.2