Mesa (master): i965: Move brw_fs_cfg.* to brw_cfg.*.
Eric Anholt
anholt at kemper.freedesktop.org
Wed Oct 17 19:24:41 UTC 2012
Module: Mesa
Branch: master
Commit: 5ed57d9543df1875d843638212a1f650fc0b17ec
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5ed57d9543df1875d843638212a1f650fc0b17ec
Author: Eric Anholt <eric at anholt.net>
Date: Wed Oct 3 13:03:12 2012 -0700
i965: Move brw_fs_cfg.* to brw_cfg.*.
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
---
src/mesa/drivers/dri/i965/Makefile.sources | 2 +-
.../dri/i965/{brw_fs_cfg.cpp => brw_cfg.cpp} | 2 +-
.../drivers/dri/i965/{brw_fs_cfg.h => brw_cfg.h} | 0
.../drivers/dri/i965/brw_fs_copy_propagation.cpp | 2 +-
src/mesa/drivers/dri/i965/brw_fs_cse.cpp | 2 +-
src/mesa/drivers/dri/i965/brw_fs_emit.cpp | 2 +-
.../drivers/dri/i965/brw_fs_live_variables.cpp | 2 +-
7 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/Makefile.sources b/src/mesa/drivers/dri/i965/Makefile.sources
index 125aac5..ab21814 100644
--- a/src/mesa/drivers/dri/i965/Makefile.sources
+++ b/src/mesa/drivers/dri/i965/Makefile.sources
@@ -107,9 +107,9 @@ i965_C_FILES = \
i965_CXX_FILES = \
brw_blorp.cpp \
brw_blorp_blit.cpp \
+ brw_cfg.cpp \
brw_cubemap_normalize.cpp \
brw_fs.cpp \
- brw_fs_cfg.cpp \
brw_fs_cse.cpp \
brw_fs_copy_propagation.cpp \
brw_fs_emit.cpp \
diff --git a/src/mesa/drivers/dri/i965/brw_fs_cfg.cpp b/src/mesa/drivers/dri/i965/brw_cfg.cpp
similarity index 99%
rename from src/mesa/drivers/dri/i965/brw_fs_cfg.cpp
rename to src/mesa/drivers/dri/i965/brw_cfg.cpp
index acc0085..5754446 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_cfg.cpp
+++ b/src/mesa/drivers/dri/i965/brw_cfg.cpp
@@ -26,7 +26,7 @@
*/
#include "brw_fs.h"
-#include "brw_fs_cfg.h"
+#include "brw_cfg.h"
/** @file brw_fs_cfg.cpp
*
diff --git a/src/mesa/drivers/dri/i965/brw_fs_cfg.h b/src/mesa/drivers/dri/i965/brw_cfg.h
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_fs_cfg.h
rename to src/mesa/drivers/dri/i965/brw_cfg.h
diff --git a/src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp b/src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp
index 9319529..f51f7b9 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp
@@ -22,7 +22,7 @@
*/
#include "brw_fs.h"
-#include "brw_fs_cfg.h"
+#include "brw_cfg.h"
namespace { /* avoid conflict with opt_copy_propagation_elements */
struct acp_entry : public exec_node {
diff --git a/src/mesa/drivers/dri/i965/brw_fs_cse.cpp b/src/mesa/drivers/dri/i965/brw_fs_cse.cpp
index 7bf6698..bb3ba66 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_cse.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_cse.cpp
@@ -22,7 +22,7 @@
*/
#include "brw_fs.h"
-#include "brw_fs_cfg.h"
+#include "brw_cfg.h"
/** @file brw_fs_cse.cpp
*
diff --git a/src/mesa/drivers/dri/i965/brw_fs_emit.cpp b/src/mesa/drivers/dri/i965/brw_fs_emit.cpp
index aa60ed5..ec39c0a 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_emit.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_emit.cpp
@@ -34,7 +34,7 @@ extern "C" {
} /* extern "C" */
#include "brw_fs.h"
-#include "brw_fs_cfg.h"
+#include "brw_cfg.h"
#include "glsl/ir_print_visitor.h"
void
diff --git a/src/mesa/drivers/dri/i965/brw_fs_live_variables.cpp b/src/mesa/drivers/dri/i965/brw_fs_live_variables.cpp
index 392691d..667f1e8 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_live_variables.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_live_variables.cpp
@@ -25,7 +25,7 @@
*
*/
-#include "brw_fs_cfg.h"
+#include "brw_cfg.h"
#include "brw_fs_live_variables.h"
using namespace brw;
More information about the mesa-commit
mailing list