Changeset 724 for soft/giet_vm/applications/raycast

Timestamp:

Nov 21, 2015, 2:25:14 PM (9 years ago)

Author:

alain

Message:

Update graphical applications.

Location:

soft/giet_vm/applications/raycast

Files:

• disp.c (modified) (3 diffs)
• raycast.c (modified) (4 diffs)

soft/giet_vm/applications/raycast/disp.c

@@ -19 +19 @@
 
 extern unsigned char*  g_tex[5];
-extern unsigned char*  buf[2];
-extern void*           sts[2];
-extern unsigned int    cur_buf;
+extern unsigned char*  buf;
+extern void*           sts;
 extern unsigned int    slice_x;
 extern unsigned int    slice_count;
@@ -38 +37 @@
     int ymax = (y1 < FBUF_Y_SIZE ? y1 : FBUF_Y_SIZE);
 
-    for (; y < ymax; y++) {
+    for (; y < ymax; y++) 
+    {
         // Find texture coordinate
         int ty = (y - y0) * TEX_SIZE / (y1 - y0);
 
-        buf[cur_buf][y * FBUF_X_SIZE + x] = line[ty];
+        buf[y * FBUF_X_SIZE + x] = line[ty];
     }
 }
@@ -52 +52 @@
     int ymax = (y1 < FBUF_Y_SIZE ? y1 : FBUF_Y_SIZE);
 
-    for (; y < ymax; y++) {
-        buf[cur_buf][y * FBUF_X_SIZE + x] = color;
+    for (; y < ymax; y++) 
+    {
+        buf[y * FBUF_X_SIZE + x] = color;
     }
 }

soft/giet_vm/applications/raycast/raycast.c

@@ -9 +9 @@
 ///////////////////////
 
-unsigned char*           buf[2];             // one image per buffer
-void *                   sts[2];             // for fbf_cma
-unsigned int             cur_buf;            // current buffer
+unsigned char*           buf;                // one image buffer
+void *                   sts;                // buffer status
 volatile unsigned int    slice_x;            // slice index (shared)
 volatile unsigned int    slice_count;        // slice count (shared)
@@ -84 +83 @@
     sqt_lock_init( &slice_done_lock, w , h , p );
 
-    // Allocate buffers
-    buf[0] = malloc(FBUF_X_SIZE * FBUF_Y_SIZE);
-    buf[1] = malloc(FBUF_X_SIZE * FBUF_Y_SIZE);
-    sts[0] = malloc(64);
-    sts[1] = malloc(64);
+    // Allocate buffer and status for CMA
+    buf = malloc(FBUF_X_SIZE * FBUF_Y_SIZE);
+    sts = malloc(64);
 
-    // Initialize frame buffer and start Chained buffer DMA
+    // Get frame buffer ownership
     giet_fbf_alloc();
-    giet_fbf_cma_alloc();
-    giet_fbf_cma_init_buf(buf[0], buf[1], sts[0], sts[1]);
-    giet_fbf_cma_start(FBUF_X_SIZE * FBUF_Y_SIZE);
-    cur_buf = 0;
+    
+    // Get a CMA channel for one single user buffer
+    giet_fbf_cma_alloc( 1 );
+    
+    // Register the user buffer and status
+    giet_fbf_cma_init_buf( 0 , buf , sts );
+
+    // Start Chained buffer DMA
+    giet_fbf_cma_start();
 
     // Load textures
@@ -122 +124 @@
     }
 
-
-
     // Game main loop : display one frame 
     // and get one player move per iteration
     while ( game.exit == 0 ) 
     {
-        // initialise synchronisation variables
-        // this actually allows the render threads to make useful work
+        // check user buffer empty
+        giet_fbf_cma_check( 0 );
+
+        // re-initialise synchronisation variables 
+        // to start parallel synthesis
         slice_count = 0;
         slice_x     = 0;
 
-        // contribute to build current buffer
+        // contribute to synthesis 
         unsigned int slice;
         while ( dispRenderSlice( &slice ) );
@@ -140 +143 @@
         while (slice_count < FBUF_X_SIZE)  giet_tty_printf(" ");
 
-        // Flip buffer
-        giet_fbf_cma_display(cur_buf);
-        cur_buf = 1 - cur_buf;
+        // display image
+        giet_fbf_cma_display( 0 );
 
         // get new player position [x,y,dir]