old demos: don't call etna_vidmem_unlock directly

16 files changed, 0 insertions, 111 deletions

diff --git a/src/fb_old/etna_test.c b/src/fb_old/etna_test.c
index 5abef5a..cf6f93c 100644
--- a/src/fb_old/etna_test.c
+++ b/src/fb_old/etna_test.c
@@ -499,13 +499,6 @@ int main(int argc, char **argv)
         fb_set_buffer(&fb, backbuffer);
         backbuffer = 1-backbuffer;
     }
-    
-    /* Unlock video memory */
-    if(etna_vidmem_unlock(conn, bmp) != 0)
-    {
-        fprintf(stderr, "Cannot unlock vidmem\n");
-        exit(1);
-    }
 
     etna_free(ctx);
     viv_close(conn);
diff --git a/src/fb_old/rotate_cube.c b/src/fb_old/rotate_cube.c
index 7340764..4226f83 100644
--- a/src/fb_old/rotate_cube.c
+++ b/src/fb_old/rotate_cube.c
@@ -631,13 +631,6 @@ int main(int argc, char **argv)
         fb_set_buffer(&fb, backbuffer);
         backbuffer = 1-backbuffer;
     }
-    
-    /* Unlock video memory */
-    if(etna_vidmem_unlock(conn, bmp) != 0)
-    {
-        fprintf(stderr, "Cannot unlock vidmem\n");
-        exit(1);
-    }
 
     etna_free(ctx);
     viv_close(conn);
diff --git a/src/replay/cube_etna2.c b/src/replay/cube_etna2.c
index 9ce91af..226b510 100644
--- a/src/replay/cube_etna2.c
+++ b/src/replay/cube_etna2.c
@@ -612,13 +612,6 @@ int main(int argc, char **argv)
     bmp_dump32(bmp->logical, width, height, false, "/tmp/fb.bmp");
     printf("Dump complete\n");
     
-    /* Unlock video memory */
-    if(etna_vidmem_unlock(conn, bmp) != 0)
-    {
-        fprintf(stderr, "Cannot unlock vidmem\n");
-        exit(1);
-    }
-
     etna_free(ctx);
     viv_close(conn);
     return 0;
diff --git a/src/replay/cube_etna2_gc2000.c b/src/replay/cube_etna2_gc2000.c
index 17ad316..f70feda 100644
--- a/src/replay/cube_etna2_gc2000.c
+++ b/src/replay/cube_etna2_gc2000.c
@@ -638,13 +638,6 @@ int main(int argc, char **argv)
     bmp_dump32(bmp->logical, width, height, false, "/home/linaro/fb.bmp");
     printf("Dump complete\n");
     
-    /* Unlock video memory */
-    if(etna_vidmem_unlock(conn, NULL, bmp) != 0)
-    {
-        fprintf(stderr, "Cannot unlock vidmem\n");
-        exit(1);
-    }
-
     etna_free(ctx);
     viv_close(conn);
     return 0;
diff --git a/src/replay/etna_test.c b/src/replay/etna_test.c
index de112f0..24daf79 100644
--- a/src/replay/etna_test.c
+++ b/src/replay/etna_test.c
@@ -471,12 +471,6 @@ int main(int argc, char **argv)
         printf("Dumping image to %s\n", argv[2]);
         bmp_dump32(bmp->logical, width, height, true, argv[2]);
     }
-    /* Unlock video memory */
-    if(etna_vidmem_unlock(conn, bmp) != 0)
-    {
-        fprintf(stderr, "Cannot unlock vidmem\n");
-        exit(1);
-    }
 
     etna_free(ctx);
     viv_close(conn);
diff --git a/src/test2d/bitblt2d.c b/src/test2d/bitblt2d.c
index ff5e14d..d9c5f7c 100644
--- a/src/test2d/bitblt2d.c
+++ b/src/test2d/bitblt2d.c
@@ -197,13 +197,6 @@ int main(int argc, char **argv)
     bmp_dump32(bmp->logical, width, height, false, "/tmp/fb.bmp");
     printf("Dump complete\n");
 
-    /* Unlock video memory */
-    if(etna_vidmem_unlock(conn, NULL, bmp) != 0)
-    {
-        fprintf(stderr, "Cannot unlock vidmem\n");
-        exit(1);
-    }
-
     etna_free(ctx);
     viv_close(conn);
     return 0;
diff --git a/src/test2d/bitblt2d_alpha.c b/src/test2d/bitblt2d_alpha.c
index ec7d635..461df19 100644
--- a/src/test2d/bitblt2d_alpha.c
+++ b/src/test2d/bitblt2d_alpha.c
@@ -226,13 +226,6 @@ int main(int argc, char **argv)
     bmp_dump32(bmp->logical, width, height, false, "/tmp/fb.bmp");
     printf("Dump complete\n");
 
-    /* Unlock video memory */
-    if(etna_vidmem_unlock(conn, NULL, bmp) != 0)
-    {
-        fprintf(stderr, "Cannot unlock vidmem\n");
-        exit(1);
-    }
-
     etna_free(ctx);
     viv_close(conn);
     return 0;
diff --git a/src/test2d/bitblt2d_from_stream.c b/src/test2d/bitblt2d_from_stream.c
index b5838fd..0831b2f 100644
--- a/src/test2d/bitblt2d_from_stream.c
+++ b/src/test2d/bitblt2d_from_stream.c
@@ -209,13 +209,6 @@ int main(int argc, char **argv)
     bmp_dump32_noflip(bmp->logical, width, height, true, "/tmp/fb.bmp");
     printf("Dump complete\n");
 
-    /* Unlock video memory */
-    if(etna_vidmem_unlock(conn, NULL, bmp) != 0)
-    {
-        fprintf(stderr, "Cannot unlock vidmem\n");
-        exit(1);
-    }
-
     etna_free(ctx);
     viv_close(conn);
     return 0;
diff --git a/src/test2d/bitblt2d_palette.c b/src/test2d/bitblt2d_palette.c
index 6439af2..3c36b4c 100644
--- a/src/test2d/bitblt2d_palette.c
+++ b/src/test2d/bitblt2d_palette.c
@@ -241,13 +241,6 @@ int main(int argc, char **argv)
     bmp_dump32_noflip(bmp->logical, width, height, true, "/tmp/fb.bmp");
     printf("Dump complete\n");
 
-    /* Unlock video memory */
-    if(etna_vidmem_unlock(conn, NULL, bmp) != 0)
-    {
-        fprintf(stderr, "Cannot unlock vidmem\n");
-        exit(1);
-    }
-
     etna_free(ctx);
     viv_close(conn);
     return 0;
diff --git a/src/test2d/bitblt2d_rotate.c b/src/test2d/bitblt2d_rotate.c
index fed6e5b..ebafcc3 100644
--- a/src/test2d/bitblt2d_rotate.c
+++ b/src/test2d/bitblt2d_rotate.c
@@ -205,13 +205,6 @@ int main(int argc, char **argv)
     bmp_dump32_noflip(bmp->logical, width, height, true, "/tmp/fb.bmp");
     printf("Dump complete\n");
 
-    /* Unlock video memory */
-    if(etna_vidmem_unlock(conn, NULL, bmp) != 0)
-    {
-        fprintf(stderr, "Cannot unlock vidmem\n");
-        exit(1);
-    }
-
     etna_free(ctx);
     viv_close(conn);
     return 0;
diff --git a/src/test2d/clear2d.c b/src/test2d/clear2d.c
index 1997303..4af8c5b 100644
--- a/src/test2d/clear2d.c
+++ b/src/test2d/clear2d.c
@@ -171,13 +171,6 @@ int main(int argc, char **argv)
     bmp_dump32(bmp->logical, width, height, false, "/tmp/fb.bmp");
     printf("Dump complete\n");
 
-    /* Unlock video memory */
-    if(etna_vidmem_unlock(conn, NULL, bmp) != 0)
-    {
-        fprintf(stderr, "Cannot unlock vidmem\n");
-        exit(1);
-    }
-
     etna_free(ctx);
     viv_close(conn);
     return 0;
diff --git a/src/test2d/filterblt2d.c b/src/test2d/filterblt2d.c
index 6ac5ac5..8051547 100644
--- a/src/test2d/filterblt2d.c
+++ b/src/test2d/filterblt2d.c
@@ -289,13 +289,6 @@ int main(int argc, char **argv)
     bmp_dump32_noflip(bmp->logical, width, height, true, "/tmp/fb.bmp");
     printf("Dump complete\n");
 
-    /* Unlock video memory */
-    if(etna_vidmem_unlock(conn, NULL, bmp) != 0)
-    {
-        fprintf(stderr, "Cannot unlock vidmem\n");
-        exit(1);
-    }
-
     etna_free(ctx);
     viv_close(conn);
     return 0;
diff --git a/src/test2d/filterblt2d_fromplanar.c b/src/test2d/filterblt2d_fromplanar.c
index 0defc89..fdcdfb8 100644
--- a/src/test2d/filterblt2d_fromplanar.c
+++ b/src/test2d/filterblt2d_fromplanar.c
@@ -363,13 +363,6 @@ int main(int argc, char **argv)
     bmp_dump32_noflip(bmp->logical, width, height, true, "/tmp/fb.bmp");
     printf("Dump complete\n");
 
-    /* Unlock video memory */
-    if(etna_vidmem_unlock(conn, NULL, bmp) != 0)
-    {
-        fprintf(stderr, "Cannot unlock vidmem\n");
-        exit(1);
-    }
-
     etna_free(ctx);
     viv_close(conn);
     return 0;
diff --git a/src/test2d/line2d.c b/src/test2d/line2d.c
index abb407a..e5b2b43 100644
--- a/src/test2d/line2d.c
+++ b/src/test2d/line2d.c
@@ -189,13 +189,6 @@ int main(int argc, char **argv)
     bmp_dump32(bmp->logical, width, height, false, "/tmp/fb.bmp");
     printf("Dump complete\n");
 
-    /* Unlock video memory */
-    if(etna_vidmem_unlock(conn, NULL, bmp) != 0)
-    {
-        fprintf(stderr, "Cannot unlock vidmem\n");
-        exit(1);
-    }
-
     etna_free(ctx);
     viv_close(conn);
     return 0;
diff --git a/src/test2d/line2d_patterned.c b/src/test2d/line2d_patterned.c
index a9f1d18..a7aaa2c 100644
--- a/src/test2d/line2d_patterned.c
+++ b/src/test2d/line2d_patterned.c
@@ -192,13 +192,6 @@ int main(int argc, char **argv)
     bmp_dump32(bmp->logical, width, height, false, "/tmp/fb.bmp");
     printf("Dump complete\n");
 
-    /* Unlock video memory */
-    if(etna_vidmem_unlock(conn, NULL, bmp) != 0)
-    {
-        fprintf(stderr, "Cannot unlock vidmem\n");
-        exit(1);
-    }
-
     etna_free(ctx);
     viv_close(conn);
     return 0;
diff --git a/src/test2d/stretchblt2d.c b/src/test2d/stretchblt2d.c
index 4e32697..2b34510 100644
--- a/src/test2d/stretchblt2d.c
+++ b/src/test2d/stretchblt2d.c
@@ -203,13 +203,6 @@ int main(int argc, char **argv)
     bmp_dump32(bmp->logical, width, height, false, "/tmp/fb.bmp");
     printf("Dump complete\n");
 
-    /* Unlock video memory */
-    if(etna_vidmem_unlock(conn, NULL, bmp) != 0)
-    {
-        fprintf(stderr, "Cannot unlock vidmem\n");
-        exit(1);
-    }
-
     etna_free(ctx);
     viv_close(conn);
     return 0;