Skip to content

Commit 6b698fb

Browse files
dsh0416dsh0416
committed
fixes
1 parent 9e5c712 commit 6b698fb

9 files changed

Lines changed: 32 additions & 35 deletions

File tree

‎crates/gdcef/src/accelerated_osr/linux/vulkan.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ impl VulkanTextureImporter {
117117
}
118118

119119
pub fn new() -> Option<Self> {
120-
let mut rd = RenderingServer::singleton()
120+
let rd = RenderingServer::singleton()
121121
.get_rendering_device()
122122
.ok_or_else(|| {
123123
godot_error!("[AcceleratedOSR/Vulkan] Failed to get RenderingDevice");
@@ -441,7 +441,7 @@ impl VulkanTextureImporter {
441441

442442
// Get destination Vulkan image from Godot's RenderingDevice
443443
let dst_image: vk::Image = {
444-
let mut rd = RenderingServer::singleton()
444+
let rd = RenderingServer::singleton()
445445
.get_rendering_device()
446446
.ok_or("Failed to get RenderingDevice")?;
447447

‎crates/gdcef/src/accelerated_osr/macos.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ impl GodotTextureImporter {
284284

285285
// Get destination Metal texture from Godot's RenderingDevice
286286
let dst_texture_ptr = {
287-
let mut rd = RenderingServer::singleton()
287+
let rd = RenderingServer::singleton()
288288
.get_rendering_device()
289289
.ok_or("Failed to get RenderingDevice")?;
290290

@@ -413,7 +413,7 @@ fn io_registry_search_property_u32(service: u32, key: &str) -> Option<u32> {
413413

414414
/// Get the GPU vendor and device IDs from Godot's Metal device.
415415
pub fn get_godot_gpu_device_ids() -> Option<(u32, u32)> {
416-
let mut rd = RenderingServer::singleton().get_rendering_device()?;
416+
let rd = RenderingServer::singleton().get_rendering_device()?;
417417
let mtl_device_ptr = rd.get_driver_resource(DriverResource::LOGICAL_DEVICE, Rid::Invalid, 0);
418418

419419
if mtl_device_ptr == 0 {

‎crates/gdcef/src/accelerated_osr/vulkan_common.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ pub(crate) fn get_godot_gpu_device_ids_vulkan(vulkan_lib_name: &str) -> Option<(
333333
use godot::global::{godot_error, godot_print};
334334
use godot::prelude::*;
335335

336-
let mut rd = RenderingServer::singleton().get_rendering_device()?;
336+
let rd = RenderingServer::singleton().get_rendering_device()?;
337337

338338
let physical_device_ptr =
339339
rd.get_driver_resource(DriverResource::PHYSICAL_DEVICE, Rid::Invalid, 0);

‎crates/gdcef/src/accelerated_osr/windows/d3d12.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ pub struct D3D12TextureImporter {
5656

5757
impl D3D12TextureImporter {
5858
pub fn new() -> Option<Self> {
59-
let mut rd = RenderingServer::singleton()
59+
let rd = RenderingServer::singleton()
6060
.get_rendering_device()
6161
.ok_or_else(|| {
6262
godot_error!("[AcceleratedOSR/D3D12] Failed to get RenderingDevice");
@@ -303,7 +303,7 @@ impl D3D12TextureImporter {
303303

304304
// Get destination D3D12 resource from Godot's RenderingDevice
305305
let dst_resource = {
306-
let mut rd = RenderingServer::singleton()
306+
let rd = RenderingServer::singleton()
307307
.get_rendering_device()
308308
.ok_or("Failed to get RenderingDevice")?;
309309

@@ -448,7 +448,7 @@ impl Drop for D3D12TextureImporter {
448448

449449
/// Get the GPU vendor and device IDs from Godot's D3D12 device.
450450
pub fn get_godot_gpu_device_ids() -> Option<(u32, u32)> {
451-
let mut rd = RenderingServer::singleton().get_rendering_device()?;
451+
let rd = RenderingServer::singleton().get_rendering_device()?;
452452
let device_ptr = rd.get_driver_resource(DriverResource::LOGICAL_DEVICE, Rid::Invalid, 0);
453453

454454
if device_ptr == 0 {

‎crates/gdcef/src/accelerated_osr/windows/vulkan.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ impl VulkanTextureImporter {
100100
}
101101

102102
pub fn new() -> Option<Self> {
103-
let mut rd = RenderingServer::singleton()
103+
let rd = RenderingServer::singleton()
104104
.get_rendering_device()
105105
.ok_or_else(|| {
106106
godot_error!("[AcceleratedOSR/Vulkan] Failed to get RenderingDevice");
@@ -384,7 +384,7 @@ impl VulkanTextureImporter {
384384

385385
// Get destination Vulkan image from Godot's RenderingDevice
386386
let dst_image: vk::Image = {
387-
let mut rd = RenderingServer::singleton()
387+
let rd = RenderingServer::singleton()
388388
.get_rendering_device()
389389
.ok_or("Failed to get RenderingDevice")?;
390390

‎crates/gdcef/src/cef_texture/backend.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ fn resolve_preload_script(script: &str, path: &str) -> Result<Option<String>, Ce
128128
}
129129

130130
let gstring_path = GString::from(path);
131-
let Some(file) = FileAccess::open(&gstring_path, ModeFlags::READ) else {
131+
let Some(mut file) = FileAccess::open(&gstring_path, ModeFlags::READ) else {
132132
return Err(CefError::BrowserCreationFailed(format!(
133133
"failed to open preload_script_path '{}'",
134134
path

‎crates/gdcef/src/cef_texture/signals.rs‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -202,14 +202,11 @@ impl CefTexture {
202202
fn emit_debug_ipc_signals(&mut self, events: &VecDeque<DebugIpcEvent>) {
203203
for event in events {
204204
let mut payload = godot::builtin::VarDictionary::new();
205-
payload.set(
206-
"direction",
207-
GString::from(event.direction.as_str()).to_variant(),
208-
);
209-
payload.set("lane", GString::from(event.lane.as_str()).to_variant());
210-
payload.set("body", GString::from(&event.body).to_variant());
211-
payload.set("timestamp_unix_ms", event.timestamp_unix_ms.to_variant());
212-
payload.set("body_size_bytes", event.body_size_bytes.to_variant());
205+
payload.set("direction", &GString::from(event.direction.as_str()));
206+
payload.set("lane", &GString::from(event.lane.as_str()));
207+
payload.set("body", &GString::from(&event.body));
208+
payload.set("timestamp_unix_ms", event.timestamp_unix_ms);
209+
payload.set("body_size_bytes", event.body_size_bytes);
213210
self.base_mut()
214211
.emit_signal("debug_ipc_message", &[payload.to_variant()]);
215212
}

‎crates/gdcef/src/ipc_data.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ fn cbor_value_to_variant(value: &CborValue) -> Result<Variant, String> {
104104
CborValue::Text(text) => GString::from(text).to_variant(),
105105
other => cbor_value_to_variant(other)?,
106106
};
107-
dict.set(key_variant, cbor_value_to_variant(val)?);
107+
dict.set(&key_variant, &cbor_value_to_variant(val)?);
108108
}
109109
Ok(dict.to_variant())
110110
}
@@ -138,8 +138,8 @@ fn maybe_restore_special_map(entries: &[(CborValue, CborValue)]) -> Option<Varia
138138
}
139139
if let (Some(ty), Some(val)) = (ty, val) {
140140
let mut dict = VarDictionary::new();
141-
dict.set(TYPE_KEY, GString::from(ty.as_str()).to_variant());
142-
dict.set(VALUE_KEY, GString::from(val.as_str()).to_variant());
141+
dict.set(TYPE_KEY, &GString::from(ty.as_str()).to_variant());
142+
dict.set(VALUE_KEY, &GString::from(val.as_str()).to_variant());
143143
return Some(dict.to_variant());
144144
}
145145
None

‎crates/gdcef/src/settings.rs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use cef_app::SecurityConfig;
22
use godot::classes::ProjectSettings;
3-
use godot::global::PropertyHint;
43
use godot::prelude::*;
4+
use godot::register::info::PropertyHint;
55
use std::path::PathBuf;
66

77
const SETTING_DATA_PATH: &str = "godot_cef/storage/data_path";
@@ -171,10 +171,10 @@ fn register_string_setting(
171171
settings.set_as_basic(&name_gstring, true);
172172

173173
let property_info = vdict! {
174-
"name": name_gstring.clone(),
175-
"type": VariantType::STRING.ord(),
176-
"hint": hint.ord(),
177-
"hint_string": hint_string,
174+
"name" => &name_gstring,
175+
"type" => VariantType::STRING.ord(),
176+
"hint" => hint.ord(),
177+
"hint_string" => hint_string,
178178
};
179179

180180
settings.add_property_info(&property_info);
@@ -191,10 +191,10 @@ fn register_bool_setting(settings: &mut Gd<ProjectSettings>, name: &str, default
191191
settings.set_as_basic(&name_gstring, true);
192192

193193
let property_info = vdict! {
194-
"name": name_gstring.clone(),
195-
"type": VariantType::BOOL.ord(),
196-
"hint": PropertyHint::NONE.ord(),
197-
"hint_string": "",
194+
"name" => &name_gstring,
195+
"type" => VariantType::BOOL.ord(),
196+
"hint" => PropertyHint::NONE.ord(),
197+
"hint_string" => "",
198198
};
199199

200200
settings.add_property_info(&property_info);
@@ -217,10 +217,10 @@ fn register_int_setting(
217217
settings.set_as_basic(&name_gstring, true);
218218

219219
let property_info = vdict! {
220-
"name": name_gstring.clone(),
221-
"type": VariantType::INT.ord(),
222-
"hint": hint.ord(),
223-
"hint_string": hint_string,
220+
"name" => &name_gstring,
221+
"type" => VariantType::INT.ord(),
222+
"hint" => hint.ord(),
223+
"hint_string" => hint_string,
224224
};
225225

226226
settings.add_property_info(&property_info);

0 commit comments

Comments
 (0)