Mesa (master): i965/fs: Make patch_discard_jumps_to_fb_writes return bool.
Matt Turner
mattst88 at kemper.freedesktop.org
Sun May 25 06:02:28 UTC 2014
Module: Mesa
Branch: master
Commit: b5fd762474fb7252e7e1158e6398c10f1a035b1a
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b5fd762474fb7252e7e1158e6398c10f1a035b1a
Author: Matt Turner <mattst88 at gmail.com>
Date: Fri May 16 13:06:45 2014 -0700
i965/fs: Make patch_discard_jumps_to_fb_writes return bool.
... to tell us whether it emitted any code. Will be used to determine
whether we need to skip an annotation for it.
Reviewed-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Juha-Pekka Heikkila <juhapekka.heikkila at gmail.com>
---
src/mesa/drivers/dri/i965/brw_fs.h | 4 ++--
src/mesa/drivers/dri/i965/brw_fs_generator.cpp | 5 +++--
src/mesa/drivers/dri/i965/gen8_fs_generator.cpp | 5 +++--
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_fs.h b/src/mesa/drivers/dri/i965/brw_fs.h
index 8acad2f..111e994 100644
--- a/src/mesa/drivers/dri/i965/brw_fs.h
+++ b/src/mesa/drivers/dri/i965/brw_fs.h
@@ -696,7 +696,7 @@ private:
struct brw_reg dst,
struct brw_reg surf_index);
- void patch_discard_jumps_to_fb_writes();
+ bool patch_discard_jumps_to_fb_writes();
struct brw_context *brw;
struct gl_context *ctx;
@@ -788,7 +788,7 @@ private:
struct brw_reg surf_index);
void generate_discard_jump(fs_inst *ir);
- void patch_discard_jumps_to_fb_writes();
+ bool patch_discard_jumps_to_fb_writes();
const struct brw_wm_prog_key *const key;
struct brw_wm_prog_data *prog_data;
diff --git a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp
index 0fcf527..132d5cd 100644
--- a/src/mesa/drivers/dri/i965/brw_fs_generator.cpp
+++ b/src/mesa/drivers/dri/i965/brw_fs_generator.cpp
@@ -59,11 +59,11 @@ fs_generator::~fs_generator()
{
}
-void
+bool
fs_generator::patch_discard_jumps_to_fb_writes()
{
if (brw->gen < 6 || this->discard_halt_patches.is_empty())
- return;
+ return false;
/* There is a somewhat strange undocumented requirement of using
* HALT, according to the simulator. If some channel has HALTed to
@@ -92,6 +92,7 @@ fs_generator::patch_discard_jumps_to_fb_writes()
}
this->discard_halt_patches.make_empty();
+ return true;
}
void
diff --git a/src/mesa/drivers/dri/i965/gen8_fs_generator.cpp b/src/mesa/drivers/dri/i965/gen8_fs_generator.cpp
index c4f9d85..d01b4d8 100644
--- a/src/mesa/drivers/dri/i965/gen8_fs_generator.cpp
+++ b/src/mesa/drivers/dri/i965/gen8_fs_generator.cpp
@@ -640,11 +640,11 @@ gen8_fs_generator::generate_discard_jump(fs_inst *ir)
HALT();
}
-void
+bool
gen8_fs_generator::patch_discard_jumps_to_fb_writes()
{
if (discard_halt_patches.is_empty())
- return;
+ return false;
/* There is a somewhat strange undocumented requirement of using
* HALT, according to the simulator. If some channel has HALTed to
@@ -673,6 +673,7 @@ gen8_fs_generator::patch_discard_jumps_to_fb_writes()
}
this->discard_halt_patches.make_empty();
+ return true;
}
/**
More information about the mesa-commit
mailing list