Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(cheevos) allow subframes in hardcore #17296

Merged
merged 2 commits into from
Dec 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions cheevos/cheevos.c
Original file line number Diff line number Diff line change
Expand Up @@ -923,20 +923,6 @@ void rcheevos_validate_config_settings(void)
return;
}

/* this causes N dupe frames to be rendered between real frames, for
the purposes of shaders that update faster than content. Thus
* can slow down the actual number of rendered frames per second. */
if (settings->uints.video_shader_subframes > 1)
{
const char* error = msg_hash_to_str(MSG_CHEEVOS_HARDCORE_PAUSED_SHADER_SUBFRAMES);
CHEEVOS_LOG(RCHEEVOS_TAG "%s\n", msg_hash_to_str_us(MSG_CHEEVOS_HARDCORE_PAUSED_SHADER_SUBFRAMES));
rcheevos_pause_hardcore();

runloop_msg_queue_push(error, strlen(error), 0, 4 * 60, false, NULL,
MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_WARNING);
return;
}

if (!sysinfo->library_name)
return;

Expand Down
4 changes: 0 additions & 4 deletions intl/msg_hash_be.h
Original file line number Diff line number Diff line change
Expand Up @@ -14915,10 +14915,6 @@ MSG_HASH(
MSG_CHEEVOS_HARDCORE_PAUSED_MANUAL_FRAME_DELAY,
"Хардкод прыпынены. Налада ручной затрымкі кадраў не дазваляецца."
)
MSG_HASH(
MSG_CHEEVOS_HARDCORE_PAUSED_SHADER_SUBFRAMES,
"Хардкор прыпынены. Падкадры шэйдара не дазваляюцца."
)
MSG_HASH(
MSG_CHEEVOS_HARDCORE_PAUSED_VSYNC_SWAP_INTERVAL,
"Хардкор прыпынены. Інтэрвал абмену vsync вышэйшы за 1 не дазваляецца."
Expand Down
4 changes: 0 additions & 4 deletions intl/msg_hash_de.h
Original file line number Diff line number Diff line change
Expand Up @@ -14491,10 +14491,6 @@ MSG_HASH(
MSG_CHEEVOS_HARDCORE_PAUSED_MANUAL_FRAME_DELAY,
"Hardcore pausiert. Manuelle Einstellung der Videobildverzögerung nicht gestattet."
)
MSG_HASH(
MSG_CHEEVOS_HARDCORE_PAUSED_SHADER_SUBFRAMES,
"Hardcore pausiert. Shader-Subframes nicht gestattet."
)
MSG_HASH(
MSG_CHEEVOS_HARDCORE_PAUSED_VSYNC_SWAP_INTERVAL,
"Hardcore pausiert. Vsync-Swap-Intervall über 1 nicht gestattet."
Expand Down
4 changes: 0 additions & 4 deletions intl/msg_hash_es.h
Original file line number Diff line number Diff line change
Expand Up @@ -14823,10 +14823,6 @@ MSG_HASH(
MSG_CHEEVOS_HARDCORE_PAUSED_MANUAL_FRAME_DELAY,
"Modo «hardcore» pausado. No se permite ajustar manualmente el retraso en los fotogramas de vídeo."
)
MSG_HASH(
MSG_CHEEVOS_HARDCORE_PAUSED_SHADER_SUBFRAMES,
"Modo «hardcore» pausado. No se permiten los subfotogramas en shaders."
)
MSG_HASH(
MSG_CHEEVOS_HARDCORE_PAUSED_VSYNC_SWAP_INTERVAL,
"Modo «hardcore» pausado. No se permite un valor de intercambio de sincronía vertical superior a 1."
Expand Down
4 changes: 0 additions & 4 deletions intl/msg_hash_fr.h
Original file line number Diff line number Diff line change
Expand Up @@ -14783,10 +14783,6 @@ MSG_HASH(
MSG_CHEEVOS_HARDCORE_PAUSED_MANUAL_FRAME_DELAY,
"Hardcore mis en pause. Réglage manuel du retard d'images non autorisé."
)
MSG_HASH(
MSG_CHEEVOS_HARDCORE_PAUSED_SHADER_SUBFRAMES,
"Hardcore mis en pause. Sous-trames du Shader non autorisées."
)
MSG_HASH(
MSG_CHEEVOS_HARDCORE_PAUSED_VSYNC_SWAP_INTERVAL,
"Hardcore mis en pause. Intervalle d'échange V-Sync supérieur à 1 non autorisé."
Expand Down
4 changes: 0 additions & 4 deletions intl/msg_hash_gl.h
Original file line number Diff line number Diff line change
Expand Up @@ -14679,10 +14679,6 @@ MSG_HASH(
MSG_CHEEVOS_HARDCORE_PAUSED_MANUAL_FRAME_DELAY,
"Modo hardcore en pausa. A configuración manual do retraso de fotograma de vídeo non está permitida."
)
MSG_HASH(
MSG_CHEEVOS_HARDCORE_PAUSED_SHADER_SUBFRAMES,
"Modo hardcore en pausa. Os subfotogramas de sombreadores non están permitidos."
)
MSG_HASH(
MSG_CHEEVOS_HARDCORE_PAUSED_VSYNC_SWAP_INTERVAL,
"Modo hardcore en pausa. O intervalo de intercambio de vsync por riba de 1 non está permitido."
Expand Down
4 changes: 0 additions & 4 deletions intl/msg_hash_hu.h
Original file line number Diff line number Diff line change
Expand Up @@ -14543,10 +14543,6 @@ MSG_HASH(
MSG_CHEEVOS_HARDCORE_PAUSED_MANUAL_FRAME_DELAY,
"Hardcore szüneteltetve. A kézi képvárakoztatás beállítása nem engedélyezett."
)
MSG_HASH(
MSG_CHEEVOS_HARDCORE_PAUSED_SHADER_SUBFRAMES,
"Hardcore szüneteltetve. A shader alképkockák nem engedélyezettek."
)
MSG_HASH(
MSG_CHEEVOS_HARDCORE_PAUSED_VSYNC_SWAP_INTERVAL,
"Hardcore szüneteltetve. Az 1-nél nagyobb VSync váltóperiódus nem engedélyezett."
Expand Down
4 changes: 0 additions & 4 deletions intl/msg_hash_it.h
Original file line number Diff line number Diff line change
Expand Up @@ -14635,10 +14635,6 @@ MSG_HASH(
MSG_CHEEVOS_HARDCORE_PAUSED_MANUAL_FRAME_DELAY,
"Hardcore in pausa. Impostazione manuale di ritardo frame video non consentita."
)
MSG_HASH(
MSG_CHEEVOS_HARDCORE_PAUSED_SHADER_SUBFRAMES,
"Hardcore in pausa. I sottoframe Shader non sono consentiti."
)
MSG_HASH(
MSG_CHEEVOS_HARDCORE_PAUSED_VSYNC_SWAP_INTERVAL,
"Hardcore in pausa. intervallo di swap vsync superiore a 1 non consentito."
Expand Down
4 changes: 0 additions & 4 deletions intl/msg_hash_ko.h
Original file line number Diff line number Diff line change
Expand Up @@ -14931,10 +14931,6 @@ MSG_HASH(
MSG_CHEEVOS_HARDCORE_PAUSED_MANUAL_FRAME_DELAY,
"하드코어 일시정지됨. 수동 프레임 지연 설정은 허용되지 않습니다."
)
MSG_HASH(
MSG_CHEEVOS_HARDCORE_PAUSED_SHADER_SUBFRAMES,
"하드코어 일시정지됨. 서브프레임 셰이더는 허용되지 않습니다."
)
MSG_HASH(
MSG_CHEEVOS_HARDCORE_PAUSED_VSYNC_SWAP_INTERVAL,
"하드코어 일시정지됨. 1보다 높은 수직 동기화 스왑 간격은 허용되지 않습니다."
Expand Down
4 changes: 0 additions & 4 deletions intl/msg_hash_ru.h
Original file line number Diff line number Diff line change
Expand Up @@ -14867,10 +14867,6 @@ MSG_HASH(
MSG_CHEEVOS_HARDCORE_PAUSED_MANUAL_FRAME_DELAY,
"Режим хардкора приостановлен. Ручная установка задержки кадра запрещена."
)
MSG_HASH(
MSG_CHEEVOS_HARDCORE_PAUSED_SHADER_SUBFRAMES,
"Режим хардкора приостановлен. Подкадры шейдера запрещены."
)
MSG_HASH(
MSG_CHEEVOS_HARDCORE_PAUSED_VSYNC_SWAP_INTERVAL,
"Режим хардкора приостановлен. Интервал подкачки VSync больше 1 запрещён."
Expand Down
4 changes: 0 additions & 4 deletions intl/msg_hash_tr.h
Original file line number Diff line number Diff line change
Expand Up @@ -14915,10 +14915,6 @@ MSG_HASH(
MSG_CHEEVOS_HARDCORE_PAUSED_MANUAL_FRAME_DELAY,
"Zorlu kip durakladı. El ile video karesi gecikme ayarına izin verilmiyor."
)
MSG_HASH(
MSG_CHEEVOS_HARDCORE_PAUSED_SHADER_SUBFRAMES,
"Zorlu kip durakladı. Gölgelendirici alt çerçevelerine izin verilmiyor."
)
MSG_HASH(
MSG_CHEEVOS_HARDCORE_PAUSED_VSYNC_SWAP_INTERVAL,
"Zorlu kip durakladı. 1 üzerindeki vsync takas aralığına izin verilmiyor."
Expand Down
4 changes: 0 additions & 4 deletions intl/msg_hash_uk.h
Original file line number Diff line number Diff line change
Expand Up @@ -14923,10 +14923,6 @@ MSG_HASH(
MSG_CHEEVOS_HARDCORE_PAUSED_MANUAL_FRAME_DELAY,
"Хардкорно призупинено. Ручне затримка відеокадрів не допускається."
)
MSG_HASH(
MSG_CHEEVOS_HARDCORE_PAUSED_SHADER_SUBFRAMES,
"Хардкорний призупинений. Підсистеми Шейдера заборонені."
)
MSG_HASH(
MSG_CHEEVOS_HARDCORE_PAUSED_VSYNC_SWAP_INTERVAL,
"Хардкорн призупинено. Інтервал зміни vsync вище 1 не допускається."
Expand Down
4 changes: 0 additions & 4 deletions intl/msg_hash_us.h
Original file line number Diff line number Diff line change
Expand Up @@ -15611,10 +15611,6 @@ MSG_HASH(
MSG_CHEEVOS_HARDCORE_PAUSED_MANUAL_FRAME_DELAY,
"Hardcore paused. Manual video frame delay setting not allowed."
)
MSG_HASH(
MSG_CHEEVOS_HARDCORE_PAUSED_SHADER_SUBFRAMES,
"Hardcore paused. Shader subframes not allowed."
)
MSG_HASH(
MSG_CHEEVOS_HARDCORE_PAUSED_VSYNC_SWAP_INTERVAL,
"Hardcore paused. vsync swap interval above 1 not allowed."
Expand Down
1 change: 0 additions & 1 deletion msg_hash.h
Original file line number Diff line number Diff line change
Expand Up @@ -4106,7 +4106,6 @@ enum msg_hash_enums
MSG_CHEEVOS_RICH_PRESENCE_SPECTATING,
MSG_CHEEVOS_HARDCORE_PAUSED_MANUAL_FRAME_DELAY,
MSG_CHEEVOS_HARDCORE_PAUSED_VSYNC_SWAP_INTERVAL,
MSG_CHEEVOS_HARDCORE_PAUSED_SHADER_SUBFRAMES,
MSG_CHEEVOS_HARDCORE_PAUSED_BLACK_FRAME_INSERTION,
MSG_CHEEVOS_HARDCORE_PAUSED_SETTING_NOT_ALLOWED,
MSG_CHEEVOS_HARDCORE_PAUSED_SYSTEM_NOT_FOR_CORE,
Expand Down
Loading