From 297b3d633ad25797a4f355c57964b7ce3aee6936 Mon Sep 17 00:00:00 2001
From: notaz <notasas@gmail.com>
Date: Tue, 4 Jan 2011 19:40:25 +0200
Subject: [PATCH] try to ensure fbdev buffer is valid

---
 frontend/plugin_lib.c     | 15 +++++++++------
 frontend/plugin_lib.h     |  4 ++--
 plugins/gpu-gles/Makefile |  4 +++-
 plugins/gpu_unai/Makefile |  4 +++-
 plugins/gpu_unai/gpu.cpp  |  8 ++++++--
 5 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/frontend/plugin_lib.c b/frontend/plugin_lib.c
index 4e65e2e8..a458f0e7 100644
--- a/frontend/plugin_lib.c
+++ b/frontend/plugin_lib.c
@@ -62,7 +62,7 @@ static void print_cpu_usage(void)
 		pl_text_out16(pl_fbdev_w - 28, pl_fbdev_h - 10, "%3d", tick_per_sec);
 }
 
-int pl_fbdev_set_mode(int w, int h, int bpp)
+void *pl_fbdev_set_mode(int w, int h, int bpp)
 {
 	void *ret;
 
@@ -82,16 +82,19 @@ int pl_fbdev_set_mode(int w, int h, int bpp)
 
 	menu_notify_mode_change(w, h, bpp);
 
-	return (ret != NULL) ? 0 : -1;
+	return pl_fbdev_buf;
 }
 
 void *pl_fbdev_flip(void)
 {
 	flip_cnt++;
-	if (g_opts & OPT_SHOWFPS)
-		print_fps();
-	if (g_opts & OPT_SHOWCPU)
-		print_cpu_usage();
+
+	if (pl_fbdev_buf != NULL) {
+		if (g_opts & OPT_SHOWFPS)
+			print_fps();
+		if (g_opts & OPT_SHOWCPU)
+			print_cpu_usage();
+	}
 
 	// let's flip now
 	pl_fbdev_buf = vout_fbdev_flip(layer_fb);
diff --git a/frontend/plugin_lib.h b/frontend/plugin_lib.h
index f5c49851..53389d2d 100644
--- a/frontend/plugin_lib.h
+++ b/frontend/plugin_lib.h
@@ -22,7 +22,7 @@ enum {
 extern void *pl_fbdev_buf;
 
 int   pl_fbdev_open(void);
-int   pl_fbdev_set_mode(int w, int h, int bpp);
+void *pl_fbdev_set_mode(int w, int h, int bpp);
 void *pl_fbdev_flip(void);
 void  pl_fbdev_close(void);
 
@@ -31,7 +31,7 @@ void pl_text_out16(int x, int y, const char *texto, ...);
 struct rearmed_cbs {
 	void  (*pl_get_layer_pos)(int *x, int *y, int *w, int *h);
 	int   (*pl_fbdev_open)(void);
-	int   (*pl_fbdev_set_mode)(int w, int h, int bpp);
+	void *(*pl_fbdev_set_mode)(int w, int h, int bpp);
 	void *(*pl_fbdev_flip)(void);
 	void  (*pl_fbdev_close)(void);
 	int  *fskip_option;
diff --git a/plugins/gpu-gles/Makefile b/plugins/gpu-gles/Makefile
index fdefb08d..11101515 100644
--- a/plugins/gpu-gles/Makefile
+++ b/plugins/gpu-gles/Makefile
@@ -8,8 +8,10 @@ CROSS_COMPILE ?= arm-none-linux-gnueabi-
 #CC = $(PREFIX)/bin/$(CROSS_COMPILE)gcc
 CC = $(CROSS_COMPILE)gcc
 
-CFLAGS += -fPIC # -Wall
+CFLAGS += -fPIC -ggdb # -Wall
+ifndef DEBUG
 CFLAGS += -O3 -ffast-math -fomit-frame-pointer
+endif
 CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8
 # note: the below causes strange bugs/crashes
 #CFLAGS += -mfloat-abi=softfp
diff --git a/plugins/gpu_unai/Makefile b/plugins/gpu_unai/Makefile
index 92f7ade4..636c31bf 100644
--- a/plugins/gpu_unai/Makefile
+++ b/plugins/gpu_unai/Makefile
@@ -1,7 +1,9 @@
 CC = $(CROSS_COMPILE)gcc
 
-CFLAGS += -fPIC -Wall -DREARMED
+CFLAGS += -ggdb -fPIC -Wall -DREARMED
+ifndef DEBUG
 CFLAGS += -O2 -ffast-math -fomit-frame-pointer
+endif
 CFLAGS += -mcpu=cortex-a8 -mtune=cortex-a8 -mfpu=neon -mfloat-abi=softfp
 # -fschedule-insns (from -O2+) causes bugs, probably bad asm() statements
 CFLAGS += -fno-schedule-insns -fno-schedule-insns2
diff --git a/plugins/gpu_unai/gpu.cpp b/plugins/gpu_unai/gpu.cpp
index fa19b637..3e69aaa9 100644
--- a/plugins/gpu_unai/gpu.cpp
+++ b/plugins/gpu_unai/gpu.cpp
@@ -864,8 +864,8 @@ static void blit(void)
 	static s16 old_res_horz, old_res_vert, old_rgb24;
 	s16 isRGB24 = (GPU_GP1 & 0x00200000) ? 1 : 0;
 	s16 h0, x0, y0, w0, h1;
-	u8  *dest = (u8 *)screen_buf;
 	u16 *srcs;
+	u8  *dest;
 
 	x0 = DisplayArea[0] & ~3; // alignment needed by blitter
 	y0 = DisplayArea[1];
@@ -877,13 +877,17 @@ static void blit(void)
 	h1 = DisplayArea[5] - DisplayArea[4]; // display needed
 	if (h0 == 480) h1 = Min2(h1*2,480);
 
+	if (h1 <= 0)
+		return;
+
 	if (w0 != old_res_horz || h1 != old_res_vert || isRGB24 != old_rgb24)
 	{
 		old_res_horz = w0;
 		old_res_vert = h1;
 		old_rgb24 = (s16)isRGB24;
-		cbs->pl_fbdev_set_mode(w0, h1, isRGB24 ? 24 : 16);
+		screen_buf = cbs->pl_fbdev_set_mode(w0, h1, isRGB24 ? 24 : 16);
 	}
+	dest = (u8 *)screen_buf;
 
 	if (isRGB24)
 	{
-- 
2.39.2