From 3eaff023201dca65a17c094321f0404ba9593315 Mon Sep 17 00:00:00 2001 From: Jamiras Date: Fri, 27 Dec 2024 16:25:03 -0700 Subject: [PATCH 1/2] allow subframes in hardcore --- cheevos/cheevos.c | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/cheevos/cheevos.c b/cheevos/cheevos.c index e749fd6c5d98..a71b0ca5c77d 100644 --- a/cheevos/cheevos.c +++ b/cheevos/cheevos.c @@ -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; From 3d028ee168e1bdc5135a54358fea88d542364dc9 Mon Sep 17 00:00:00 2001 From: Jamiras Date: Fri, 27 Dec 2024 16:34:48 -0700 Subject: [PATCH 2/2] remove unused message --- intl/msg_hash_be.h | 4 ---- intl/msg_hash_de.h | 4 ---- intl/msg_hash_es.h | 4 ---- intl/msg_hash_fr.h | 4 ---- intl/msg_hash_gl.h | 4 ---- intl/msg_hash_hu.h | 4 ---- intl/msg_hash_it.h | 4 ---- intl/msg_hash_ko.h | 4 ---- intl/msg_hash_ru.h | 4 ---- intl/msg_hash_tr.h | 4 ---- intl/msg_hash_uk.h | 4 ---- intl/msg_hash_us.h | 4 ---- msg_hash.h | 1 - 13 files changed, 49 deletions(-) diff --git a/intl/msg_hash_be.h b/intl/msg_hash_be.h index 45889b311a43..b5c557e80b29 100644 --- a/intl/msg_hash_be.h +++ b/intl/msg_hash_be.h @@ -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 не дазваляецца." diff --git a/intl/msg_hash_de.h b/intl/msg_hash_de.h index 0725bcc2a2e0..754f208dd971 100644 --- a/intl/msg_hash_de.h +++ b/intl/msg_hash_de.h @@ -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." diff --git a/intl/msg_hash_es.h b/intl/msg_hash_es.h index 90e85425559c..2f9883bcbff2 100644 --- a/intl/msg_hash_es.h +++ b/intl/msg_hash_es.h @@ -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." diff --git a/intl/msg_hash_fr.h b/intl/msg_hash_fr.h index 8b0b5f084802..b6a6a9ec8b9d 100644 --- a/intl/msg_hash_fr.h +++ b/intl/msg_hash_fr.h @@ -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é." diff --git a/intl/msg_hash_gl.h b/intl/msg_hash_gl.h index 419179ba5397..d58d147dcb2e 100644 --- a/intl/msg_hash_gl.h +++ b/intl/msg_hash_gl.h @@ -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." diff --git a/intl/msg_hash_hu.h b/intl/msg_hash_hu.h index b9c048c5e699..3778221a8fc4 100644 --- a/intl/msg_hash_hu.h +++ b/intl/msg_hash_hu.h @@ -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." diff --git a/intl/msg_hash_it.h b/intl/msg_hash_it.h index 0d8537d76407..f9d72916be51 100644 --- a/intl/msg_hash_it.h +++ b/intl/msg_hash_it.h @@ -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." diff --git a/intl/msg_hash_ko.h b/intl/msg_hash_ko.h index 29561e5c0e19..f60632bed735 100644 --- a/intl/msg_hash_ko.h +++ b/intl/msg_hash_ko.h @@ -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보다 높은 수직 동기화 스왑 간격은 허용되지 않습니다." diff --git a/intl/msg_hash_ru.h b/intl/msg_hash_ru.h index fbf053778a6d..d57f9e98414f 100644 --- a/intl/msg_hash_ru.h +++ b/intl/msg_hash_ru.h @@ -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 запрещён." diff --git a/intl/msg_hash_tr.h b/intl/msg_hash_tr.h index 29435218e46a..e9f0c0268ee9 100644 --- a/intl/msg_hash_tr.h +++ b/intl/msg_hash_tr.h @@ -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." diff --git a/intl/msg_hash_uk.h b/intl/msg_hash_uk.h index 035cf2f2e4eb..e707ea7e4048 100644 --- a/intl/msg_hash_uk.h +++ b/intl/msg_hash_uk.h @@ -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 не допускається." diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index c848e8d0df9b..e04ca1fc8135 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -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." diff --git a/msg_hash.h b/msg_hash.h index cdbbf17be88b..16b35e4da2ae 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -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,