From f4c89be0175a6afee8bfbe3d888a0d040fd36425 Mon Sep 17 00:00:00 2001 From: Themaister Date: Thu, 11 Apr 2013 15:38:53 +0200 Subject: [PATCH] Use CGP/GLSL-style format on Android and iOS. --- Makefile.shaders | 4 ++-- android/phoenix/src/org/retroarch/browser/ShaderActivity.java | 2 +- ios/RetroArch/settings/settings.m | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.shaders b/Makefile.shaders index c5304d6d1e..808e183842 100644 --- a/Makefile.shaders +++ b/Makefile.shaders @@ -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 \ diff --git a/android/phoenix/src/org/retroarch/browser/ShaderActivity.java b/android/phoenix/src/org/retroarch/browser/ShaderActivity.java index ada7355f13..eeabe60638 100644 --- a/android/phoenix/src/org/retroarch/browser/ShaderActivity.java +++ b/android/phoenix/src/org/retroarch/browser/ShaderActivity.java @@ -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); } diff --git a/ios/RetroArch/settings/settings.m b/ios/RetroArch/settings/settings.m index eff0010d1e..468fe5bb2e 100644 --- a/ios/RetroArch/settings/settings.m +++ b/ios/RetroArch/settings/settings.m @@ -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",