Changeset 679 for soft

Timestamp:

Jul 29, 2015, 5:52:18 PM (9 years ago)

Author:

guerin

Message:

raycast: dynamically allocate framebuffer

With a 512x512 fb, the generated .elf file was too large for the FAT32
driver to load. Now that we can allocate aligned memory blocks, the .elf
size is greatly reduced.

Location:

soft/giet_vm/applications/raycast

Files:

• disp.c (modified) (6 diffs)
• raycast.py (modified) (2 diffs)

soft/giet_vm/applications/raycast/disp.c

@@ -14 +14 @@
 // Globals
 
-static unsigned char buf0[FBUF_X_SIZE * FBUF_Y_SIZE] __attribute__((aligned(64)));
-static unsigned char buf1[FBUF_X_SIZE * FBUF_Y_SIZE] __attribute__((aligned(64)));
-static unsigned int  sts0[16]  __attribute__((aligned(64)));
-static unsigned int  sts1[16]  __attribute__((aligned(64)));
-static unsigned int  cur_buf;
+static unsigned char* buf[2];
+static void *         sts[2];
+static unsigned int   cur_buf;
 
 // Textures indexed by block number
@@ -34 +32 @@
 static void dispDrawColumnTex(int x, int y0, int y1, unsigned char *tex, int tx)
 {
-    unsigned char* buf = (cur_buf == 0 ? buf0 : buf1);
     int y;
 
@@ -46 +43 @@
         int ty = (y - y0) * TEX_SIZE / (y1 - y0);
 
-        buf[y * FBUF_X_SIZE + x] = tex[ty * TEX_SIZE + tx];
+        buf[cur_buf][y * FBUF_X_SIZE + x] = tex[ty * TEX_SIZE + tx];
     }
 }
@@ -52 +49 @@
 static void dispDrawColumnSolid(int x, int y0, int y1, unsigned char color)
 {
-    unsigned char* buf = (cur_buf == 0 ? buf0 : buf1);
     int y;
 
@@ -62 +58 @@
             y = 0;
 
-        buf[y * FBUF_X_SIZE + x] = color;
+        buf[cur_buf][y * FBUF_X_SIZE + x] = color;
     }
 }
@@ -195 +191 @@
 void dispInit()
 {
+    // allocate framebuffer
+    buf[0] = almalloc(64, FBUF_X_SIZE * FBUF_Y_SIZE);
+    buf[1] = almalloc(64, FBUF_X_SIZE * FBUF_Y_SIZE);
+    sts[0] = almalloc(64, 64);
+    sts[1] = almalloc(64, 64);
+
     // initialize framebuffer
     giet_fbf_cma_alloc();
-    giet_fbf_cma_init_buf(buf0, buf1, sts0, sts1);
+    giet_fbf_cma_init_buf(buf[0], buf[1], sts[0], sts[1]);
     giet_fbf_cma_start(FBUF_X_SIZE * FBUF_Y_SIZE);
 

soft/giet_vm/applications/raycast/raycast.py

@@ -30 +30 @@
 
     heap_base  = 0x60000000 
-    heap_size  = 0x00008000     # 32 Kbytes
+    heap_size  = 0x00400000     # 4 Mbytes
 
     # create vspace
@@ -52 +52 @@
                      local = False, big = True )
 
-    # heap vseg (unused)            
+    # heap vseg
     mapping.addVseg( vspace, 'raycast_heap', heap_base, heap_size,
                      'C_WU', vtype = 'BUFFER', x = 0 , y = 0 , pseg = 'RAM',