Small stuff

4 files changed, 18 insertions, 8 deletions

diff --git a/imageblit.c b/imageblit.c
index f09fb69..a393e37 100644
--- a/imageblit.c
+++ b/imageblit.c
@@ -7,7 +7,7 @@
 
 void imageblit_init(void)
 {
-	printf("--ImageBlit, init\n");
+	printf("-- ImageBlit, init\n");
 
 	SetSubchannel(NvSubImageBlit, NvImageBlit);
 
@@ -30,7 +30,7 @@ void imageblit_init(void)
 
 void imageblit_copy(int sx,int sy, int dx,int dy, int w,int h)
 {
-	printf("--ImageBlit, copy\n");
+	printf("-- ImageBlit, copy\n");
 
 	SetSubchannel(NvSubImageBlit, NvImageBlit);
 
diff --git a/main.c b/main.c
index b843482..42284f2 100644
--- a/main.c
+++ b/main.c
@@ -7,6 +7,7 @@
 #include "nouveau_class.h"
 
 #include "test_nops.h"
+#include "context_surface_2d.h"
 #include "imageblit.h"
 #include "tcl_init.h"
 #include "tcl_triangle.h"
@@ -33,14 +34,23 @@ int main(int argc, char **argv)
 	}
 
 	/*test_nops();*/
+	clip_rectangle_init();
+	context_surface_2d_init();
 
 	imageblit_init();
-	/*imageblit_copy(16,16, 100,100, 64, 64);*/
 
+	/* FIXME: this does not work */
+	/*imageblit_copy(viewport_x,viewport_y,
+		viewport_x+(viewport_w>>2),viewport_h+(viewport_h>>2),
+		viewport_w>>1, viewport_h>>2
+	);*/
+
+	/* mandatory, or we get PFIFO_CACHE_ERROR */
 	tcl_init();
 	/*tcl_clear();*/
 
-	tcl_triangle_fixed();
+	/* FIXME: none work atm */
+	/*tcl_triangle_fixed();*/
 	/*tcl_triangle_vtxattr();*/
 
 	printf("coincoin\n");
diff --git a/tcl_init.c b/tcl_init.c
index 46a9a3d..d201029 100644
--- a/tcl_init.c
+++ b/tcl_init.c
@@ -63,7 +63,7 @@ void tcl_init(void)
 {
 	int i;
 
-	printf("--TCL init\n");
+	printf("-- TCL init\n");
 
 	SetSubchannel(NvSubImageBlit, NvImageBlit);
 	SetSubchannel(NvSub3D, Nv3D);
@@ -387,7 +387,7 @@ void tcl_init(void)
 
 void tcl_clear(void)
 {
-	printf("--TCL clear buffers\n");
+	printf("-- TCL clear buffers\n");
 
 	SetSubchannel(NvSub3D, Nv3D);
 
diff --git a/tcl_triangle.c b/tcl_triangle.c
index c0b212c..064de67 100644
--- a/tcl_triangle.c
+++ b/tcl_triangle.c
@@ -7,7 +7,7 @@
 
 void tcl_triangle_fixed(void)
 {
-	printf("--TCL triangle, fixed pipe\n");
+	printf("-- TCL triangle, fixed pipe\n");
 
 	SetSubchannel(NvSub3D, Nv3D);
 
@@ -40,7 +40,7 @@ void tcl_triangle_fixed(void)
 
 void tcl_triangle_vtxattr(void)
 {
-	printf("--TCL triangle, vertex attribs\n");
+	printf("-- TCL triangle, vertex attribs\n");
 
 	SetSubchannel(NvSub3D, Nv3D);