Mesa (master): nouveau: nv30: Remove useless variables fs, txp. Also do not change txf, as bit 13 is in the texture format

[Patrice Mandin]

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

Author: Patrice Mandin <patman...@gmail.com>
Date:   Fri Jan 15 22:29:13 2010 +0100

nouveau: nv30: Remove useless variables fs, txp. Also do not change txf, as bit 
13 is in the texture format

Signed-off-by: Patrice Mandin <patman...@gmail.com>

---

 src/gallium/drivers/nv30/nv30_fragtex.c |   10 +---------
 1 files changed, 1 insertions(+), 9 deletions(-)

diff --git a/src/gallium/drivers/nv30/nv30_fragtex.c 
b/src/gallium/drivers/nv30/nv30_fragtex.c
index 9893567..0cc3172 100644
--- a/src/gallium/drivers/nv30/nv30_fragtex.c
+++ b/src/gallium/drivers/nv30/nv30_fragtex.c
@@ -43,7 +43,6 @@ static struct nv30_texture_format *
 nv30_fragtex_format(uint pipe_format)
 {
        struct nv30_texture_format *tf = nv30_texture_formats;
-       char fs[128];
 
        while (tf->defined) {
                if (tf->pipe == pipe_format)
@@ -65,7 +64,7 @@ nv30_fragtex_build(struct nv30_context *nv30, int unit)
        struct nouveau_bo *bo = nouveau_bo(nv30mt->buffer);
        struct nv30_texture_format *tf;
        struct nouveau_stateobj *so;
-       uint32_t txf, txs , txp;
+       uint32_t txf, txs;
        unsigned tex_flags = NOUVEAU_BO_VRAM | NOUVEAU_BO_GART | NOUVEAU_BO_RD;
 
        tf = nv30_fragtex_format(pt->format);
@@ -97,13 +96,6 @@ nv30_fragtex_build(struct nv30_context *nv30, int unit)
                return NULL;
        }
 
-       if (!(pt->tex_usage & NOUVEAU_TEXTURE_USAGE_LINEAR)) {
-               txp = 0;
-       } else {
-               txp  = nv30mt->level[0].pitch;
-               txf |= (1<<13) /*FIXME: NV34TCL_TX_FORMAT_LINEAR ? */;
-       }
-
        txs = tf->swizzle;
 
        so = so_new(1, 8, 2);

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit