Mesa (master): i965: Rename brw_gs{, _emit}.[ch] to brw_ff_gs{, _emit}.[ch].
Kenneth Graunke
kwg at kemper.freedesktop.org
Wed Oct 29 22:10:45 UTC 2014
Module: Mesa
Branch: master
Commit: 02f8f90cc2261167ea025cbb69f8856c33444007
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=02f8f90cc2261167ea025cbb69f8856c33444007
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Tue Oct 28 17:18:55 2014 -0700
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 <kenneth at whitecape.org>
Acked-by: Matt Turner <mattst88 at gmail.com>
Acked-by: Jason Ekstrand <jason.ekstrand at intel.com>
Acked-by: Iago Toral Quiroga <itoral at igalia.com>
---
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(-)
diff --git a/src/mesa/drivers/dri/i965/Makefile.sources b/src/mesa/drivers/dri/i965/Makefile.sources
index 9c006da..9f29551 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 c0c4c13..6ca9e7f 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 91986c3..3f31597 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 c8814fe..93c9d37 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
More information about the mesa-commit
mailing list