Module: Mesa
Branch: nv50-compiler
Commit: 4baaf1d4c32053a191d8718e46dab95d25f119a5
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=4baaf1d4c32053a191d8718e46dab95d25f119a5

Author: Christoph Bumiller <[email protected]>
Date:   Sat Jul 24 21:18:51 2010 +0200

nv50: change back accidentally swapped UNORM,SNORM vertex type

---

 src/gallium/drivers/nouveau/nouveau_class.h |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/gallium/drivers/nouveau/nouveau_class.h 
b/src/gallium/drivers/nouveau/nouveau_class.h
index 975fd8f..f44979e 100644
--- a/src/gallium/drivers/nouveau/nouveau_class.h
+++ b/src/gallium/drivers/nouveau/nouveau_class.h
@@ -8949,8 +8949,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
SOFTWARE.
 #define   NV50TCL_VERTEX_ARRAY_ATTRIB_TYPE_SHIFT                               
        25
 #define   NV50TCL_VERTEX_ARRAY_ATTRIB_TYPE_MASK                                
                0x0e000000
 #define    NV50TCL_VERTEX_ARRAY_ATTRIB_TYPE_FLOAT                              
        0x0e000000
-#define    NV50TCL_VERTEX_ARRAY_ATTRIB_TYPE_UNORM                              
        0x02000000
-#define    NV50TCL_VERTEX_ARRAY_ATTRIB_TYPE_SNORM                              
        0x04000000
+#define    NV50TCL_VERTEX_ARRAY_ATTRIB_TYPE_SNORM                              
        0x02000000
+#define    NV50TCL_VERTEX_ARRAY_ATTRIB_TYPE_UNORM                              
        0x04000000
 #define    NV50TCL_VERTEX_ARRAY_ATTRIB_TYPE_USCALED                            
        0x0a000000
 #define    NV50TCL_VERTEX_ARRAY_ATTRIB_TYPE_SSCALED                            
        0x0c000000
 #define    NV50TCL_VERTEX_ARRAY_ATTRIB_TYPE_UINT                               
        0x08000000
@@ -9352,8 +9352,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
SOFTWARE.
 #define   NVC0TCL_VTX_ATTR_DEFINE_TYPE_SHIFT                                   
        16
 #define   NVC0TCL_VTX_ATTR_DEFINE_TYPE_MASK                                    
        0x000f0000
 #define    NVC0TCL_VTX_ATTR_DEFINE_TYPE_FLOAT                                  
        0x00070000
-#define    NVC0TCL_VTX_ATTR_DEFINE_TYPE_UNORM                                  
        0x00010000
-#define    NVC0TCL_VTX_ATTR_DEFINE_TYPE_SNORM                                  
        0x00020000
+#define    NVC0TCL_VTX_ATTR_DEFINE_TYPE_SNORM                                  
        0x00010000
+#define    NVC0TCL_VTX_ATTR_DEFINE_TYPE_UNORM                                  
        0x00020000
 #define    NVC0TCL_VTX_ATTR_DEFINE_TYPE_USCALED                                
                0x00050000
 #define    NVC0TCL_VTX_ATTR_DEFINE_TYPE_SSCALED                                
                0x00060000
 #define    NVC0TCL_VTX_ATTR_DEFINE_TYPE_UINT                                   
        0x00040000
@@ -9385,8 +9385,8 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
SOFTWARE.
 #define   NVC0TCL_VERTEX_ATTRIB_FORMAT_TYPE_SHIFT                              
        27
 #define   NVC0TCL_VERTEX_ATTRIB_FORMAT_TYPE_MASK                               
        0x78000000
 #define    NVC0TCL_VERTEX_ATTRIB_FORMAT_TYPE_FLOAT                             
        0x38000000
-#define    NVC0TCL_VERTEX_ATTRIB_FORMAT_TYPE_UNORM                             
        0x08000000
-#define    NVC0TCL_VERTEX_ATTRIB_FORMAT_TYPE_SNORM                             
        0x10000000
+#define    NVC0TCL_VERTEX_ATTRIB_FORMAT_TYPE_SNORM                             
        0x08000000
+#define    NVC0TCL_VERTEX_ATTRIB_FORMAT_TYPE_UNORM                             
        0x10000000
 #define    NVC0TCL_VERTEX_ATTRIB_FORMAT_TYPE_USCALED                           
        0x28000000
 #define    NVC0TCL_VERTEX_ATTRIB_FORMAT_TYPE_SSCALED                           
        0x30000000
 #define    NVC0TCL_VERTEX_ATTRIB_FORMAT_TYPE_UINT                              
        0x20000000

_______________________________________________
mesa-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to