Mesa (gallium-0.1): Revert "tgsi: Dummy ureg_complement/ureg_modulate."

[Jose Fonseca]

Module: Mesa
Branch: gallium-0.1
Commit: f014769f3780b10042de9f77708888906e6b3254
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f014769f3780b10042de9f77708888906e6b3254

Author: José Fonseca <jfonseca at vmware.com>
Date:   Mon Aug 24 18:28:51 2009 +0100

Revert "tgsi: Dummy ureg_complement/ureg_modulate."

These deprecated D3D PS 1.x features are better handled explicitely.

This reverts commit ef5ba95e1913556834cdb623f62ab470dd4ed47a.

---

 src/gallium/auxiliary/tgsi/tgsi_ureg.h |   27 +--------------------------
 1 files changed, 1 insertions(+), 26 deletions(-)

diff --git a/src/gallium/auxiliary/tgsi/tgsi_ureg.h b/src/gallium/auxiliary/tgsi/tgsi_ureg.h
index 7f113d1..6b654c5 100644
--- a/src/gallium/auxiliary/tgsi/tgsi_ureg.h
+++ b/src/gallium/auxiliary/tgsi/tgsi_ureg.h
@@ -30,12 +30,7 @@
 
 #include "pipe/p_compiler.h"
 #include "pipe/p_shader_tokens.h"
-#include "pipe/p_debug.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-   
 struct ureg_program;
 
 /* Almost a tgsi_src_register, but we need to pull in the Absolute
@@ -421,14 +416,6 @@ ureg_scalar( struct ureg_src reg, int x )
    return ureg_swizzle(reg, x, x, x, x);
 }
 
-static INLINE struct ureg_src 
-ureg_complement( struct ureg_src reg )
-{
-   /* FIXME */
-   assert(0);
-   return reg;
-}
-
 static INLINE struct ureg_dst 
 ureg_writemask( struct ureg_dst reg,
                 unsigned writemask )
@@ -444,20 +431,11 @@ ureg_saturate( struct ureg_dst reg )
    return reg;
 }
 
-static INLINE struct ureg_dst 
-ureg_modulate( struct ureg_dst reg, unsigned modulate )
-{
-   /* FIXME */
-   assert(modulate == TGSI_MODULATE_1X);
-   return reg;
-}
-
 static INLINE struct ureg_dst
 ureg_dst( struct ureg_src src )
 {
    struct ureg_dst dst;
 
-   assert(src.File);
    dst.File      = src.File;
    dst.WriteMask = TGSI_WRITEMASK_XYZW;
    dst.Indirect  = src.Indirect;
@@ -474,7 +452,6 @@ ureg_src( struct ureg_dst dst )
 {
    struct ureg_src src;
 
-   assert(dst.File);
    src.File      = dst.File;
    src.SwizzleX  = TGSI_SWIZZLE_X;
    src.SwizzleY  = TGSI_SWIZZLE_Y;
@@ -489,8 +466,6 @@ ureg_src( struct ureg_dst dst )
    return src;
 }
 
-#ifdef __cplusplus
-}
-#endif
+
 
 #endif