diff options
| author | Brian Paul <brianp@vmware.com> | 2009-10-05 14:42:08 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-10-05 14:42:08 -0600 |
| commit | 55770d09c18c4d33403abb97dfef4f897efbbe2a (patch) | |
| tree | 3f3cb2ea42c511c11e134c2d414367df82268cea /src/gallium/auxiliary/translate/translate_generic.c | |
| parent | f00da2a3ff59c1a7104ac25a1c6eba5a6050ad68 (diff) | |
| parent | 79892e7976fbb91ae426f5868d5f453e977c1f17 (diff) | |
Merge branch 'mesa_7_6_branch'
Conflicts:
src/gallium/auxiliary/util/u_cpu_detect.c
Diffstat (limited to 'src/gallium/auxiliary/translate/translate_generic.c')
| -rw-r--r-- | src/gallium/auxiliary/translate/translate_generic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/translate/translate_generic.c b/src/gallium/auxiliary/translate/translate_generic.c index 8d39b64c6c..266e7ee81e 100644 --- a/src/gallium/auxiliary/translate/translate_generic.c +++ b/src/gallium/auxiliary/translate/translate_generic.c @@ -217,7 +217,7 @@ ATTRIB( R8G8_SNORM, 2, char, FROM_8_SNORM, TO_8_SNORM ) ATTRIB( R8_SNORM, 1, char, FROM_8_SNORM, TO_8_SNORM ) ATTRIB( A8R8G8B8_UNORM, 4, ubyte, FROM_8_UNORM, TO_8_UNORM ) -//ATTRIB( R8G8B8A8_UNORM, 4, ubyte, FROM_8_UNORM, TO_8_UNORM ) +/*ATTRIB( R8G8B8A8_UNORM, 4, ubyte, FROM_8_UNORM, TO_8_UNORM )*/ ATTRIB( R32G32B32A32_FIXED, 4, int, FROM_32_FIXED, TO_32_FIXED ) ATTRIB( R32G32B32_FIXED, 3, int, FROM_32_FIXED, TO_32_FIXED ) |