projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mesa_7_6_branch'
[mesa.git]
/
src
/
gallium
/
drivers
/
nv10
/
nv10_fragtex.c
diff --git
a/src/gallium/drivers/nv10/nv10_fragtex.c
b/src/gallium/drivers/nv10/nv10_fragtex.c
index 238634d0bb45672a0fb556780a21abffaf316e6a..27f2f8758471064b7b689be1f0241de6e3279437 100644
(file)
--- a/
src/gallium/drivers/nv10/nv10_fragtex.c
+++ b/
src/gallium/drivers/nv10/nv10_fragtex.c
@@
-1,30
+1,5
@@
#include "nv10_context.h"
#include "nv10_context.h"
-
-static INLINE int log2i(int i)
-{
- int r = 0;
-
- if (i & 0xffff0000) {
- i >>= 16;
- r += 16;
- }
- if (i & 0x0000ff00) {
- i >>= 8;
- r += 8;
- }
- if (i & 0x000000f0) {
- i >>= 4;
- r += 4;
- }
- if (i & 0x0000000c) {
- i >>= 2;
- r += 2;
- }
- if (i & 0x00000002) {
- r += 1;
- }
- return r;
-}
+#include "nouveau/nouveau_util.h"
#define _(m,tf) \
{ \
#define _(m,tf) \
{ \