Merge commit 'origin/gallium-0.1' into gallium-0.2

[mesa.git] / src / gallium / drivers / nouveau / nouveau_class.h

diff --git a/src/gallium/drivers/nouveau/nouveau_class.h b/src/gallium/drivers/nouveau/nouveau_class.h
index 18d8d3677db34b14011b54674193dad17e5ce707..c3d8d7539d1d09253f60066c7dc408e1b383e081 100644 (file)
--- a/src/gallium/drivers/nouveau/nouveau_class.h
+++ b/src/gallium/drivers/nouveau/nouveau_class.h
@@ -4643,8 +4643,6 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define  NV34TCL_VP_UPLOAD_CONST_W__SIZE                                               0x00000004
 #define  NV34TCL_UNK1f80(x)                                                            (0x00001f80+((x)*4))
 #define  NV34TCL_UNK1f80__SIZE                                                         0x00000010
-#define  NV34TCL_VP_ATTRIB_EN                                                          0x00001ff0
-#define  NV34TCL_VP_RESULT_EN                                                          0x00001ff4
 
 
 #define NV40_CONTEXT_SURFACES_2D                                                       0x00003062
@@ -5196,6 +5194,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #define    NV40TCL_TEX_FORMAT_FORMAT_A8L8                                              0x00000b00
 #define    NV40TCL_TEX_FORMAT_FORMAT_Z24                                               0x00001000
 #define    NV40TCL_TEX_FORMAT_FORMAT_Z16                                               0x00001200
+#define    NV40TCL_TEX_FORMAT_FORMAT_A16                                                0x00001400
 #define    NV40TCL_TEX_FORMAT_FORMAT_HILO8                                             0x00001800
 #define    NV40TCL_TEX_FORMAT_FORMAT_RGBA16F                                           0x00001a00
 #define    NV40TCL_TEX_FORMAT_FORMAT_RGBA32F                                           0x00001b00