Mesa (master): r300g: kill off r300_fragment_shader:: shadow_samplers and friends

Marek Olšák mareko at kemper.freedesktop.org
Wed Apr 14 02:48:34 UTC 2010


Module: Mesa
Branch: master
Commit: 36e0100e9e6afe7a00846514daffb8993dcc173e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=36e0100e9e6afe7a00846514daffb8993dcc173e

Author: Marek Olšák <maraeo at gmail.com>
Date:   Wed Apr 14 01:12:49 2010 +0200

r300g: kill off r300_fragment_shader::shadow_samplers and friends

---

 src/gallium/drivers/r300/r300_fs.c |    2 --
 src/gallium/drivers/r300/r300_fs.h |    7 -------
 2 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/src/gallium/drivers/r300/r300_fs.c b/src/gallium/drivers/r300/r300_fs.c
index 6af6028..f75d282 100644
--- a/src/gallium/drivers/r300/r300_fs.c
+++ b/src/gallium/drivers/r300/r300_fs.c
@@ -253,8 +253,6 @@ static void r300_translate_fragment_shader(
 
     r300_tgsi_to_rc(&ttr, tokens);
 
-    shader->shadow_samplers = compiler.Base.Program.ShadowSamplers;
-
     /**
      * Transform the program to support WPOS.
      *
diff --git a/src/gallium/drivers/r300/r300_fs.h b/src/gallium/drivers/r300/r300_fs.h
index 18da5f7..014703b 100644
--- a/src/gallium/drivers/r300/r300_fs.h
+++ b/src/gallium/drivers/r300/r300_fs.h
@@ -38,9 +38,6 @@ struct r300_fragment_shader_code {
      * compilation failure. */
     boolean dummy;
 
-    /* Bits 0-15: TRUE if it's a shadow sampler, FALSE otherwise. */
-    unsigned shadow_samplers;
-
     /* Numbers of constants for each type. */
     unsigned externals_count;
     unsigned immediates_count;
@@ -56,10 +53,6 @@ struct r300_fragment_shader {
     /* Parent class */
     struct pipe_shader_state state;
 
-    /* Bits 0-15: TRUE if it's a shadow sampler, FALSE otherwise.
-     * Initialized from the first compiled FS. */
-    unsigned shadow_samplers;
-
     /* Currently-bound fragment shader. */
     struct r300_fragment_shader_code* shader;
 




More information about the mesa-commit mailing list