Mesa (master): i915g: Use tgsi_info from fragment shader instead

Jakob Bornecrantz wallbraker at kemper.freedesktop.org
Fri Mar 4 15:32:03 PST 2011


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

Author: Jakob Bornecrantz <wallbraker at gmail.com>
Date:   Fri Mar  4 23:57:16 2011 +0100

i915g: Use tgsi_info from fragment shader instead

---

 src/gallium/drivers/i915/i915_fpc_translate.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/src/gallium/drivers/i915/i915_fpc_translate.c b/src/gallium/drivers/i915/i915_fpc_translate.c
index cd8219e..b145b58 100644
--- a/src/gallium/drivers/i915/i915_fpc_translate.c
+++ b/src/gallium/drivers/i915/i915_fpc_translate.c
@@ -1176,17 +1176,14 @@ i915_translate_fragment_program( struct i915_context *i915,
 {
    struct i915_fp_compile *p;
    const struct tgsi_token *tokens = fs->state.tokens;
-   struct tgsi_shader_info info;
 
 #if 0
    tgsi_dump(tokens, 0);
 #endif
 
-   tgsi_scan_shader(tokens, &info);
-
    /* hw doesn't seem to like empty frag programs, even when the depth write
     * fixup gets emitted below - may that one is fishy, too? */
-   if (info.num_instructions == 1) {
+   if (fs->info.num_instructions == 1) {
       i915_use_passthrough_shader(fs);
 
       return;



More information about the mesa-commit mailing list