diff options
| author | Keith Whitwell <keithw@vmware.com> | 2009-09-03 15:16:25 +0100 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2009-09-03 15:16:25 +0100 |
| commit | 848ab8be8c34b00b2afe6120882f8c29f047ced5 (patch) | |
| tree | 2d98ed571eb6f1ce00d4f58f2598af987a0647c6 /src/gallium/auxiliary/util | |
| parent | 8b1ef3fa357f5bbd6d3f73714a86ce380b867a71 (diff) | |
aux/tgsi: pull back ureg work from 0.1 branch
Manual merge of ureg changes on the branch. Too much unrelated stuff
for a proper merge.
Diffstat (limited to 'src/gallium/auxiliary/util')
| -rw-r--r-- | src/gallium/auxiliary/util/u_math.h | 4 | ||||
| -rw-r--r-- | src/gallium/auxiliary/util/u_simple_shaders.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/util/u_math.h b/src/gallium/auxiliary/util/u_math.h index b0807c1339..4c6c2bc00e 100644 --- a/src/gallium/auxiliary/util/u_math.h +++ b/src/gallium/auxiliary/util/u_math.h @@ -374,6 +374,10 @@ unsigned ffs( unsigned u ) #define ffs __builtin_ffs #endif +#ifdef __MINGW32__ +#define ffs __builtin_ffs +#endif + /* Could also binary search for the highest bit. */ diff --git a/src/gallium/auxiliary/util/u_simple_shaders.c b/src/gallium/auxiliary/util/u_simple_shaders.c index d54a1d8c74..eb311d29f9 100644 --- a/src/gallium/auxiliary/util/u_simple_shaders.c +++ b/src/gallium/auxiliary/util/u_simple_shaders.c @@ -103,7 +103,7 @@ util_make_fragment_tex_shader(struct pipe_context *pipe) if (ureg == NULL) return NULL; - sampler = ureg_DECL_sampler( ureg ); + sampler = ureg_DECL_sampler( ureg, 0 ); tex = ureg_DECL_fs_input( ureg, TGSI_SEMANTIC_GENERIC, 0, |