[Mesa-dev] [PATCH 4/4] i965: Merge brw_dead_control_flow.h into brw_shader.h.

[Matt Turner]

---
 src/mesa/drivers/dri/i965/Makefile.sources        |  1 -
 src/mesa/drivers/dri/i965/brw_dead_control_flow.h | 26 -----------------------
 src/mesa/drivers/dri/i965/brw_fs.cpp              |  1 -
 src/mesa/drivers/dri/i965/brw_shader.h            |  1 +
 src/mesa/drivers/dri/i965/brw_vec4.cpp            |  1 -
 5 files changed, 1 insertion(+), 29 deletions(-)
 delete mode 100644 src/mesa/drivers/dri/i965/brw_dead_control_flow.h

diff --git a/src/mesa/drivers/dri/i965/Makefile.sources b/src/mesa/drivers/dri/i965/Makefile.sources
index 9b1a039..93f8d25 100644
--- a/src/mesa/drivers/dri/i965/Makefile.sources
+++ b/src/mesa/drivers/dri/i965/Makefile.sources
@@ -26,7 +26,6 @@ i965_FILES = \
 	brw_cubemap_normalize.cpp \
 	brw_curbe.c \
 	brw_dead_control_flow.cpp \
-	brw_dead_control_flow.h \
 	brw_defines.h \
 	brw_device_info.c \
 	brw_device_info.h \
diff --git a/src/mesa/drivers/dri/i965/brw_dead_control_flow.h b/src/mesa/drivers/dri/i965/brw_dead_control_flow.h
deleted file mode 100644
index 83fd9b1..0000000
--- a/src/mesa/drivers/dri/i965/brw_dead_control_flow.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright © 2013 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-
-#include "brw_shader.h"
-
-bool dead_control_flow_eliminate(backend_shader *s);
diff --git a/src/mesa/drivers/dri/i965/brw_fs.cpp b/src/mesa/drivers/dri/i965/brw_fs.cpp
index 7c7cb0d..8295f46 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs.cpp
@@ -44,7 +44,6 @@
 #include "brw_fs.h"
 #include "brw_cs.h"
 #include "brw_cfg.h"
-#include "brw_dead_control_flow.h"
 #include "main/uniforms.h"
 #include "brw_fs_live_variables.h"
 #include "glsl/glsl_types.h"
diff --git a/src/mesa/drivers/dri/i965/brw_shader.h b/src/mesa/drivers/dri/i965/brw_shader.h
index ca0c635..d92a773 100644
--- a/src/mesa/drivers/dri/i965/brw_shader.h
+++ b/src/mesa/drivers/dri/i965/brw_shader.h
@@ -304,6 +304,7 @@ bool brw_saturate_immediate(enum brw_reg_type type, struct brw_reg *reg);
 bool brw_negate_immediate(enum brw_reg_type type, struct brw_reg *reg);
 bool brw_abs_immediate(enum brw_reg_type type, struct brw_reg *reg);
 
+bool dead_control_flow_eliminate(struct backend_shader *s);
 bool opt_predicate_block(struct backend_shader *s);
 
 #ifdef __cplusplus
diff --git a/src/mesa/drivers/dri/i965/brw_vec4.cpp b/src/mesa/drivers/dri/i965/brw_vec4.cpp
index cf22340..246cb6f 100644
--- a/src/mesa/drivers/dri/i965/brw_vec4.cpp
+++ b/src/mesa/drivers/dri/i965/brw_vec4.cpp
@@ -27,7 +27,6 @@
 #include "brw_vs.h"
 #include "brw_nir.h"
 #include "brw_vec4_live_variables.h"
-#include "brw_dead_control_flow.h"
 
 extern "C" {
 #include "main/macros.h"
-- 
2.4.9