msvc 2017 -- HAVE_ODROIDGO2 compile fixes

This commit is contained in:
trioan 2020-03-29 03:20:34 +00:00
parent 47067b691e
commit f466cc5143
2 changed files with 18 additions and 12 deletions

View File

@ -1581,13 +1581,13 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SHARED_CONTEXT,
"Activeer Gedeelde Hardware Context") "Activeer Gedeelde Hardware Context")
MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SMOOTH, MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SMOOTH,
"Bilinear Filtering") "Bilinear Filtering")
MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_CTX_SCALING,
#ifdef HAVE_ODROIDGO2 #ifdef HAVE_ODROIDGO2
"RGA Scaling" MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_CTX_SCALING,
"RGA Scaling")
#else #else
"Context Specific Scaling" MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_CTX_SCALING,
"Context Specific Scaling")
#endif #endif
)
MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SOFT_FILTER, MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SOFT_FILTER,
"Soft Filter Enable") "Soft Filter Enable")
MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SWAP_INTERVAL, MSG_HASH(MENU_ENUM_LABEL_VALUE_VIDEO_SWAP_INTERVAL,

View File

@ -4316,14 +4316,17 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_VIDEO_SMOOTH, MENU_ENUM_LABEL_VALUE_VIDEO_SMOOTH,
"Bilinear Filtering" "Bilinear Filtering"
) )
#ifdef HAVE_ODROIDGO2
MSG_HASH( MSG_HASH(
MENU_ENUM_LABEL_VALUE_VIDEO_CTX_SCALING, MENU_ENUM_LABEL_VALUE_VIDEO_CTX_SCALING,
#ifdef HAVE_ODROIDGO2
"RGA Scaling" "RGA Scaling"
#else
"Context Specific Scaling"
#endif
) )
#else
MSG_HASH(
MENU_ENUM_LABEL_VALUE_VIDEO_CTX_SCALING,
"Context Specific Scaling"
)
#endif
MSG_HASH( MSG_HASH(
MENU_ENUM_LABEL_VALUE_VIDEO_SOFT_FILTER, MENU_ENUM_LABEL_VALUE_VIDEO_SOFT_FILTER,
"Soft Filter" "Soft Filter"
@ -6087,14 +6090,17 @@ MSG_HASH(
MENU_ENUM_SUBLABEL_VIDEO_SMOOTH, MENU_ENUM_SUBLABEL_VIDEO_SMOOTH,
"Adds a slight blur to the image to take the edge off of the hard pixel edges. This option has very little impact on performance." "Adds a slight blur to the image to take the edge off of the hard pixel edges. This option has very little impact on performance."
) )
#ifdef HAVE_ODROIDGO2
MSG_HASH( MSG_HASH(
MENU_ENUM_SUBLABEL_VIDEO_CTX_SCALING, MENU_ENUM_SUBLABEL_VIDEO_CTX_SCALING,
#ifdef HAVE_ODROIDGO2
"RGA scaling and bicubic filtering. May break widgets." "RGA scaling and bicubic filtering. May break widgets."
#else
"Hardware context scaling (if available)."
#endif
) )
#else
MSG_HASH(
MENU_ENUM_SUBLABEL_VIDEO_CTX_SCALING,
"Hardware context scaling (if available)."
)
#endif
MSG_HASH( MSG_HASH(
MENU_ENUM_SUBLABEL_VIDEO_FILTER, MENU_ENUM_SUBLABEL_VIDEO_FILTER,
"Apply a CPU-powered video filter.\n" "Apply a CPU-powered video filter.\n"