This is rather ugly but as I couldn't think of anything better
for now and wanted to get the rest of the series under review,
I left it as it is.
Even though immediately surrounding code has tabs this piece is
written space-indented.
Signed-off-by: Topi Pohjolainen <topi.pohjolai...@intel.com>
---
src/mesa/drivers/dri/i965/brw_fs.h | 2 ++
src/mesa/drivers/dri/i965/brw_fs_generator.cpp | 6 ++++--
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_fs.h
b/src/mesa/drivers/dri/i965/brw_fs.h
index 2137aee..cb802e3 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.h
+++ b/src/mesa/drivers/dri/i965/brw_fs.h
@@ -514,6 +514,8 @@ public:
bool dump_enabled = false,
FILE *dump_file = stdout);
+ bool no_2nd_half_ctrl;
+
private:
void generate_code(exec_list *instructions, bool dump_enabled,
FILE *dump_file);
diff --git a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp
b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp
index 16c08b0..36121ca 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp
@@ -42,7 +42,8 @@ fs_generator::fs_generator(struct brw_context *brw,
struct gl_fragment_program *fp,
bool dual_source_output)
- : brw(brw), c(c), prog(prog), fp(fp), dual_source_output(dual_source_output)
+ : no_2nd_half_ctrl(false), brw(brw), c(c), prog(prog), fp(fp),
+ dual_source_output(dual_source_output)
{
ctx = &brw->ctx;
@@ -1452,7 +1453,8 @@ fs_generator::generate_code(exec_list *instructions, bool
dump_enabled,
if (dispatch_width == 16 && !brw->is_haswell) {
brw_set_compression_control(p, BRW_COMPRESSION_NONE);
brw_LRP(p, dst, src[0], src[1], src[2]);
- brw_set_compression_control(p, BRW_COMPRESSION_2NDHALF);
+ if (!no_2nd_half_ctrl)
+ brw_set_compression_control(p, BRW_COMPRESSION_2NDHALF);
brw_LRP(p, sechalf(dst), sechalf(src[0]), sechalf(src[1]),
sechalf(src[2]));
brw_set_compression_control(p, BRW_COMPRESSION_COMPRESSED);
} else {
--
1.8.3.1
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
