mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-30 07:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use CGP/GLSL-style format on Android and iOS.

Browse Source
This commit is contained in:
Themaister 2013-04-11 15:38:53 +02:00
parent d7c1957586
commit f4c89be017
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile.shaders
View File

@ -1,6 +1,6 @@
DOWNLOAD_SHADERS = 1
SHADER_DIR := media/shaders
SHADER_XML_DIR := media/shaders_xml
SHADER_GLSL_DIR := media/shaders_glsl
SHADER_DEST_PS3_DIR := ps3/pkg/USRDIR/cores/shaders
@ -39,7 +39,7 @@ ifeq ($(DOWNLOAD_SHADERS),1)
endif
convert-xml:
$(PYTHON) tools/cg2xml.py $(SHADER_DIR) $(SHADER_XML_DIR)
$(PYTHON) tools/cg2glsl.py $(SHADER_DIR) $(SHADER_GLSL_DIR)
deploy-ps3: checkout-shaders
@if test -d $(SHADER_DEST_PS3_DIR); then \

2
android/phoenix/src/org/retroarch/browser/ShaderActivity.java
View File

@ -11,7 +11,7 @@ public class ShaderActivity extends DirectoryActivity {
if (shaderDir.exists())
super.setStartDirectory(shaderDir.getAbsolutePath());
super.addAllowedExt(".shader");
super.addAllowedExt(".glsl");
super.setPathSettingKey("video_shader");
super.onCreate(savedInstanceState);
}

2
ios/RetroArch/settings/settings.m
View File

@ -161,7 +161,7 @@ static RASettingData* custom_action(NSString* action)
[NSArray arrayWithObjects:@"GPU Shader",
boolean_setting(config, @"video_shader_enable", @"Enable Shader", @"false"),
subpath_setting(config, @"video_shader", @"Shader", @"", shader_path, @"shader"),
subpath_setting(config, @"video_shader", @"Shader", @"", shader_path, @"glsl"),
nil],
[NSArray arrayWithObjects:@"Audio",