Add: GPU対応・非対応周りを実装

sevenc-nanashi · Jan 26, 2023 · 625fba2 · 625fba2
1 parent c8336bd
commit 625fba2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 21 deletions.
diff --git a/src/components/SettingDialog.vue b/src/components/SettingDialog.vue
@@ -68,16 +68,18 @@
                   toggle-color="primary"
                   toggle-text-color="display-on-primary"
                   :options="engineUseGpuOptions"
-                  :disable="!allEngineCanUseGPU"
+                  :disable="!canEngineUseGpu(selectedEngineId)"
                 >
                   <q-tooltip
                     anchor="center start"
                     self="center right"
                     transition-show="jump-left"
                     transition-hide="jump-right"
-                    :target="!allEngineCanUseGPU"
+                    :target="!canEngineUseGpu(selectedEngineId)"
                   >
-                    お使いのエンジンはCPU版のためGPUモードを利用できません。
+                    {{
+                      engineInfos[selectedEngineId].name
+                    }}はCPU版のためGPUモードを利用できません。
                   </q-tooltip>
                 </q-btn-toggle>
               </q-card-actions>
@@ -731,10 +733,6 @@ export default defineComponent({
       set: (val) => emit("update:modelValue", val),
     });
 
-    const allEngineCanUseGPU = computed(
-      () => store.getters.ALL_ENGINE_CAN_USE_GPU
-    );
-
     const engineUseGpu = computed({
       get: () => {
         let useGpu;
@@ -1038,11 +1036,22 @@ export default defineComponent({
       return options;
     });
 
+    const canEngineUseGpu = (engineIdOrGlobal: string) => {
+      if (engineIdOrGlobal === "global") {
+        return engineIds.value.some((engineId) =>
+          store.getters.ENGINE_CAN_USE_GPU(engineId)
+        );
+      } else {
+        return store.getters.ENGINE_CAN_USE_GPU;
+      }
+    };
+
     return {
       settingDialogOpenedComputed,
-      allEngineCanUseGPU,
       engineUseGpu,
+      canEngineUseGpu,
       engineIds,
+      engineInfos,
       selectedEngineId,
       engineUseGpuOptions,
       renderEngineNameLabel,

diff --git a/src/store/engine.ts b/src/store/engine.ts
@@ -397,13 +397,4 @@ export const engineStore = createPartialStore<EngineStoreTypes>({
       return supportedDevices?.cuda || supportedDevices?.dml;
     },
   },
-
-  // TODO:エンジン毎の設定が可能になれば消す
-  ALL_ENGINE_CAN_USE_GPU: {
-    getter: (state, getters) => {
-      return state.engineIds.every((engineId) =>
-        getters.ENGINE_CAN_USE_GPU(engineId)
-      );
-    },
-  },
 });
diff --git a/src/store/type.ts b/src/store/type.ts
@@ -821,10 +821,6 @@ export type EngineStoreTypes = {
   ENGINE_CAN_USE_GPU: {
     getter: (engineId: string) => boolean;
   };
-
-  ALL_ENGINE_CAN_USE_GPU: {
-    getter: boolean;
-  };
 };
 
 /*