More changes

3 files changed, 12 insertions, 9 deletions

diff --git a/imageblit.c b/imageblit.c
index 8eac789..8537d8a 100644
--- a/imageblit.c
+++ b/imageblit.c
@@ -15,7 +15,7 @@ void imageblit_init(void)
 	OUT_RING(NvSyncNotify);
 
 	BEGIN_RING(NvSubImageBlit, NV04_IMAGE_BLIT_SURFACE, 1);
-	OUT_RING  (NvCtxSurf2D);
+	OUT_RING(NvCtxSurf2D);
 	BEGIN_RING(NvSubImageBlit, NV04_IMAGE_BLIT_CLIP_RECTANGLE, 1);
 	OUT_RING(NvClipRect);
 	BEGIN_RING(NvSubImageBlit, NV04_IMAGE_BLIT_PATTERN, 1);
diff --git a/main.c b/main.c
index 891c9c0..c175e60 100644
--- a/main.c
+++ b/main.c
@@ -52,8 +52,8 @@ int main(int argc, char **argv)
 	/*tcl_clear();*/
 
 	/* FIXME: none work atm */
-	/*tcl_triangle_fixed();*/
-	/*tcl_triangle_vtxattr();*/
+	tcl_triangle_fixed();
+	tcl_triangle_vtxattr();
 
 	printf("coincoin\n");
 
diff --git a/tcl_init.c b/tcl_init.c
index d201029..96f5c2d 100644
--- a/tcl_init.c
+++ b/tcl_init.c
@@ -68,14 +68,13 @@ void tcl_init(void)
 	SetSubchannel(NvSubImageBlit, NvImageBlit);
 	SetSubchannel(NvSub3D, Nv3D);
 
-	BEGIN_RING(NvSub3D, NV34TCL_DMA_TEXTURE0, 2);
+	BEGIN_RING(NvSub3D, NV34TCL_DMA_TEXTURE0, 3);
 	OUT_RING(NvDmaFB);	/* beef0201 184 texture0 */
 	OUT_RING(NvDmaTT);	/* beef0202 188 texture1 */
+	OUT_RING(NvDmaFB);	/* beef0201 18c color1 */
 	BEGIN_RING(NvSub3D, NV34TCL_DMA_COLOR0, 2);
 	OUT_RING(NvDmaFB);	/* beef0201 194 color0 */
 	OUT_RING(NvDmaFB);	/* beef0201 198 zeta */
-	BEGIN_RING(NvSub3D, NV34TCL_DMA_COLOR1, 1);
-	OUT_RING(NvDmaFB);	/* beef0201 18c color1 */
 	BEGIN_RING(NvSub3D, NV34TCL_DMA_IN_MEMORY7, 1);
 	OUT_RING(NvDmaFB);	/* beef0201 1ac */
 
@@ -154,6 +153,10 @@ void tcl_init(void)
 	BEGIN_RING(NvSub3D, 0x1da4, 1);
 	OUT_RING(0);
 
+	/* ??? */
+	BEGIN_RING(NvSub3D, 0x234, 1);
+	OUT_RING(3);
+
 	BEGIN_RING(NvSub3D, NV34TCL_ALPHA_FUNC_ENABLE, 3);
 	OUT_RING(0);
 	OUT_RING(0x207);
@@ -318,9 +321,9 @@ void tcl_init(void)
 	OUT_RING(NV34TCL_ENGINE_FIXED);
 
 	BEGIN_RING(NvSub3D, NV34TCL_VIEWPORT_TRANSLATE_X, 4);
-	OUT_RINGf(viewport_w / 2.0);
-	OUT_RINGf(viewport_h / 2.0);
-	OUT_RINGf(0.5);
+	OUT_RINGf(viewport_w * 1.0);
+	OUT_RINGf(viewport_h * 1.0);
+	OUT_RINGf(0.0);
 	OUT_RINGf(0.0);
 	BEGIN_RING(NvSub3D, NV34TCL_VIEWPORT_SCALE_X, 4);
 	OUT_RINGf(viewport_w / 2.0);