Merge pull request #16 from austriancoder/master

fix make gc2000 in src/replay

8 files changed, 13 insertions, 14 deletions

diff --git a/src/replay/Makefile b/src/replay/Makefile
index d3c5f4c..c50aeb2 100644
--- a/src/replay/Makefile
+++ b/src/replay/Makefile
@@ -7,7 +7,7 @@ LDFLAGS_ETNA = $(LDFLAGS) -L$(TOP)/etnaviv -letnaviv
 
 TARGETS =
 TARGETS_GC800 = cube cube_companion cube_etna ps_sandbox_etna etna_test cube_etna2
-TARGETS_GC2000 = cube_etna2_gc2000 empty_screen_gc2000 cube_gc2000 cube_companion_gc2000 cube_etna_gc2000
+TARGETS_GC880 = cube_etna2_gc880 empty_screen_gc880 cube_gc880 cube_companion_gc880 cube_etna_gc880
 COMPANION_OBJS = ../resources/companion_array.o ../resources/companion_mesh.o ../resources/companion_texture.o
 ETNA_OBJS = ../lib/etna_bswap.o
 
@@ -20,13 +20,13 @@ clean:
 # These specifically replay command streams for gc800, don't build them by default
 gc800: $(TARGETS_GC800)
 
-# These specifically replay command streams for gc2000, don't build them by default
-gc2000: $(TARGETS_GC2000)
+# These specifically replay command streams for gc880, don't build them by default
+gc880: $(TARGETS_GC880)
 
-empty_screen_gc2000: empty_screen_gc2000.o ../lib/write_bmp.o viv_raw.o
+empty_screen_gc880: empty_screen_gc880.o ../lib/write_bmp.o viv_raw.o
 	$(CC) $(CFLAGS) -o $@ $^  $(LDFLAGS)
 
-cube_gc2000: cube_gc2000.o ../lib/write_bmp.o viv_raw.o
+cube_gc880: cube_gc880.o ../lib/write_bmp.o viv_raw.o
 	$(CC) $(CFLAGS) -o $@ $^  $(LDFLAGS)
 
 cube: cube.o ../lib/write_bmp.o viv_raw.o
@@ -35,19 +35,19 @@ cube: cube.o ../lib/write_bmp.o viv_raw.o
 cube_companion: cube_companion.o viv_raw.o ../lib/write_bmp.o $(COMPANION_OBJS)
 	$(CC) $(CFLAGS) -o $@ $^  $(LDFLAGS)
 
-cube_companion_gc2000: cube_companion_gc2000.o ../lib/write_bmp.o viv_raw.o $(COMPANION_OBJS)
+cube_companion_gc880: cube_companion_gc880.o ../lib/write_bmp.o viv_raw.o $(COMPANION_OBJS)
 	$(CC) $(CFLAGS) -o $@ $^  $(LDFLAGS)
 
 cube_etna: cube_etna.o ../lib/write_bmp.o ../lib/esTransform.o viv_raw.o
 	$(CC) $(CFLAGS) -o $@ $^  $(LDFLAGS)
 
-cube_etna_gc2000: cube_etna_gc2000.o ../lib/write_bmp.o ../lib/esTransform.o viv_raw.o
+cube_etna_gc880: cube_etna_gc880.o ../lib/write_bmp.o ../lib/esTransform.o viv_raw.o
 	$(CC) $(CFLAGS) -o $@ $^  $(LDFLAGS)
 
 cube_etna2: cube_etna2.o ../lib/write_bmp.o ../lib/esTransform.o $(ETNA_OBJS)
 	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS_ETNA)
 
-cube_etna2_gc2000: cube_etna2_gc2000.o ../lib/write_bmp.o ../lib/esTransform.o $(ETNA_OBJS)
+cube_etna2_gc880: cube_etna2_gc880.o ../lib/write_bmp.o ../lib/esTransform.o $(ETNA_OBJS)
 	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS_ETNA)
 
 ps_sandbox_etna: ps_sandbox_etna.o ../lib/write_bmp.o ../lib/esTransform.o viv_raw.o
diff --git a/src/replay/companion_cmd_gc2000.h b/src/replay/companion_cmd_gc880.h
index 096da72..096da72 100644
--- a/src/replay/companion_cmd_gc2000.h
+++ b/src/replay/companion_cmd_gc880.h
diff --git a/src/replay/cube_cmd_gc2000.h b/src/replay/cube_cmd_gc880.h
index 23e887b..23e887b 100644
--- a/src/replay/cube_cmd_gc2000.h
+++ b/src/replay/cube_cmd_gc880.h
diff --git a/src/replay/cube_companion_gc2000.c b/src/replay/cube_companion_gc880.c
index 8b1ed6d..ec5157b 100644
--- a/src/replay/cube_companion_gc2000.c
+++ b/src/replay/cube_companion_gc880.c
@@ -13,7 +13,7 @@
 #include "viv_raw.h"
 #include "companion.h"
 
-#include "companion_cmd_gc2000.h"
+#include "companion_cmd_gc880.h"
 
 
 /* TODO: should actually update context as we go,
diff --git a/src/replay/cube_etna2_gc2000.c b/src/replay/cube_etna2_gc880.c
index 72bb2f7..72bb2f7 100644
--- a/src/replay/cube_etna2_gc2000.c
+++ b/src/replay/cube_etna2_gc880.c
diff --git a/src/replay/cube_etna_gc2000.c b/src/replay/cube_etna_gc880.c
index cbb0cae..974fb98 100644
--- a/src/replay/cube_etna_gc2000.c
+++ b/src/replay/cube_etna_gc880.c
@@ -25,7 +25,7 @@
 #define CMD_COMPARE
 
 #ifdef CMD_COMPARE
-#include "cube_cmd_gc2000.h"
+#include "cube_cmd_gc880.h"
 #endif
 /* TODO: should actually update context as we go,
    a context switch would currently revert state and likely result in corrupted rendering.
@@ -679,7 +679,7 @@ int main(int argc, char **argv)
         VIVS_PE_DEPTH_CONFIG_DEPTH_FUNC(COMPARE_FUNC_ALWAYS) |
         VIVS_PE_DEPTH_CONFIG_EARLY_Z |
         VIVS_PE_DEPTH_CONFIG_SUPER_TILED |
-        VIVS_PE_DEPTH_CONFIG_UNK24,
+        VIVS_PE_DEPTH_CONFIG_DISABLE_ZS,
         0x00000000/*0.0*/, 0x3f800000/*1.0*/, 0x477fff00/*65535.0*/});
     etna_set_state(cmdPtr, VIVS_PE_PIPE_DEPTH_ADDR(0), z_physical);
     etna_set_state(cmdPtr, VIVS_PE_DEPTH_ADDR, z_physical);
diff --git a/src/replay/cube_gc2000.c b/src/replay/cube_gc880.c
index e866837..7466932 100644
--- a/src/replay/cube_gc2000.c
+++ b/src/replay/cube_gc880.c
@@ -12,7 +12,7 @@
 #include "write_bmp.h"
 #include "viv_raw.h"
 
-#include "cube_cmd_gc2000.h"
+#include "cube_cmd_gc880.h"
 /* TODO: should actually update context as we go,
  *   a context switch would currently revert state and likely result in corrupted rendering.
  */
diff --git a/src/replay/empty_screen_gc2000.c b/src/replay/empty_screen_gc880.c
index 333c633..1027137 100644
--- a/src/replay/empty_screen_gc2000.c
+++ b/src/replay/empty_screen_gc880.c
@@ -13,7 +13,6 @@
 #include "viv_raw.h"
 
 #include "empty_screen_cmd.h"
-#include "etnaviv/etna.h"
 /* TODO: should actually update context as we go,
    a context switch would currently revert state and likely result in corrupted rendering.
  */
@@ -162,7 +161,7 @@ int main(int argc, char **argv)
         #ifdef DEBUG
         fprintf(stderr, "Error attaching to GPU\n");
         #endif
-        return ETNA_INTERNAL_ERROR;
+        exit(1);
     }
     else
     {