aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/mesa/drivers/dri/i965/Makefile.sources2
-rw-r--r--src/mesa/drivers/dri/i965/brw_cfg.cpp (renamed from src/mesa/drivers/dri/i965/brw_fs_cfg.cpp)2
-rw-r--r--src/mesa/drivers/dri/i965/brw_cfg.h (renamed from src/mesa/drivers/dri/i965/brw_fs_cfg.h)0
-rw-r--r--src/mesa/drivers/dri/i965/brw_fs_copy_propagation.cpp2
-rw-r--r--src/mesa/drivers/dri/i965/brw_fs_cse.cpp2
-rw-r--r--src/mesa/drivers/dri/i965/brw_fs_emit.cpp2
-rw-r--r--src/mesa/drivers/dri/i965/brw_fs_live_variables.cpp2
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 125aac5a06f..ab2181463f9 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
index acc0085284b..575444678f1 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
index 0038f929737..0038f929737 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_cfg.h
+++ b/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 9319529f2d1..f51f7b944e7 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 7bf6698f91e..bb3ba66350d 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 aa60ed571da..ec39c0a69ec 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 392691dd47e..667f1e85a59 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;