X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=gpsp.git;a=blobdiff_plain;f=video.c;h=4ea26964cab35ff6106dc6214cb036465d3a66fc;hp=8730650b5feecbe50a076240022dc1f96c324973;hb=HEAD;hpb=4cadce9738bb306c1c31cde89f91feb8132875cf diff --git a/video.c b/video.c index 8730650..4ea2696 100644 --- a/video.c +++ b/video.c @@ -18,6 +18,7 @@ */ #include "common.h" +#define WANT_FONT_BITS #include "font.h" #ifdef PSP_BUILD @@ -85,12 +86,14 @@ static void Ge_Finish_Callback(int id, void *arg) #define get_screen_pitch() \ screen_pitch \ -#elif defined(WIZ_BUILD) +#elif defined(POLLUX_BUILD) static u16 rot_buffer[240*4]; static u32 rot_lines_total = 4; static u32 rot_line_count = 0; +#ifdef WIZ_BUILD static char rot_msg_buff[64]; +#endif static u32 screen_offset = 0; static u16 *screen_pixels = NULL; @@ -102,6 +105,16 @@ const u32 screen_pitch = 320; #define get_screen_pitch() \ screen_pitch \ +#elif defined(PND_BUILD) || defined(RPI_BUILD) + +static u16 *screen_pixels = NULL; + +#define get_screen_pixels() \ + screen_pixels \ + +#define get_screen_pitch() \ + resolution_width \ + #else #ifdef GP2X_BUILD @@ -119,11 +132,11 @@ const u32 video_scale = 1; #endif -void render_scanline_conditional_tile(u32 start, u32 end, u16 *scanline, - u32 enable_flags, u32 dispcnt, u32 bldcnt, tile_layer_render_struct +static void render_scanline_conditional_tile(u32 start, u32 end, u16 *scanline, + u32 enable_flags, u32 dispcnt, u32 bldcnt, const tile_layer_render_struct *layer_renderers); -void render_scanline_conditional_bitmap(u32 start, u32 end, u16 *scanline, - u32 enable_flags, u32 dispcnt, u32 bldcnt, bitmap_layer_render_struct +static void render_scanline_conditional_bitmap(u32 start, u32 end, u16 *scanline, + u32 enable_flags, u32 dispcnt, u32 bldcnt, const bitmap_layer_render_struct *layer_renderers); #define no_op \ @@ -1001,23 +1014,18 @@ void render_scanline_conditional_bitmap(u32 start, u32 end, u16 *scanline, - -// Map widths and heights - -u32 map_widths[] = { 256, 512, 256, 512 }; -u32 map_heights[] = { 256, 256, 512, 512 }; +static const u32 map_widths[] = { 256, 512, 256, 512 }; // Build text scanline rendering functions. #define render_scanline_text_builder(combine_op, alpha_op) \ -void render_scanline_text_##combine_op##_##alpha_op(u32 layer, \ +static void render_scanline_text_##combine_op##_##alpha_op(u32 layer, \ u32 start, u32 end, void *scanline) \ { \ render_scanline_extra_variables_##combine_op##_##alpha_op(text); \ u32 bg_control = io_registers[REG_BG0CNT + layer]; \ u32 map_size = (bg_control >> 14) & 0x03; \ u32 map_width = map_widths[map_size]; \ - u32 map_height = map_heights[map_size]; \ u32 horizontal_offset = \ (io_registers[REG_BG0HOFS + (layer * 2)] + start) % 512; \ u32 vertical_offset = (io_registers[REG_VCOUNT] + \ @@ -1268,7 +1276,6 @@ void render_scanline_affine_##combine_op##_##alpha_op(u32 layer, \ u32 bg_control = io_registers[REG_BG0CNT + layer]; \ u32 current_pixel; \ s32 source_x, source_y; \ - u32 vcount = io_registers[REG_VCOUNT]; \ u32 pixel_x, pixel_y; \ u32 layer_offset = (layer - 2) * 8; \ s32 dx, dy; \ @@ -1277,7 +1284,7 @@ void render_scanline_affine_##combine_op##_##alpha_op(u32 layer, \ u32 map_pitch = map_size + 4; \ u8 *map_base = vram + (((bg_control >> 8) & 0x1F) * (1024 * 2)); \ u8 *tile_base = vram + (((bg_control >> 2) & 0x03) * (1024 * 16)); \ - u8 *tile_ptr; \ + u8 *tile_ptr = NULL; \ u32 map_offset, last_map_offset = (u32)-1; \ u32 i; \ render_scanline_dest_##alpha_op *dest_ptr = \ @@ -1465,13 +1472,11 @@ render_scanline_affine_builder(transparent, alpha); // Build bitmap scanline rendering functions. #define render_scanline_bitmap_builder(type, alpha_op, width, height) \ -void render_scanline_bitmap_##type##_##alpha_op(u32 start, u32 end, \ +static void render_scanline_bitmap_##type##_##alpha_op(u32 start, u32 end, \ void *scanline) \ { \ - u32 bg_control = io_registers[REG_BG2CNT]; \ u32 current_pixel; \ s32 source_x, source_y; \ - u32 vcount = io_registers[REG_VCOUNT]; \ s32 pixel_x, pixel_y; \ \ s32 dx = (s16)io_registers[REG_BG2PA]; \ @@ -1532,7 +1537,7 @@ render_scanline_bitmap_builder(mode5, normal, 160, 128); // Structs containing functions to render the layers for each mode, for // each render type. -tile_layer_render_struct tile_mode_renderers[3][4] = +static const tile_layer_render_struct tile_mode_renderers[3][4] = { { tile_layer_render_functions(text), tile_layer_render_functions(text), @@ -1548,7 +1553,7 @@ tile_layer_render_struct tile_mode_renderers[3][4] = } }; -bitmap_layer_render_struct bitmap_mode_renderers[3] = +static const bitmap_layer_render_struct bitmap_mode_renderers[3] = { bitmap_layer_render_functions(mode3), bitmap_layer_render_functions(mode4), @@ -1557,11 +1562,11 @@ bitmap_layer_render_struct bitmap_mode_renderers[3] = #define render_scanline_layer_functions_tile() \ - tile_layer_render_struct *layer_renderers = \ + const tile_layer_render_struct *layer_renderers = \ tile_mode_renderers[dispcnt & 0x07] \ #define render_scanline_layer_functions_bitmap() \ - bitmap_layer_render_struct *layer_renderers = \ + const bitmap_layer_render_struct *layer_renderers = \ bitmap_mode_renderers + ((dispcnt & 0x07) - 3) \ @@ -1573,8 +1578,8 @@ bitmap_layer_render_struct bitmap_mode_renderers[3] = + (tile_size_##color_depth * ((obj_width - 8) / 8)) \ -// Adjust the obj's starting point if it goes too far off the left edge of \ -// the screen. \ +// Adjust the obj's starting point if it goes too far off the left edge of +// the screen. #define obj_tile_right_offset_noflip(color_depth) \ tile_ptr += (partial_tile_offset / 8) * tile_size_##color_depth \ @@ -1834,14 +1839,13 @@ bitmap_layer_render_struct bitmap_mode_renderers[3] = #define obj_render_affine(combine_op, color_depth, alpha_op, map_space) \ { \ - s16 *params = oam_ram + (((obj_attribute_1 >> 9) & 0x1F) * 16); \ + s16 *params = (s16 *)oam_ram + (((obj_attribute_1 >> 9) & 0x1F) * 16); \ s32 dx = params[3]; \ s32 dmx = params[7]; \ s32 dy = params[11]; \ s32 dmy = params[15]; \ s32 source_x, source_y; \ s32 tile_x, tile_y; \ - u32 tile_offset; \ u32 tile_map_offset; \ s32 middle_x; \ s32 middle_y; \ @@ -1900,12 +1904,14 @@ bitmap_layer_render_struct bitmap_mode_renderers[3] = } \ } \ -u32 obj_width_table[] = { 8, 16, 32, 64, 16, 32, 32, 64, 8, 8, 16, 32 }; -u32 obj_height_table[] = { 8, 16, 32, 64, 8, 8, 16, 32, 16, 32, 32, 64 }; +static const u32 obj_width_table[] = + { 8, 16, 32, 64, 16, 32, 32, 64, 8, 8, 16, 32 }; +static const u32 obj_height_table[] = + { 8, 16, 32, 64, 8, 8, 16, 32, 16, 32, 32, 64 }; -u8 obj_priority_list[5][160][128]; -u32 obj_priority_count[5][160]; -u32 obj_alpha_count[160]; +static u8 obj_priority_list[5][160][128]; +static u32 obj_priority_count[5][160]; +static u32 obj_alpha_count[160]; // Build obj rendering functions @@ -1924,11 +1930,11 @@ u32 obj_alpha_count[160]; #define render_scanline_obj_extra_variables_color() \ - u32 dest; \ u32 pixel_combine = color_combine_mask(4) | (1 << 8) \ #define render_scanline_obj_extra_variables_alpha_obj(map_space) \ render_scanline_obj_extra_variables_color(); \ + u32 dest; \ if((pixel_combine & 0x00000200) == 0) \ { \ render_scanline_obj_color32_##map_space(priority, start, end, scanline); \ @@ -1943,7 +1949,8 @@ u32 obj_alpha_count[160]; #define render_scanline_obj_extra_variables_partial_alpha(map_space) \ render_scanline_obj_extra_variables_color(); \ - u32 base_pixel_combine = pixel_combine \ + u32 base_pixel_combine = pixel_combine; \ + u32 dest \ #define render_scanline_obj_extra_variables_copy(type) \ u32 bldcnt = io_registers[REG_BLDCNT]; \ @@ -2053,7 +2060,7 @@ u32 obj_alpha_count[160]; #define render_scanline_obj_builder(combine_op, alpha_op, map_space, \ partial_alpha_op) \ -void render_scanline_obj_##alpha_op##_##map_space(u32 priority, \ +static void render_scanline_obj_##alpha_op##_##map_space(u32 priority, \ u32 start, u32 end, render_scanline_dest_##alpha_op *scanline) \ { \ render_scanline_obj_extra_variables_##alpha_op(map_space); \ @@ -2117,7 +2124,7 @@ render_scanline_obj_builder(copy, copy_bitmap, 2D, no_partial_alpha); -void order_obj(u32 video_mode) +static void order_obj(u32 video_mode) { s32 obj_num, priority, row; s32 obj_x, obj_y; @@ -2125,14 +2132,8 @@ void order_obj(u32 video_mode) s32 obj_width, obj_height; u32 obj_priority; u32 obj_attribute_0, obj_attribute_1, obj_attribute_2; - s32 vcount = io_registers[REG_VCOUNT]; - u32 partial_tile_run, partial_tile_offset; - u32 pixel_run; u32 current_count; u16 *oam_ptr = oam_ram + 508; - u16 *dest_ptr; - u8 *tile_base = vram + 0x10000; - u8 *tile_ptr; for(priority = 0; priority < 5; priority++) { @@ -2224,7 +2225,7 @@ void order_obj(u32 video_mode) u32 layer_order[16]; u32 layer_count; -u32 order_layers(u32 layer_flags) +static void order_layers(u32 layer_flags) { s32 priority, layer_number; layer_count = 0; @@ -2269,7 +2270,7 @@ u32 order_layers(u32 layer_flags) #define fill_line_color_color32() \ #define fill_line_builder(type) \ -void fill_line_##type(u16 color, render_scanline_dest_##type *dest_ptr, \ +static void fill_line_##type(u16 color, render_scanline_dest_##type *dest_ptr,\ u32 start, u32 end) \ { \ fill_line_color_##type(); \ @@ -2403,7 +2404,7 @@ fill_line_builder(color32); #ifdef RENDER_COLOR16_NORMAL -#ifndef GP2X_BUILD +#ifndef ARM_ARCH void expand_normal(u16 *screen_ptr, u32 start, u32 end) { @@ -2432,7 +2433,10 @@ void expand_normal(u16 *screen_ptr, u32 start, u32 end) #endif -#ifndef GP2X_BUILD +void expand_blend(u32 *screen_src_ptr, u16 *screen_dest_ptr, + u32 start, u32 end); + +#ifndef ARM_ARCH void expand_blend(u32 *screen_src_ptr, u16 *screen_dest_ptr, u32 start, u32 end) @@ -2466,7 +2470,7 @@ void expand_blend(u32 *screen_src_ptr, u16 *screen_dest_ptr, // Blend scanline with white. -void expand_darken(u16 *screen_src_ptr, u16 *screen_dest_ptr, +static void expand_darken(u16 *screen_src_ptr, u16 *screen_dest_ptr, u32 start, u32 end) { u32 pixel_top; @@ -2482,7 +2486,7 @@ void expand_darken(u16 *screen_src_ptr, u16 *screen_dest_ptr, // Blend scanline with black. -void expand_brighten(u16 *screen_src_ptr, u16 *screen_dest_ptr, +static void expand_brighten(u16 *screen_src_ptr, u16 *screen_dest_ptr, u32 start, u32 end) { u32 pixel_top; @@ -2504,7 +2508,7 @@ void expand_brighten(u16 *screen_src_ptr, u16 *screen_dest_ptr, // Expand scanline such that if both top and bottom pass it's alpha, // if only top passes it's as specified, and if neither pass it's normal. -void expand_darken_partial_alpha(u32 *screen_src_ptr, u16 *screen_dest_ptr, +static void expand_darken_partial_alpha(u32 *screen_src_ptr, u16 *screen_dest_ptr, u32 start, u32 end) { s32 blend = 16 - (io_registers[REG_BLDY] & 0x1F); @@ -2528,7 +2532,7 @@ void expand_darken_partial_alpha(u32 *screen_src_ptr, u16 *screen_dest_ptr, } -void expand_brighten_partial_alpha(u32 *screen_src_ptr, u16 *screen_dest_ptr, +static void expand_brighten_partial_alpha(u32 *screen_src_ptr, u16 *screen_dest_ptr, u32 start, u32 end) { s32 blend = io_registers[REG_BLDY] & 0x1F; @@ -2763,7 +2767,7 @@ void expand_brighten_partial_alpha(u32 *screen_src_ptr, u16 *screen_dest_ptr, // Renders an entire scanline from 0 to 240, based on current color mode. -void render_scanline_tile(u16 *scanline, u32 dispcnt) +static void render_scanline_tile(u16 *scanline, u32 dispcnt) { u32 current_layer; u32 layer_order_pos; @@ -2774,9 +2778,8 @@ void render_scanline_tile(u16 *scanline, u32 dispcnt) render_condition_alpha, render_condition_fade, 0, 240); } -void render_scanline_bitmap(u16 *scanline, u32 dispcnt) +static void render_scanline_bitmap(u16 *scanline, u32 dispcnt) { - u32 bldcnt = io_registers[REG_BLDCNT]; render_scanline_layer_functions_bitmap(); u32 current_layer; u32 layer_order_pos; @@ -2895,8 +2898,8 @@ void render_scanline_bitmap(u16 *scanline, u32 dispcnt) // Render all of the BG and OBJ in a tiled scanline from start to end ONLY if // enable_flag allows that layer/OBJ. Also conditionally render color effects. -void render_scanline_conditional_tile(u32 start, u32 end, u16 *scanline, - u32 enable_flags, u32 dispcnt, u32 bldcnt, tile_layer_render_struct +static void render_scanline_conditional_tile(u32 start, u32 end, u16 *scanline, + u32 enable_flags, u32 dispcnt, u32 bldcnt, const tile_layer_render_struct *layer_renderers) { u32 current_layer; @@ -2912,8 +2915,8 @@ void render_scanline_conditional_tile(u32 start, u32 end, u16 *scanline, // Render the BG and OBJ in a bitmap scanline from start to end ONLY if // enable_flag allows that layer/OBJ. Also conditionally render color effects. -void render_scanline_conditional_bitmap(u32 start, u32 end, u16 *scanline, - u32 enable_flags, u32 dispcnt, u32 bldcnt, bitmap_layer_render_struct +static void render_scanline_conditional_bitmap(u32 start, u32 end, u16 *scanline, + u32 enable_flags, u32 dispcnt, u32 bldcnt, const bitmap_layer_render_struct *layer_renderers) { u32 current_layer; @@ -2957,7 +2960,7 @@ void render_scanline_conditional_bitmap(u32 start, u32 end, u16 *scanline, #define window_coords(window_number) \ u32 window_##window_number##_x1, window_##window_number##_x2; \ u32 window_##window_number##_y1, window_##window_number##_y2; \ - u32 window_##window_number##_enable; \ + u32 window_##window_number##_enable = 0; \ window_##window_number##_y1 = \ io_registers[REG_WIN##window_number##V] >> 8; \ window_##window_number##_y2 = \ @@ -3168,7 +3171,7 @@ void render_scanline_conditional_bitmap(u32 start, u32 end, u16 *scanline, } \ #define render_scanline_window_builder(type) \ -void render_scanline_window_##type(u16 *scanline, u32 dispcnt) \ +static void render_scanline_window_##type(u16 *scanline, u32 dispcnt) \ { \ u32 vcount = io_registers[REG_VCOUNT]; \ u32 winout = io_registers[REG_WINOUT]; \ @@ -3206,7 +3209,6 @@ void render_scanline_window_##type(u16 *scanline, u32 dispcnt) \ /* Just OBJ windows */ \ case 0x04: \ { \ - u32 window_obj_enable = winout >> 8; \ render_window_clip_obj(type, 0, 240); \ break; \ } \ @@ -3214,7 +3216,6 @@ void render_scanline_window_##type(u16 *scanline, u32 dispcnt) \ /* Window 0 and OBJ window */ \ case 0x05: \ { \ - u32 window_obj_enable = winout >> 8; \ u32 winin = io_registers[REG_WININ]; \ window_coords(0); \ render_window_multi(type, 0, obj); \ @@ -3224,7 +3225,6 @@ void render_scanline_window_##type(u16 *scanline, u32 dispcnt) \ /* Window 1 and OBJ window */ \ case 0x06: \ { \ - u32 window_obj_enable = winout >> 8; \ u32 winin = io_registers[REG_WININ]; \ window_coords(1); \ render_window_multi(type, 1, obj); \ @@ -3234,7 +3234,6 @@ void render_scanline_window_##type(u16 *scanline, u32 dispcnt) \ /* Window 0, 1, and OBJ window */ \ case 0x07: \ { \ - u32 window_obj_enable = winout >> 8; \ u32 winin = io_registers[REG_WININ]; \ window_coords(0); \ window_coords(1); \ @@ -3247,7 +3246,7 @@ void render_scanline_window_##type(u16 *scanline, u32 dispcnt) \ render_scanline_window_builder(tile); render_scanline_window_builder(bitmap); -u32 active_layers[6] = { 0x1F, 0x17, 0x1C, 0x14, 0x14, 0x14 }; +static const u32 active_layers[6] = { 0x1F, 0x17, 0x1C, 0x14, 0x14, 0x14 }; u32 small_resolution_width = 240; u32 small_resolution_height = 160; @@ -3257,11 +3256,9 @@ void update_scanline() { u32 pitch = get_screen_pitch(); u32 dispcnt = io_registers[REG_DISPCNT]; - u32 display_flags = (dispcnt >> 8) & 0x1F; u32 vcount = io_registers[REG_VCOUNT]; u16 *screen_offset = get_screen_pixels() + (vcount * pitch); u32 video_mode = dispcnt & 0x07; - u32 current_layer; // If OAM has been modified since the last scanline has been updated then // reorder and reprofile the OBJ lists. @@ -3361,7 +3358,7 @@ void flip_screen() } } -#elif defined(WIZ_BUILD) +#elif defined(POLLUX_BUILD) void flip_screen() { @@ -3370,6 +3367,8 @@ void flip_screen() { switch(screen_scale) { + case unscaled: + break; case scaled_aspect: upscale_aspect(gpsp_gp2x_screen, screen_pixels); break; @@ -3389,6 +3388,13 @@ no_clean: screen_pixels = (u16 *)gpsp_gp2x_screen + screen_offset; } +#elif defined(PND_BUILD) || defined(RPI_BUILD) + +void flip_screen() +{ + screen_pixels = fb_flip_screen(); +} + #else #define integer_scale_copy_2() \ @@ -3598,7 +3604,7 @@ void init_video() GE_CMD(NOP, 0); } -#elif defined(WIZ_BUILD) +#elif defined(WIZ_BUILD) || defined(PND_BUILD) || defined (RPI_BUILD) void init_video() { @@ -3631,6 +3637,7 @@ void init_video() video_scale_type screen_scale = scaled_aspect; video_scale_type current_scale = scaled_aspect; video_filter_type screen_filter = filter_bilinear; +video_filter_type2 screen_filter2 = filter2_none; #ifdef PSP_BUILD @@ -3732,7 +3739,7 @@ void clear_screen(u16 color) sceGuSync(0, 0); */ } -#elif defined(WIZ_BUILD) +#elif defined(POLLUX_BUILD) void video_resolution_large() { @@ -3793,6 +3800,46 @@ void clear_screen(u16 color) *p++ = col; } +#elif defined(PND_BUILD) || defined(RPI_BUILD) + +void video_resolution_large() +{ +#if defined (RPI_BUILD) + resolution_width = 480; +#else + resolution_width = 400; +#endif + resolution_height = 272; + + fb_set_mode(resolution_width, resolution_height, 1, 15, screen_filter, screen_filter2); + flip_screen(); + clear_screen(0); +} + +void video_resolution_small() +{ + resolution_width = 240; + resolution_height = 160; + + fb_set_mode(resolution_width, resolution_height, 3, screen_scale, screen_filter, screen_filter2); + flip_screen(); + clear_screen(0); +} + +void set_gba_resolution(video_scale_type scale) +{ + screen_scale = scale; +} + +void clear_screen(u16 color) +{ + u32 col = ((u32)color << 16) | color; + u32 *p = (u32 *)get_screen_pixels(); + int c = resolution_width * resolution_height / 2; + while (c-- > 0) + *p++ = col; +} + #else void video_resolution_large() @@ -3858,15 +3905,8 @@ void set_gba_resolution(video_scale_type scale) if(screen_scale != scale) { screen_scale = scale; - switch(scale) - { - case unscaled: - case scaled_aspect: - case fullscreen: - small_resolution_width = 240 * video_scale; - small_resolution_height = 160 * video_scale; - break; - } + small_resolution_width = 240 * video_scale; + small_resolution_height = 160 * video_scale; } } @@ -3900,17 +3940,18 @@ void blit_to_screen(u16 *src, u32 w, u32 h, u32 dest_x, u32 dest_y) u32 pitch = get_screen_pitch(); u16 *dest_ptr = get_screen_pixels() + dest_x + (dest_y * pitch); + s32 w1 = dest_x + w > pitch ? pitch - dest_x : w; u16 *src_ptr = src; - u32 line_skip = pitch - w; - u32 x, y; + s32 x, y; for(y = 0; y < h; y++) { - for(x = 0; x < w; x++, src_ptr++, dest_ptr++) + for(x = 0; x < w1; x++) { - *dest_ptr = *src_ptr; + dest_ptr[x] = src_ptr[x]; } - dest_ptr += line_skip; + src_ptr += w; + dest_ptr += pitch; } }