diff --git a/ps3/main.c b/ps3/main.c index 5ec9812dcd..852248f643 100644 --- a/ps3/main.c +++ b/ps3/main.c @@ -101,7 +101,7 @@ static bool file_exists(const char * filename) return false; } -static void emulator_init_settings(void) +static void init_settings(void) { if(!file_exists(SYS_CONFIG_FILE)) { @@ -116,7 +116,7 @@ static void emulator_init_settings(void) //init_setting_uint("video_aspect_ratio", g_settings.video.aspect_ratio, ASPECT_RATIO_4_3); init_setting_int("video_smooth", g_settings.video.smooth, 1); init_setting_int("video_second_pass_smooth", g_settings.video.second_pass_smooth, 1); - //init_setting_char("video_cg_shader", g_settings.video.cg_shader_path, DEFAULT_SHADER_FILE); + init_setting_char("video_cg_shader", g_settings.video.cg_shader_path, DEFAULT_SHADER_FILE); //init_setting_char("video_second_pass_shader", g_settings.video.second_pass_shader, DEFAULT_SHADER_FILE); //init_setting_char("PS3General::Border", Settings.PS3CurrentBorder, DEFAULT_BORDER_FILE); //init_setting_uint("PS3General::PS3TripleBuffering",Settings.TripleBuffering, 1); @@ -223,6 +223,7 @@ int main(int argc, char *argv[]) #endif get_path_settings(return_to_MM); + init_settings(); ps3_video_init(); ps3_input_init(); diff --git a/ps3/pkg/USRDIR/borders/Menu/main-menu.jpg b/ps3/pkg/USRDIR/borders/Menu/main-menu.jpg new file mode 100644 index 0000000000..74c8cda189 Binary files /dev/null and b/ps3/pkg/USRDIR/borders/Menu/main-menu.jpg differ diff --git a/ps3/pkg/USRDIR/shaders/stock.cg b/ps3/pkg/USRDIR/shaders/stock.cg new file mode 100644 index 0000000000..c438e9969f --- /dev/null +++ b/ps3/pkg/USRDIR/shaders/stock.cg @@ -0,0 +1,45 @@ +/* + VERTEX_SHADER +*/ +void main_vertex +( + float4 position : POSITION, + float4 color : COLOR, + float2 texCoord : TEXCOORD0, + + uniform float4x4 modelViewProj, + + out float4 oPosition : POSITION, + out float4 oColor : COLOR, + out float2 otexCoord : TEXCOORD +) +{ + oPosition = mul(modelViewProj, position); + oColor = color; + otexCoord = texCoord; +} + + +/* + FRAGMENT SHADER +*/ +struct output +{ + float4 color : COLOR; +}; + +struct input +{ + float2 video_size; + float2 texture_size; + float2 output_size; +}; + + +output main_fragment(float2 texCoord : TEXCOORD0, uniform sampler2D decal : TEXUNIT0, uniform input IN) +{ + output OUT; + OUT.color = tex2D(decal, texCoord); + return OUT; +} +