Module: Mesa Branch: master Commit: 62b07b934ecce1f370f3566ad3613341ff86aba1 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=62b07b934ecce1f370f3566ad3613341ff86aba1
Author: Kenneth Graunke <[email protected]> Date: Tue Oct 28 17:27:39 2014 -0700 i965: Rename brw_vec4_gs.[ch] to brw_gs.[ch]. These source files support actual geometry shaders, so using "gs" for the name makes a lot of sense. We're going to be adding SIMD8 geometry shader support as well, at which point "vec4_gs" will be a misnomer. Signed-off-by: Kenneth Graunke <[email protected]> Acked-by: Matt Turner <[email protected]> Acked-by: Jason Ekstrand <[email protected]> Acked-by: Iago Toral Quiroga <[email protected]> --- src/mesa/drivers/dri/i965/Makefile.sources | 2 +- src/mesa/drivers/dri/i965/{brw_vec4_gs.c => brw_gs.c} | 2 +- src/mesa/drivers/dri/i965/{brw_vec4_gs.h => brw_gs.h} | 0 src/mesa/drivers/dri/i965/brw_shader.cpp | 2 +- src/mesa/drivers/dri/i965/brw_state_cache.c | 3 +-- 5 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/mesa/drivers/dri/i965/Makefile.sources b/src/mesa/drivers/dri/i965/Makefile.sources index 9f29551..711aabe 100644 --- a/src/mesa/drivers/dri/i965/Makefile.sources +++ b/src/mesa/drivers/dri/i965/Makefile.sources @@ -67,6 +67,7 @@ i965_FILES = \ brw_fs_sel_peephole.cpp \ brw_fs_vector_splitting.cpp \ brw_fs_visitor.cpp \ + brw_gs.c \ brw_gs_state.c \ brw_gs_surface_state.c \ brw_interpolation_map.c \ @@ -102,7 +103,6 @@ i965_FILES = \ brw_vec4_copy_propagation.cpp \ brw_vec4_cse.cpp \ brw_vec4_generator.cpp \ - brw_vec4_gs.c \ brw_vec4_gs_visitor.cpp \ brw_vec4_live_variables.cpp \ brw_vec4_reg_allocate.cpp \ diff --git a/src/mesa/drivers/dri/i965/brw_vec4_gs.c b/src/mesa/drivers/dri/i965/brw_gs.c similarity index 99% rename from src/mesa/drivers/dri/i965/brw_vec4_gs.c rename to src/mesa/drivers/dri/i965/brw_gs.c index 93c9d37..f44ac26 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_gs.c +++ b/src/mesa/drivers/dri/i965/brw_gs.c @@ -27,7 +27,7 @@ * State atom for client-programmable geometry shaders, and support code. */ -#include "brw_vec4_gs.h" +#include "brw_gs.h" #include "brw_context.h" #include "brw_vec4_gs_visitor.h" #include "brw_state.h" diff --git a/src/mesa/drivers/dri/i965/brw_vec4_gs.h b/src/mesa/drivers/dri/i965/brw_gs.h similarity index 100% rename from src/mesa/drivers/dri/i965/brw_vec4_gs.h rename to src/mesa/drivers/dri/i965/brw_gs.h diff --git a/src/mesa/drivers/dri/i965/brw_shader.cpp b/src/mesa/drivers/dri/i965/brw_shader.cpp index 21dcf2d..10f8db7 100644 --- a/src/mesa/drivers/dri/i965/brw_shader.cpp +++ b/src/mesa/drivers/dri/i965/brw_shader.cpp @@ -26,7 +26,7 @@ extern "C" { #include "brw_context.h" } #include "brw_vs.h" -#include "brw_vec4_gs.h" +#include "brw_gs.h" #include "brw_fs.h" #include "brw_cfg.h" #include "glsl/ir_optimization.h" diff --git a/src/mesa/drivers/dri/i965/brw_state_cache.c b/src/mesa/drivers/dri/i965/brw_state_cache.c index eb7452ec..cf42ada 100644 --- a/src/mesa/drivers/dri/i965/brw_state_cache.c +++ b/src/mesa/drivers/dri/i965/brw_state_cache.c @@ -49,8 +49,7 @@ #include "brw_state.h" #include "brw_vs.h" #include "brw_wm.h" -#include "brw_vs.h" -#include "brw_vec4_gs.h" +#include "brw_gs.h" #define FILE_DEBUG_FLAG DEBUG_STATE _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
