Merge branch 'origin' into glsl-compiler-1

Conflicts:

	src/mesa/main/state.c
	src/mesa/shader/program.c
	src/mesa/shader/program.h
	src/mesa/shader/programopt.c
	src/mesa/shader/slang/slang_execute.c
	src/mesa/sources
	src/mesa/swrast/s_arbshader.c
	src/mesa/swrast/s_context.c
	src/mesa/swrast/s_span.c
	src/mesa/swrast/s_zoom.c
	src/mesa/tnl/t_context.c
	src/mesa/tnl/t_save_api.c
	src/mesa/tnl/t_vb_arbprogram.c
	src/mesa/tnl/t_vp_build.c
	src/mesa/tnl/t_vtx_eval.c

1 files changed, 44 insertions, 0 deletions

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_object.h b/src/mesa/drivers/dri/nouveau/nouveau_object.h
new file mode 100644
index 0000000000..daad281029
--- /dev/null
+++ b/src/mesa/drivers/dri/nouveau/nouveau_object.h
@@ -0,0 +1,44 @@
+#ifndef __NOUVEAU_OBJECT_H__
+#define __NOUVEAU_OBJECT_H__
+
+#include "nouveau_context.h"
+
+#define ALLOW_MULTI_SUBCHANNEL
+
+void nouveauObjectInit(nouveauContextPtr nmesa);
+
+enum DMAObjects {
+	Nv3D                    = 0x80000019,
+	NvCtxSurf2D		= 0x80000020,
+	NvImageBlit		= 0x80000021,
+	NvMemFormat		= 0x80000022,
+	NvCtxSurf3D		= 0x80000023,
+	NvDmaFB			= 0xD0FB0001,
+	NvDmaAGP		= 0xD0AA0001,
+	NvSyncNotify		= 0xD0000001,
+	NvQueryNotify		= 0xD0000002
+};
+
+enum DMASubchannel {
+	NvSubCtxSurf2D	= 0,
+	NvSubImageBlit	= 1,
+	NvSubMemFormat	= 2,
+	NvSubCtxSurf3D	= 3,
+	NvSub3D		= 7,
+};
+
+extern void nouveauObjectOnSubchannel(nouveauContextPtr nmesa, int subchannel, int handle);
+
+extern GLboolean nouveauCreateContextObject(nouveauContextPtr nmesa,
+      					    int handle, int class,
+					    uint32_t flags,
+					    uint32_t dma_in,
+					    uint32_t dma_out,
+					    uint32_t dma_notifier);
+extern GLboolean nouveauCreateDmaObject(nouveauContextPtr nmesa,
+      					uint32_t handle,
+					uint32_t offset,
+					uint32_t size,
+					int      target,
+					int      access);
+#endif