From ae56a1dd67040dc5d53f4a1622f775462f0fec05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6nig?= <deathsimple@vodafone.de>
Date: Thu, 26 May 2011 01:50:44 +0200
Subject: [g3dvl] implement mismatch control inside idct shaders

---
 src/gallium/auxiliary/vl/vl_mpeg12_bitstream.c | 15 ---------------
 1 file changed, 15 deletions(-)

(limited to 'src/gallium/auxiliary/vl/vl_mpeg12_bitstream.c')

diff --git a/src/gallium/auxiliary/vl/vl_mpeg12_bitstream.c b/src/gallium/auxiliary/vl/vl_mpeg12_bitstream.c
index 508bb9f..bf9b6cd 100644
--- a/src/gallium/auxiliary/vl/vl_mpeg12_bitstream.c
+++ b/src/gallium/auxiliary/vl/vl_mpeg12_bitstream.c
@@ -724,11 +724,9 @@ static inline void
 get_intra_block_B14(struct vl_mpg12_bs *bs, const int quant_matrix[64], int quantizer_scale, short *dest)
 {
    int i, val;
-   int mismatch;
    const DCTtab *tab;
 
    i = 0;
-   mismatch = ~dest[0];
 
    vl_vlc_needbits(&bs->vlc);
 
@@ -751,7 +749,6 @@ get_intra_block_B14(struct vl_mpg12_bs *bs, const int quant_matrix[64], int quan
 
          SATURATE (val);
          dest[i] = val;
-         mismatch ^= val;
 
          bs->vlc.buf <<= 1;
          vl_vlc_needbits(&bs->vlc);
@@ -778,7 +775,6 @@ get_intra_block_B14(struct vl_mpg12_bs *bs, const int quant_matrix[64], int quan
 
          SATURATE (val);
          dest[i] = val;
-         mismatch ^= val;
 
          vl_vlc_dumpbits(&bs->vlc, 12);
          vl_vlc_needbits(&bs->vlc);
@@ -811,7 +807,6 @@ get_intra_block_B14(struct vl_mpg12_bs *bs, const int quant_matrix[64], int quan
       break;	/* illegal, check needed to avoid buffer overflow */
    }
 
-   dest[63] ^= mismatch & 1;
    vl_vlc_dumpbits(&bs->vlc, 2);	/* dump end of block code */
 }
 
@@ -819,11 +814,9 @@ static inline void
 get_intra_block_B15(struct vl_mpg12_bs *bs, const int quant_matrix[64], int quantizer_scale, short *dest)
 {
    int i, val;
-   int mismatch;
    const DCTtab * tab;
 
    i = 0;
-   mismatch = ~dest[0];
 
    vl_vlc_needbits(&bs->vlc);
 
@@ -845,7 +838,6 @@ get_intra_block_B15(struct vl_mpg12_bs *bs, const int quant_matrix[64], int quan
 
             SATURATE (val);
             dest[i] = val;
-            mismatch ^= val;
 
             bs->vlc.buf <<= 1;
             vl_vlc_needbits(&bs->vlc);
@@ -871,7 +863,6 @@ get_intra_block_B15(struct vl_mpg12_bs *bs, const int quant_matrix[64], int quan
 
             SATURATE (val);
             dest[i] = val;
-            mismatch ^= val;
 
             vl_vlc_dumpbits(&bs->vlc, 12);
             vl_vlc_needbits(&bs->vlc);
@@ -905,7 +896,6 @@ get_intra_block_B15(struct vl_mpg12_bs *bs, const int quant_matrix[64], int quan
       break;	/* illegal, check needed to avoid buffer overflow */
    }
 
-   dest[63] ^= mismatch & 1;
    vl_vlc_dumpbits(&bs->vlc, 4);	/* dump end of block code */
 }
 
@@ -913,11 +903,9 @@ static inline void
 get_non_intra_block(struct vl_mpg12_bs *bs, const int quant_matrix[64], int quantizer_scale, short *dest)
 {
    int i, val;
-   int mismatch;
    const DCTtab *tab;
 
    i = -1;
-   mismatch = 1;
 
    vl_vlc_needbits(&bs->vlc);
    if (bs->vlc.buf >= 0x28000000) {
@@ -946,7 +934,6 @@ get_non_intra_block(struct vl_mpg12_bs *bs, const int quant_matrix[64], int quan
 
          SATURATE (val);
          dest[i] = val;
-         mismatch ^= val;
 
          bs->vlc.buf <<= 1;
          vl_vlc_needbits(&bs->vlc);
@@ -977,7 +964,6 @@ get_non_intra_block(struct vl_mpg12_bs *bs, const int quant_matrix[64], int quan
 
          SATURATE (val);
          dest[i] = val;
-         mismatch ^= val;
 
          vl_vlc_dumpbits(&bs->vlc, 12);
          vl_vlc_needbits(&bs->vlc);
@@ -1009,7 +995,6 @@ get_non_intra_block(struct vl_mpg12_bs *bs, const int quant_matrix[64], int quan
       }
       break;	/* illegal, check needed to avoid buffer overflow */
    }
-   dest[63] ^= mismatch & 1;
    vl_vlc_dumpbits(&bs->vlc, 2);	/* dump end of block code */
 }
 
-- 
cgit v1.1