notaz.gp2x.de
/
pcsx_rearmed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
psxbios: some missed malloc merge behavior
[pcsx_rearmed.git]
/
frontend
/
libretro.c
diff --git
a/frontend/libretro.c
b/frontend/libretro.c
index
0ed8533
..
7b29a23
100644
(file)
--- a/
frontend/libretro.c
+++ b/
frontend/libretro.c
@@
-91,7
+91,6
@@
static int vout_width = 256, vout_height = 240, vout_pitch = 256;
static int vout_fb_dirty;
static int psx_w, psx_h;
static bool vout_can_dupe;
static int vout_fb_dirty;
static int psx_w, psx_h;
static bool vout_can_dupe;
-static bool duping_enable;
static bool found_bios;
static bool display_internal_fps = false;
static unsigned frame_count = 0;
static bool found_bios;
static bool display_internal_fps = false;
static unsigned frame_count = 0;
@@
-246,7
+245,7
@@
static void set_vout_fb()
vout_pitch = vout_width;
if (environ_cb(RETRO_ENVIRONMENT_GET_CURRENT_SOFTWARE_FRAMEBUFFER, &fb)
&& fb.format == RETRO_PIXEL_FORMAT_RGB565
vout_pitch = vout_width;
if (environ_cb(RETRO_ENVIRONMENT_GET_CURRENT_SOFTWARE_FRAMEBUFFER, &fb)
&& fb.format == RETRO_PIXEL_FORMAT_RGB565
- && vout_can_dupe
&& duping_enable
)
+ && vout_can_dupe)
{
vout_buf_ptr = fb.data;
if (fb.pitch / 2 != vout_pitch && fb.pitch != vout_width * 2)
{
vout_buf_ptr = fb.data;
if (fb.pitch / 2 != vout_pitch && fb.pitch != vout_width * 2)
@@
-2102,23
+2101,23
@@
static void update_variables(bool in_flight)
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
{
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
{
- if (strcmp(var.value, "disabled") == 0)
- pl_rearmed_cbs.gpu_neon.enhancement_no_main = 0;
- else if (strcmp(var.value, "enabled") == 0)
+ if (strcmp(var.value, "enabled") == 0)
pl_rearmed_cbs.gpu_neon.enhancement_no_main = 1;
pl_rearmed_cbs.gpu_neon.enhancement_no_main = 1;
+ else
+ pl_rearmed_cbs.gpu_neon.enhancement_no_main = 0;
}
}
-#endif
var.value = NULL;
var.value = NULL;
- var.key = "pcsx_rearmed_
duping_enable
";
+ var.key = "pcsx_rearmed_
neon_enhancement_tex_adj
";
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
{
if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value)
{
- if (strcmp(var.value, "
dis
abled") == 0)
-
duping_enable = false
;
- else
if (strcmp(var.value, "enabled") == 0)
-
duping_enable = true
;
+ if (strcmp(var.value, "
en
abled") == 0)
+
pl_rearmed_cbs.gpu_neon.enhancement_tex_adj = 1
;
+ else
+
pl_rearmed_cbs.gpu_neon.enhancement_tex_adj = 0
;
}
}
+#endif
var.value = NULL;
var.key = "pcsx_rearmed_display_internal_fps";
var.value = NULL;
var.key = "pcsx_rearmed_display_internal_fps";
@@
-3093,7
+3092,7
@@
void retro_run(void)
frameskip_counter = 0;
}
frameskip_counter = 0;
}
- video_cb((vout_fb_dirty || !vout_can_dupe
|| !duping_enable
) ? vout_buf_ptr : NULL,
+ video_cb((vout_fb_dirty || !vout_can_dupe) ? vout_buf_ptr : NULL,
vout_width, vout_height, vout_pitch * 2);
vout_fb_dirty = 0;
}
vout_width, vout_height, vout_pitch * 2);
vout_fb_dirty = 0;
}