currentConfig.KeyBinds[13] = 1<<5;
currentConfig.KeyBinds[15] = 1<<6;
currentConfig.KeyBinds[ 3] = 1<<7;
+ currentConfig.KeyBinds[12] = 1<<26; // switch rnd
currentConfig.KeyBinds[ 8] = 1<<27; // save state
currentConfig.KeyBinds[ 9] = 1<<28; // load state
currentConfig.PicoCDBuffers = 0;
if (fbimg_yoffs < 0) fbimg_yoffs = 0;
fbimg_offs = (fbimg_yoffs*512 + fbimg_xoffs) * 2; // dst is always 16bit
+ /*
lprintf("set_scaling_params:\n");
lprintf("offs: %i, %i\n", fbimg_xoffs, fbimg_yoffs);
lprintf("xy0, xy1: %i, %i; %i, %i\n", g_vertices[0].x, g_vertices[0].y, g_vertices[1].x, g_vertices[1].y);
lprintf("uv0, uv1: %i, %i; %i, %i\n", g_vertices[0].u, g_vertices[0].v, g_vertices[1].u, g_vertices[1].v);
+ */
}
-static void do_slowmode_pal(void)
+static void do_pal_update(int allow_sh)
{
unsigned int *spal=(void *)Pico.cram;
unsigned int *dpal=(void *)localPal;
for (i = 0x3f/2; i >= 0; i--)
dpal[i] = ((spal[i]&0x000f000f)<< 1)|((spal[i]&0x00f000f0)<<3)|((spal[i]&0x0f000f00)<<4);
- if (Pico.video.reg[0xC]&8) // shadow/hilight?
+ if (allow_sh && (Pico.video.reg[0xC]&8)) // shadow/hilight?
{
// shadowed pixels
for (i = 0x3f/2; i >= 0; i--)
- dpal[0x20|i] = dpal[0x60|i] = (spal[i]>>1)&0x738e738e;
+ dpal[0x20|i] = dpal[0x60|i] = (dpal[i]>>1)&0x738e738e;
// hilighted pixels
for (i = 0x3f; i >= 0; i--) {
int t=localPal[i]&0xe71c;t+=0x4208;
dynamic_palette = 0;
if (Pico.m.dirtyPal)
- do_slowmode_pal();
+ do_pal_update(1);
}
static int EmuScanSlow(unsigned int num, void *sdata)
do_slowmode_lines(num);
dynamic_palette = 1;
}
- do_slowmode_pal();
+ do_pal_update(1);
}
if (dynamic_palette) {
int offs = fbimg_offs;
offs += (psp_screen == VRAM_FB0) ? VRAMOFFS_FB0 : VRAMOFFS_FB1;
- sceKernelDcacheWritebackAll();
-
sceGuSync(0,0); // sync with prev
sceGuStart(GU_DIRECT, guCmdList);
sceGuDrawBuffer(GU_PSM_5650, (void *)offs, 512); // point to back buffer
}
if ((PicoOpt&0x10) && Pico.m.dirtyPal)
- {
- int i, *dpal = (void *)localPal, *spal = (int *)Pico.cram;
- for (i = 0x3f/2; i >= 0; i--)
- dpal[i] = ((spal[i]&0x000f000f)<< 1)|((spal[i]&0x00f000f0)<<3)|((spal[i]&0x0f000f00)<<4);
- localPal[0xe0] = 0;
- Pico.m.dirtyPal = 0;
- need_pal_upload = 1;
- }
+ do_pal_update(0);
+
+ sceKernelDcacheWritebackAll();
if (need_pal_upload) {
need_pal_upload = 0;
/* sound stuff */
-#define SOUND_BLOCK_SIZE_NTSC (2940*2) // 1024 // 1152
-#define SOUND_BLOCK_SIZE_PAL (3528*2)
+#define SOUND_BLOCK_SIZE_NTSC (1470*2) // 1024 // 1152
+#define SOUND_BLOCK_SIZE_PAL (1764*2)
#define SOUND_BLOCK_COUNT 4
static short __attribute__((aligned(4))) sndBuffer[SOUND_BLOCK_SIZE_PAL*SOUND_BLOCK_COUNT + 44100/50*2];
{
int ret;
- lprintf("sound_thread: started, priority %i\n", sceKernelGetThreadCurrentPriority());
+ lprintf("sthr: started, priority %i\n", sceKernelGetThreadCurrentPriority());
while (!sound_thread_exit)
{
if (samples_made - samples_done < samples_block) {
- // wait for data...
- //lprintf("sthr: wait... (%i/%i)\n", samples_done, samples_made);
- ret = sceKernelWaitSema(sound_sem, 1, 0);
+ // wait for data (use at least 2 blocks)
+ //lprintf("sthr: wait... (%i)\n", samples_made - samples_done);
+ while (samples_made - samples_done <= samples_block*2 && !sound_thread_exit)
+ ret = sceKernelWaitSema(sound_sem, 1, 0);
//lprintf("sthr: sceKernelWaitSema: %i\n", ret);
continue;
}
snd_playptr = sndBuffer;
if (ret)
lprintf("sthr: outf: %i; pos %i/%i\n", ret, samples_done, samples_made);
+
+ // shouln't happen, but just in case
+ if (samples_made - samples_done >= samples_block*3) {
+ //lprintf("block skip (%i)\n", samples_made - samples_done);
+ samples_done += samples_block; // skip
+ snd_playptr += samples_block;
+ }
+
}
lprintf("sthr: exit\n");
sound_sem = sceKernelCreateSema("sndsem", 0, 0, 1, NULL);
if (sound_sem < 0) lprintf("sceKernelCreateSema() failed: %i\n", sound_sem);
+ samples_made = samples_done = 0;
+ samples_block = SOUND_BLOCK_SIZE_NTSC; // make sure it goes to sema
sound_thread_exit = 0;
thid = sceKernelCreateThread("sndthread", sound_thread, 0x12, 0x10000, 0, NULL);
if (thid >= 0)
samples_made = samples_done = 0;
if (PsndRate != PsndRate_old || (PicoOpt&0x0b) != (PicoOpt_old&0x0b) || Pico.m.pal != pal_old) {
- sound_rerate(Pico.m.frame_count ? 1 : 0);
+ PsndRerate(Pico.m.frame_count ? 1 : 0);
}
stereo=(PicoOpt&8)>>3;
samples_block = Pico.m.pal ? SOUND_BLOCK_SIZE_PAL : SOUND_BLOCK_SIZE_NTSC;
- if (PsndRate == 22050) samples_block /= 2;
- else if (PsndRate == 11025) samples_block /= 4;
+ if (PsndRate <= 22050) samples_block /= 2;
sndBuffer_endptr = &sndBuffer[samples_block*SOUND_BLOCK_COUNT];
lprintf("starting audio: %i, len: %i, stereo: %i, pal: %i, block samples: %i\n",
static void sound_end(void)
{
- while (samples_made - samples_done >= samples_block || sceAudioOutput2GetRestSample() > 0)
+ samples_made = samples_done = 0;
+ while (sceAudioOutput2GetRestSample() > 0)
psp_msleep(100);
sceAudio_5C37C0AE();
}
{
sound_thread_exit = 1;
sceKernelSignalSema(sound_sem, 1);
+ sceKernelDeleteSema(sound_sem);
+ sound_sem = -1;
}
static void writeSound(int len)
// signal the snd thread
samples_made += len;
- if (samples_made - samples_done >= samples_block) {
+ if (samples_made - samples_done > samples_block*2) {
// lprintf("signal, %i/%i\n", samples_done, samples_made);
ret = sceKernelSignalSema(sound_sem, 1);
// lprintf("signal ret %i\n", ret);
vidResetMode();
- if (PicoOpt&0x10) {
- strcpy(noticeMsg, " 8bit fast renderer");
- } else if (currentConfig.EmuOpt&0x80) {
- strcpy(noticeMsg, "16bit accurate renderer");
- } else {
- strcpy(noticeMsg, " 8bit accurate renderer");
- }
+ if (PicoOpt&0x10)
+ strcpy(noticeMsg, "fast renderer");
+ else if (currentConfig.EmuOpt&0x80)
+ strcpy(noticeMsg, "accurate renderer");
noticeMsgTime = sceKernelGetSystemTimeLow();
}
int tval_diff;
tval = sceKernelGetSystemTimeLow();
tval_diff = (int)(tval - tval_thissec) << 8;
- if (tval_diff > lim_time)
+ if (tval_diff > lim_time && (frames_done/16 < frames_shown))
{
// no time left for this frame - skip
if (tval_diff - lim_time >= (300000<<8)) {
- /* something caused a slowdown for us (disk access? cache flush?)
- * try to recover by resetting timing... */
reset_timing = 1;
continue;
}
SRam.changed = 0;
}
- // draw a frame for bg..
- emu_forcedFrame();
+ // clear fps counters and stuff
+ memset32((int *)psp_video_get_active_fb() + 512*264*2/4, 0, 512*8*2/4);
}
notaz.gp2x.de / libpicofe.git / blobdiff