aboutsummaryrefslogtreecommitdiff
path: root/frontend/menu.h
diff options
context:
space:
mode:
authornotaz2012-11-02 03:07:05 +0200
committernotaz2012-11-02 03:07:05 +0200
commit2857d72e4ca743bba3cf55e298949e24d97dff02 (patch)
tree3742f3cd7cb1c10fc42fc4b581fff9c4ead3d9ce /frontend/menu.h
parent0e53ec55691229fee1cbb7c23b305be6a59431c4 (diff)
parentbcb62992749a7f66e9a16a8022e090ff334c4424 (diff)
downloadpcsx_rearmed-2857d72e4ca743bba3cf55e298949e24d97dff02.tar.gz
pcsx_rearmed-2857d72e4ca743bba3cf55e298949e24d97dff02.tar.bz2
pcsx_rearmed-2857d72e4ca743bba3cf55e298949e24d97dff02.zip
Merge branch 'enhancement'
Conflicts: frontend/libretro.c
Diffstat (limited to 'frontend/menu.h')
-rw-r--r--frontend/menu.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/frontend/menu.h b/frontend/menu.h
index 2062acd..221be15 100644
--- a/frontend/menu.h
+++ b/frontend/menu.h
@@ -22,9 +22,15 @@ enum g_scaler_opts {
SCALE_CUSTOM,
};
+enum g_soft_filter_opts {
+ SOFT_FILTER_NONE,
+ SOFT_FILTER_SCALE2X,
+ SOFT_FILTER_EAGLE2X,
+};
+
extern int g_opts, g_scaler;
extern int soft_scaling, analog_deadzone;
-extern int filter;
+extern int filter, soft_filter;
extern int g_menuscreen_w;
extern int g_menuscreen_h;