summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Berry <[email protected]>2012-04-29 21:50:22 -0700
committerPaul Berry <[email protected]>2012-05-10 10:30:01 -0700
commitea1274c9a6ab20a4a05371cf392953eb1d1c0f8b (patch)
tree1ac723263a1ca81a0b6cae0e3a6f7f39c2e5a3d9
parent20b153b9ca5e57aa0e20e992347ece56388e71e4 (diff)
i965/hiz: Convert gen{6,7}_hiz.c to C++
This patch converts the files gen6_hiz.c and gen7_hiz.c to C++, in preparation for expanding the HiZ code to support arbitrary blits. The new files are called gen6_blorp.cpp and gen7_blorp.cpp to reflect the expanded role that this code will serve--"blorp" stands for "BLit Or Resolve Pass". Reviewed-by: Chad Versace <[email protected]>
-rw-r--r--src/mesa/drivers/dri/i965/Makefile.sources6
-rw-r--r--src/mesa/drivers/dri/i965/gen6_blorp.cpp (renamed from src/mesa/drivers/dri/i965/gen6_hiz.c)0
-rw-r--r--src/mesa/drivers/dri/i965/gen7_blorp.cpp (renamed from src/mesa/drivers/dri/i965/gen7_hiz.c)0
3 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/Makefile.sources b/src/mesa/drivers/dri/i965/Makefile.sources
index c564d95d44b..c99a034a462 100644
--- a/src/mesa/drivers/dri/i965/Makefile.sources
+++ b/src/mesa/drivers/dri/i965/Makefile.sources
@@ -88,7 +88,6 @@ i965_C_FILES = \
gen6_clip_state.c \
gen6_depthstencil.c \
gen6_gs_state.c \
- gen6_hiz.c \
gen6_sampler_state.c \
gen6_scissor_state.c \
gen6_sf_state.c \
@@ -100,7 +99,6 @@ i965_C_FILES = \
gen7_cc_state.c \
gen7_clip_state.c \
gen7_disable.c \
- gen7_hiz.c \
gen7_misc_state.c \
gen7_sampler_state.c \
gen7_sf_state.c \
@@ -127,6 +125,8 @@ i965_CXX_FILES = \
brw_vec4_emit.cpp \
brw_vec4_copy_propagation.cpp \
brw_vec4_reg_allocate.cpp \
- brw_vec4_visitor.cpp
+ brw_vec4_visitor.cpp \
+ gen6_blorp.cpp \
+ gen7_blorp.cpp
i965_ASM_FILES =
diff --git a/src/mesa/drivers/dri/i965/gen6_hiz.c b/src/mesa/drivers/dri/i965/gen6_blorp.cpp
index 536bd7ed626..536bd7ed626 100644
--- a/src/mesa/drivers/dri/i965/gen6_hiz.c
+++ b/src/mesa/drivers/dri/i965/gen6_blorp.cpp
diff --git a/src/mesa/drivers/dri/i965/gen7_hiz.c b/src/mesa/drivers/dri/i965/gen7_blorp.cpp
index 18272491be8..18272491be8 100644
--- a/src/mesa/drivers/dri/i965/gen7_hiz.c
+++ b/src/mesa/drivers/dri/i965/gen7_blorp.cpp