Rename nouveau_tris.* to nouveau_swtcl.*

7 files changed, 14 insertions, 11 deletions

diff --git a/src/mesa/drivers/dri/nouveau/Makefile b/src/mesa/drivers/dri/nouveau/Makefile
index fc51205019..ee7bc5d317 100644
--- a/src/mesa/drivers/dri/nouveau/Makefile
+++ b/src/mesa/drivers/dri/nouveau/Makefile
@@ -16,7 +16,7 @@ DRIVER_SOURCES = \
 	nouveau_span.c           \
 	nouveau_state.c		 \
 	nouveau_tex.c            \
-	nouveau_tris.c           \
+	nouveau_swtcl.c          \
 	nv10_swtcl.c
 
 C_SOURCES = \
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_ioctl.c b/src/mesa/drivers/dri/nouveau/nouveau_ioctl.c
index 4530cf9133..46ac527f83 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_ioctl.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_ioctl.c
@@ -36,13 +36,12 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "nouveau_msg.h"
 
 // here we call the fifo initialization ioctl and fill in stuff accordingly
-void nouveauIoctlInitFifo()
+void nouveauIoctlInitFifo(nouveauContextPtr nmesa)
 {
 	int ret;
-	__DRIscreenPrivate *sPriv;
 	drm_nouveau_fifo_init_t fifo_init;
 
-	ret = drmCommandWriteRead(sPriv->fd, DRM_NOUVEAU_FIFO_INIT, &fifo_init, sizeof(fifo_init));
+	ret = drmCommandWriteRead(nmesa->driFd, DRM_NOUVEAU_FIFO_INIT, &fifo_init, sizeof(fifo_init));
 	if (ret)
 		FATAL("Fifo initialization ioctl failed (returned %d)\n",ret);
 	MESSAGE("Fifo init ok. Channel %d\n", fifo_init.channel);
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_ioctl.h b/src/mesa/drivers/dri/nouveau/nouveau_ioctl.h
index 3147265e90..ce77d3d11e 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_ioctl.h
+++ b/src/mesa/drivers/dri/nouveau/nouveau_ioctl.h
@@ -28,7 +28,9 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef __NOUVEAU_IOCTL_H__
 #define __NOUVEAU_IOCTL_H__
 
-extern void nouveauIoctlInitFifo();
+#include "nouveau_context.h"
+
+extern void nouveauIoctlInitFifo(nouveauContextPtr nmesa);
 extern void nouveauIoctlInitFunctions(struct dd_function_table *functions);
 
 #endif /* __NOUVEAU_IOCTL_H__ */
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_state.c b/src/mesa/drivers/dri/nouveau/nouveau_state.c
index b7f53ff957..417fd9fbcc 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_state.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_state.c
@@ -27,7 +27,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "nouveau_context.h"
 #include "nouveau_state.h"
 #include "nouveau_ioctl.h"
-#include "nouveau_tris.h"
+#include "nouveau_swtcl.h"
 #include "nouveau_fifo.h"
 
 #include "swrast/swrast.h"
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_tris.c b/src/mesa/drivers/dri/nouveau/nouveau_swtcl.c
index bb8ead3b23..7c7ba7374b 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_tris.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_swtcl.c
@@ -24,8 +24,10 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 **************************************************************************/
 
+/* Common software TCL code */
+
 #include "nouveau_context.h"
-#include "nouveau_tris.h"
+#include "nouveau_swtcl.h"
 #include "nv10_swtcl.h"
 #include "nouveau_span.h"
 #include "swrast/swrast.h"
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_tris.h b/src/mesa/drivers/dri/nouveau/nouveau_swtcl.h
index 950f662570..ba4d8725a6 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_tris.h
+++ b/src/mesa/drivers/dri/nouveau/nouveau_swtcl.h
@@ -26,8 +26,8 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 
 
-#ifndef __NOUVEAU_TRIS_H__
-#define __NOUVEAU_TRIS_H__
+#ifndef __NOUVEAU_SWTCL_H__
+#define __NOUVEAU_SWTCL_H__
 
 #include "nouveau_context.h"
 
@@ -50,6 +50,6 @@ extern void nouveauRunPipeline( GLcontext *ctx );
 extern void nouveauTriInitFunctions( GLcontext *ctx );
 
 
-#endif /* __NOUVEAU_TRIS_H__ */
+#endif /* __NOUVEAU_SWTCL_H__ */
 
 
diff --git a/src/mesa/drivers/dri/nouveau/nv10_swtcl.c b/src/mesa/drivers/dri/nouveau/nv10_swtcl.c
index af9f4fabf4..34546cc234 100644
--- a/src/mesa/drivers/dri/nouveau/nv10_swtcl.c
+++ b/src/mesa/drivers/dri/nouveau/nv10_swtcl.c
@@ -40,7 +40,7 @@
 #include "tnl/t_context.h"
 #include "tnl/t_pipeline.h"
 
-#include "nouveau_tris.h"
+#include "nouveau_swtcl.h"
 #include "nv10_swtcl.h"
 #include "nouveau_context.h"
 #include "nouveau_span.h"