This commit is contained in:
Themaister 2010-11-08 23:46:56 +01:00
parent c5f433f399
commit 79905252dd
4 changed files with 9 additions and 9 deletions

View File

@ -42,7 +42,7 @@ CFLAGS = -Wall -O3 -march=native -std=gnu99
all: $(TARGET) all: $(TARGET)
ssnes: $(OBJ) ssnes: $(OBJ)
@$(CXX) -o $@ $(OBJ) $(LIBS) @$(CXX) -o $@ $(OBJ) $(LIBS) $(CFLAGS)
@echo "LD $@" @echo "LD $@"
%.o: %.c config.h config.mk %.o: %.c config.h config.mk

View File

@ -76,7 +76,7 @@ static const bool force_aspect = true;
//////////////////////// ////////////////////////
// If you change this to something other than FILTER_NONE, make sure that you build the filter module in config.mk. // If you change this to something other than FILTER_NONE, make sure that you build the filter module in config.mk.
#define VIDEO_FILTER FILTER_NONE #define VIDEO_FILTER FILTER_NTSC
//////////////// ////////////////
@ -84,7 +84,7 @@ static const bool force_aspect = true;
//////////////// ////////////////
// Will enable audio or not. // Will enable audio or not.
static const bool audio_enable = true; static const bool audio_enable = false;
// Output samplerate // Output samplerate
static const unsigned out_rate = 48000; static const unsigned out_rate = 48000;

View File

@ -1,6 +1,6 @@
BUILD_OPENGL = 1 BUILD_OPENGL = 1
BUILD_FILTER = 0 BUILD_FILTER = 1
BUILD_RSOUND = 0 BUILD_RSOUND = 0
BUILD_OSS = 0 BUILD_OSS = 0

10
ssnes.c
View File

@ -251,23 +251,23 @@ static void video_frame(const uint16_t *data, unsigned width, unsigned height)
#if VIDEO_FILTER == FILTER_HQ2X #if VIDEO_FILTER == FILTER_HQ2X
ProcessHQ2x(output, outputHQ2x); ProcessHQ2x(output, outputHQ2x);
if ( !driver.video->frame(driver.video_data, outputHQ2x, width * 2, height * 2) ) if ( !driver.video->frame(driver.video_data, outputHQ2x, width << 1, height << 1, width << 2) )
video_active = false; video_active = false;
#elif VIDEO_FILTER == FILTER_HQ4X #elif VIDEO_FILTER == FILTER_HQ4X
ProcessHQ4x(output, outputHQ4x); ProcessHQ4x(output, outputHQ4x);
if ( !driver.video->frame(driver.video_data, outputHQ4x, width * 4, height * 4) ) if ( !driver.video->frame(driver.video_data, outputHQ4x, width << 2, height << 2, width << 3) )
video_active = false; video_active = false;
#elif VIDEO_FILTER == FILTER_GRAYSCALE #elif VIDEO_FILTER == FILTER_GRAYSCALE
grayscale_filter(output, width, height); grayscale_filter(output, width, height);
if ( !driver.video->frame(driver.video_data, output, width, height) ) if ( !driver.video->frame(driver.video_data, output, width, height, width << 1) )
video_active = false; video_active = false;
#elif VIDEO_FILTER == FILTER_BLEED #elif VIDEO_FILTER == FILTER_BLEED
bleed_filter(output, width, height); bleed_filter(output, width, height);
if ( !driver.video->frame(driver.video_data, output, width, height) ) if ( !driver.video->frame(driver.video_data, output, width, height, width << 1) )
video_active = false; video_active = false;
#elif VIDEO_FILTER == FILTER_NTSC #elif VIDEO_FILTER == FILTER_NTSC
ntsc_filter(output_ntsc, output, width, height); ntsc_filter(output_ntsc, output, width, height);
if ( !driver.video->frame(driver.video_data, output_ntsc, SNES_NTSC_OUT_WIDTH(width), height) ) if ( !driver.video->frame(driver.video_data, output_ntsc, SNES_NTSC_OUT_WIDTH(width), height, SNES_NTSC_OUT_WIDTH(width) << 1) )
video_active = false; video_active = false;
#else #else
if ( !driver.video->frame(driver.video_data, data, width, height, (height == 448 || height == 478) ? 1024 : 2048) ) if ( !driver.video->frame(driver.video_data, data, width, height, (height == 448 || height == 478) ? 1024 : 2048) )