From b4f2c7d9fe4bd34a4399c5240d9943f359017260 Mon Sep 17 00:00:00 2001 From: Ville Linde Date: Wed, 12 Jul 2006 16:18:04 +0000 Subject: [PATCH] --- core/r3d.c | 2 +- core/tilegen.h | 1 + osd_common/osd_common.h | 8 +++++--- ppc_drc/ppc_drc_ops.c | 1 + 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/core/r3d.c b/core/r3d.c index ee40a92..f885c98 100644 --- a/core/r3d.c +++ b/core/r3d.c @@ -150,7 +150,7 @@ void r3d_load_state(FILE *fp) fread(polygon_ram, sizeof(UINT8), 2*1024*1024, fp); fread(texture_ram, sizeof(UINT8), 2048*2048*2, fp); - osd_renderer_invalidate_textures(0, 0, 2048, 2048, texture_ram); + osd_renderer_invalidate_textures(0, 0, 0, 0, 2048, 2048, texture_ram, 0); } /******************************************************************/ diff --git a/core/tilegen.h b/core/tilegen.h index 225a361..2991a1e 100644 --- a/core/tilegen.h +++ b/core/tilegen.h @@ -37,6 +37,7 @@ extern void tilegen_write_32(UINT32, UINT32); extern BOOL tilegen_is_layer_enabled(int); extern UINT32 tilegen_get_layer_color_offset(int layer); +extern UINT32* tilegen_get_priority_buffer(void); extern void tilegen_save_state(FILE *); extern void tilegen_load_state(FILE *); diff --git a/osd_common/osd_common.h b/osd_common/osd_common.h index d6906e7..a306041 100644 --- a/osd_common/osd_common.h +++ b/osd_common/osd_common.h @@ -86,7 +86,7 @@ extern void osd_error(); /* Renderer */ /******************************************************************/ -extern void osd_renderer_invalidate_textures(UINT x, UINT y, UINT w, UINT h, UINT8 *texture_sheet); +extern void osd_renderer_invalidate_textures(UINT x, UINT y, int u, int v, UINT w, UINT h, UINT8 *texture_sheet, int miplevel); extern void osd_renderer_draw_model(UINT32 *, UINT32, BOOL); extern void osd_renderer_multiply_matrix(MATRIX); extern void osd_renderer_translate_matrix(float, float, float); @@ -97,11 +97,13 @@ extern void osd_renderer_set_viewport(const VIEWPORT *); extern void osd_renderer_set_coordinate_system(const MATRIX); extern void osd_renderer_clear(BOOL, BOOL); extern void osd_renderer_set_color_offset(BOOL, FLOAT32, FLOAT32, FLOAT32); -extern void osd_renderer_draw_layer(int layer, UINT32 color_offset); +extern void osd_renderer_draw_layer(int layer, UINT32 color_offset, int x, int y, BOOL top); extern void osd_renderer_get_layer_buffer(int layer_num, UINT8 **buffer, int *pitch); extern void osd_renderer_free_layer_buffer(UINT); -extern void osd_renderer_get_palette_buffer(UINT32 **, int *, int *); +extern void osd_renderer_get_palette_buffer(UINT32 **buffer, int *width, int *pitch); extern void osd_renderer_free_palette_buffer(void); +extern void osd_renderer_get_priority_buffer(int layer_num, UINT8 **buffer, int *pitch); +extern void osd_renderer_free_priority_buffer(int layer_num); extern void osd_renderer_blit(void); extern void osd_renderer_begin_3d_scene(void); extern void osd_renderer_end_3d_scene(void); diff --git a/ppc_drc/ppc_drc_ops.c b/ppc_drc/ppc_drc_ops.c index 00b11d3..05091ce 100644 --- a/ppc_drc/ppc_drc_ops.c +++ b/ppc_drc/ppc_drc_ops.c @@ -50,6 +50,7 @@ static UINT32 drc_recompile_block(void) } while (res == 0); // printf("Recompile block end: %08X\n", drc_pc); + return 0; } static UINT32 cr_flag_eq = 0x02;