nouveau: update object header

diff --git a/src/gallium/drivers/nouveau/nouveau_class.h b/src/gallium/drivers/nouveau/nouveau_class.h
index dc202086d2c6bfe9063eff9303deb49339ab0c1b..bf1e622d2c401e4e34502afa6e9317b2196d6f69 100644 (file)
--- a/src/gallium/drivers/nouveau/nouveau_class.h
+++ b/src/gallium/drivers/nouveau/nouveau_class.h
@@ -4249,6 +4249,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define   NV34TCL_VERTEX_ARRAY_FORMAT_TYPE_MASK                                                0x0000000f
 #define    NV34TCL_VERTEX_ARRAY_FORMAT_TYPE_FLOAT                                      0x00000002
 #define    NV34TCL_VERTEX_ARRAY_FORMAT_TYPE_UBYTE                                      0x00000004
+#define    NV34TCL_VERTEX_ARRAY_FORMAT_TYPE_USHORT                                     0x00000005
 #define   NV34TCL_VERTEX_ARRAY_FORMAT_SIZE_SHIFT                                       4
 #define   NV34TCL_VERTEX_ARRAY_FORMAT_SIZE_MASK                                                0x000000f0
 #define   NV34TCL_VERTEX_ARRAY_FORMAT_STRIDE_SHIFT                                     8
@@ -4963,12 +4964,12 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define  NV40TCL_VP_UPLOAD_INST(x)                                                     (0x00000b80+((x)*4))
 #define  NV40TCL_VP_UPLOAD_INST__SIZE                                                  0x00000004
 #define  NV40TCL_CLIP_PLANE_ENABLE                                                     0x00001478
-#define   NV40TCL_CLIP_PLANE_ENABLE_PLANE0                                             (1 <<  2)
-#define   NV40TCL_CLIP_PLANE_ENABLE_PLANE1                                             (1 <<  6)
-#define   NV40TCL_CLIP_PLANE_ENABLE_PLANE2                                             (1 << 10)
-#define   NV40TCL_CLIP_PLANE_ENABLE_PLANE3                                             (1 << 14)
-#define   NV40TCL_CLIP_PLANE_ENABLE_PLANE4                                             (1 << 18)
-#define   NV40TCL_CLIP_PLANE_ENABLE_PLANE5                                             (1 << 22)
+#define   NV40TCL_CLIP_PLANE_ENABLE_PLANE0                                             (1 <<  1)
+#define   NV40TCL_CLIP_PLANE_ENABLE_PLANE1                                             (1 <<  5)
+#define   NV40TCL_CLIP_PLANE_ENABLE_PLANE2                                             (1 <<  9)
+#define   NV40TCL_CLIP_PLANE_ENABLE_PLANE3                                             (1 << 13)
+#define   NV40TCL_CLIP_PLANE_ENABLE_PLANE4                                             (1 << 17)
+#define   NV40TCL_CLIP_PLANE_ENABLE_PLANE5                                             (1 << 21)
 #define  NV40TCL_POLYGON_STIPPLE_ENABLE                                                        0x0000147c
 #define  NV40TCL_POLYGON_STIPPLE_PATTERN(x)                                            (0x00001480+((x)*4))
 #define  NV40TCL_POLYGON_STIPPLE_PATTERN__SIZE                                         0x00000020
@@ -4990,6 +4991,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define   NV40TCL_VTXFMT_TYPE_MASK                                                     0x0000000f
 #define    NV40TCL_VTXFMT_TYPE_FLOAT                                                   0x00000002
 #define    NV40TCL_VTXFMT_TYPE_UBYTE                                                   0x00000004
+#define    NV40TCL_VTXFMT_TYPE_USHORT                                                  0x00000005
 #define   NV40TCL_VTXFMT_SIZE_SHIFT                                                    4
 #define   NV40TCL_VTXFMT_SIZE_MASK                                                     0x000000f0
 #define   NV40TCL_VTXFMT_STRIDE_SHIFT                                                  8

diff --git a/src/gallium/drivers/nv40/nv40_vbo.c b/src/gallium/drivers/nv40/nv40_vbo.c
index b66bf26afb33d416948e11d2bd28a815ea99d3ba..bc53924a6762cc37989d571b11f656db5362da4f 100644 (file)
--- a/src/gallium/drivers/nv40/nv40_vbo.c
+++ b/src/gallium/drivers/nv40/nv40_vbo.c
@@ -32,7 +32,7 @@ nv40_vbo_format_to_hw(enum pipe_format pipe, unsigned *fmt, unsigned *ncomp)
        case PIPE_FORMAT_R16G16_SSCALED:
        case PIPE_FORMAT_R16G16B16_SSCALED:
        case PIPE_FORMAT_R16G16B16A16_SSCALED:
-               *fmt = 5;
+               *fmt = NV40TCL_VTXFMT_TYPE_USHORT;
                break;
        default:
                pf_sprint_name(fs, pipe);