Changeset 9ce911d in mainline for uspace


Ignore:
Timestamp:
2017-06-02T20:06:13Z (8 years ago)
Author:
Martin Decky <martin@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
f98434b8
Parents:
7367c31
Message:

improve binary data packer

  • optional deflate compression
  • performance improvements
  • generate an assembly source, a header file and a C source with metadata (all there files are stored in an uncompressed ZIP archive first to workaround the inability of GNU Make to express a dependency rule with multiple targets)
Location:
uspace/app
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • uspace/app/barber/Makefile

    r7367c31 r9ce911d  
    4444MATH = y
    4545
     46IMG = image
     47IMGS = $(IMG)s
     48
    4649SOURCES = \
    4750        barber.c \
    48         images.s
     51        $(IMGS).s \
     52        $(IMGS)_desc.c
    4953
    5054IMAGES = \
    … …  
    8084        gfx/frame30.tga.gz
    8185
    82 PRE_DEPEND = images.s images.h
    83 EXTRA_CLEAN = images.s images.h
     86PRE_DEPEND = $(IMGS).s $(IMGS).h $(IMGS)_desc.c
     87EXTRA_CLEAN = $(IMGS).s $(IMGS).h $(IMGS)_desc.c $(IMGS).zip
    8488
    8589include $(USPACE_PREFIX)/Makefile.common
    8690
    87 images.s images.h: $(IMAGES)
    88         $(ROOT_PATH)/tools/mkarray.py images COMPOSITOR_IMAGES "$(AS_PROLOG)" $^
     91$(IMGS).s: $(IMGS).zip
     92        unzip -p $< $@ > $@
     93
     94$(IMGS).h: $(IMGS).zip
     95        unzip -p $< $@ > $@
     96
     97$(IMGS)_desc.c: $(IMGS).zip
     98        unzip -p $< $@ > $@
     99
     100$(IMGS).zip: $(IMAGES)
     101        $(ROOT_PATH)/tools/mkarray.py $(IMGS) $(IMG) "$(AS_PROLOG)" $^

  • uspace/app/barber/barber.c

    r7367c31 r9ce911d  
    5151#define NAME  "barber"
    5252
    53 #define FRAMES  30
     53#define FRAMES  IMAGES
    5454
    5555#define MIN_FPS  1
    … …  
    9999static bool decode_frames(void)
    100100{
    101         frames[0] = decode_tga_gz((void *) frame01_tga_gz, frame01_tga_gz_size, 0);
    102         frames[1] = decode_tga_gz((void *) frame02_tga_gz, frame02_tga_gz_size, 0);
    103         frames[2] = decode_tga_gz((void *) frame03_tga_gz, frame03_tga_gz_size, 0);
    104         frames[3] = decode_tga_gz((void *) frame04_tga_gz, frame04_tga_gz_size, 0);
    105         frames[4] = decode_tga_gz((void *) frame05_tga_gz, frame05_tga_gz_size, 0);
    106         frames[5] = decode_tga_gz((void *) frame06_tga_gz, frame06_tga_gz_size, 0);
    107         frames[6] = decode_tga_gz((void *) frame07_tga_gz, frame07_tga_gz_size, 0);
    108         frames[7] = decode_tga_gz((void *) frame08_tga_gz, frame08_tga_gz_size, 0);
    109         frames[8] = decode_tga_gz((void *) frame09_tga_gz, frame09_tga_gz_size, 0);
    110         frames[9] = decode_tga_gz((void *) frame10_tga_gz, frame10_tga_gz_size, 0);
    111         frames[10] = decode_tga_gz((void *) frame11_tga_gz, frame11_tga_gz_size, 0);
    112         frames[11] = decode_tga_gz((void *) frame12_tga_gz, frame12_tga_gz_size, 0);
    113         frames[12] = decode_tga_gz((void *) frame13_tga_gz, frame13_tga_gz_size, 0);
    114         frames[13] = decode_tga_gz((void *) frame14_tga_gz, frame14_tga_gz_size, 0);
    115         frames[14] = decode_tga_gz((void *) frame15_tga_gz, frame15_tga_gz_size, 0);
    116         frames[15] = decode_tga_gz((void *) frame16_tga_gz, frame16_tga_gz_size, 0);
    117         frames[16] = decode_tga_gz((void *) frame17_tga_gz, frame17_tga_gz_size, 0);
    118         frames[17] = decode_tga_gz((void *) frame18_tga_gz, frame18_tga_gz_size, 0);
    119         frames[18] = decode_tga_gz((void *) frame19_tga_gz, frame19_tga_gz_size, 0);
    120         frames[19] = decode_tga_gz((void *) frame20_tga_gz, frame20_tga_gz_size, 0);
    121         frames[20] = decode_tga_gz((void *) frame21_tga_gz, frame21_tga_gz_size, 0);
    122         frames[21] = decode_tga_gz((void *) frame22_tga_gz, frame22_tga_gz_size, 0);
    123         frames[22] = decode_tga_gz((void *) frame23_tga_gz, frame23_tga_gz_size, 0);
    124         frames[23] = decode_tga_gz((void *) frame24_tga_gz, frame24_tga_gz_size, 0);
    125         frames[24] = decode_tga_gz((void *) frame25_tga_gz, frame25_tga_gz_size, 0);
    126         frames[25] = decode_tga_gz((void *) frame26_tga_gz, frame26_tga_gz_size, 0);
    127         frames[26] = decode_tga_gz((void *) frame27_tga_gz, frame27_tga_gz_size, 0);
    128         frames[27] = decode_tga_gz((void *) frame28_tga_gz, frame28_tga_gz_size, 0);
    129         frames[28] = decode_tga_gz((void *) frame29_tga_gz, frame29_tga_gz_size, 0);
    130         frames[29] = decode_tga_gz((void *) frame30_tga_gz, frame30_tga_gz_size, 0);
    131        
    132         for (unsigned int frame = 0; frame < FRAMES; frame++) {
    133                 if (frames[frame] == NULL) {
    134                         printf("Unable to decode frame %u.\n", frame);
     101        for (unsigned int i = 0; i < FRAMES; i++) {
     102                frames[i] = decode_tga_gz(images[i].addr, images[i].size, 0);
     103                if (frames[i] == NULL) {
     104                        printf("Unable to decode frame %u.\n", i);
    135105                        return false;
    136106                }

  • uspace/app/vlaunch/Makefile

    r7367c31 r9ce911d  
    4343MATH = y
    4444
     45IMG = image
     46IMGS = $(IMG)s
     47
    4548SOURCES = \
    4649        vlaunch.c \
    47         images.s
     50        $(IMGS).s \
     51        $(IMGS)_desc.c
    4852
    4953IMAGES = \
    5054        gfx/helenos.tga
    5155
    52 PRE_DEPEND = images.s images.h
    53 EXTRA_CLEAN = images.s images.h
     56PRE_DEPEND = $(IMGS).s $(IMGS).h $(IMGS)_desc.c
     57EXTRA_CLEAN = $(IMGS).s $(IMGS).h $(IMGS)_desc.c $(IMGS).zip
    5458
    5559include $(USPACE_PREFIX)/Makefile.common
    5660
    57 images.s images.h: $(IMAGES)
    58         $(ROOT_PATH)/tools/mkarray.py images COMPOSITOR_IMAGES "$(AS_PROLOG)" $^
     61$(IMGS).s: $(IMGS).zip
     62        unzip -p $< $@ > $@
     63
     64$(IMGS).h: $(IMGS).zip
     65        unzip -p $< $@ > $@
     66
     67$(IMGS)_desc.c: $(IMGS).zip
     68        unzip -p $< $@ > $@
     69
     70$(IMGS).zip: $(IMAGES)
     71        $(ROOT_PATH)/tools/mkarray.py $(IMGS) $(IMG) "$(AS_PROLOG)" $^
Note: See TracChangeset for help on using the changeset viewer.