Skip to content

Commit 7302483

Browse files
skyace65skyace65
authored
Merge pull request godotengine#11105 from godotengine/classref/sync-c6d130a
classref: Sync with current master branch (c6d130a)
2 parents b824247 + c65aa5f commit 7302483

File tree

4 files changed

+97
-15
lines changed

4 files changed

+97
-15
lines changed

‎classes/class_editorexportplatformweb.rst‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,11 @@ Properties
7575
+-----------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------+
7676
| :ref:`int<class_int>` | :ref:`progressive_web_app/orientation<class_EditorExportPlatformWeb_property_progressive_web_app/orientation>` |
7777
+-----------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------+
78-
| :ref:`int<class_int>` | :ref:`variant/emscripten_pool_size<class_EditorExportPlatformWeb_property_variant/emscripten_pool_size>` |
78+
| :ref:`int<class_int>` | :ref:`threads/emscripten_pool_size<class_EditorExportPlatformWeb_property_threads/emscripten_pool_size>` |
7979
+-----------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------+
80-
| :ref:`bool<class_bool>` | :ref:`variant/extensions_support<class_EditorExportPlatformWeb_property_variant/extensions_support>` |
80+
| :ref:`int<class_int>` | :ref:`threads/godot_pool_size<class_EditorExportPlatformWeb_property_threads/godot_pool_size>` |
8181
+-----------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------+
82-
| :ref:`int<class_int>` | :ref:`variant/godot_pool_size<class_EditorExportPlatformWeb_property_variant/godot_pool_size>` |
82+
| :ref:`bool<class_bool>` | :ref:`variant/extensions_support<class_EditorExportPlatformWeb_property_variant/extensions_support>` |
8383
+-----------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------+
8484
| :ref:`bool<class_bool>` | :ref:`variant/thread_support<class_EditorExportPlatformWeb_property_variant/thread_support>` |
8585
+-----------------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------+
@@ -335,11 +335,11 @@ The orientation to use when the web application is run through a mobile device.
335335

336336
----
337337

338-
.. _class_EditorExportPlatformWeb_property_variant/emscripten_pool_size:
338+
.. _class_EditorExportPlatformWeb_property_threads/emscripten_pool_size:
339339

340340
.. rst-class:: classref-property
341341

342-
:ref:`int<class_int>` **variant/emscripten_pool_size** :ref:`🔗<class_EditorExportPlatformWeb_property_variant/emscripten_pool_size>`
342+
:ref:`int<class_int>` **threads/emscripten_pool_size** :ref:`🔗<class_EditorExportPlatformWeb_property_threads/emscripten_pool_size>`
343343

344344
The number of threads that emscripten will allocate at startup. A smaller value will allocate fewer threads and consume fewer system resources, but you may run the risk of running out of threads in the pool and needing to allocate more threads at run time which may cause a deadlock.
345345

@@ -349,27 +349,27 @@ The number of threads that emscripten will allocate at startup. A smaller value
349349

350350
----
351351

352-
.. _class_EditorExportPlatformWeb_property_variant/extensions_support:
352+
.. _class_EditorExportPlatformWeb_property_threads/godot_pool_size:
353353

354354
.. rst-class:: classref-property
355355

356-
:ref:`bool<class_bool>` **variant/extensions_support** :ref:`🔗<class_EditorExportPlatformWeb_property_variant/extensions_support>`
356+
:ref:`int<class_int>` **threads/godot_pool_size** :ref:`🔗<class_EditorExportPlatformWeb_property_threads/godot_pool_size>`
357357

358-
If ``true`` enables :ref:`GDExtension<class_GDExtension>` support for this web build.
358+
Override for the default size of the :ref:`WorkerThreadPool<class_WorkerThreadPool>`. This setting is used when :ref:`ProjectSettings.threading/worker_pool/max_threads<class_ProjectSettings_property_threading/worker_pool/max_threads>` size is set to -1 (which it is by default). This size must be smaller than :ref:`threads/emscripten_pool_size<class_EditorExportPlatformWeb_property_threads/emscripten_pool_size>` otherwise deadlocks may occur.
359+
360+
When using threads this size needs to be large enough to accommodate features that rely on having a dedicated thread like :ref:`ProjectSettings.physics/2d/run_on_separate_thread<class_ProjectSettings_property_physics/2d/run_on_separate_thread>` or :ref:`ProjectSettings.rendering/driver/threads/thread_model<class_ProjectSettings_property_rendering/driver/threads/thread_model>`. In general, it is best to ensure that this is at least 4 and is at least 2 or 3 less than :ref:`threads/emscripten_pool_size<class_EditorExportPlatformWeb_property_threads/emscripten_pool_size>`.
359361

360362
.. rst-class:: classref-item-separator
361363

362364
----
363365

364-
.. _class_EditorExportPlatformWeb_property_variant/godot_pool_size:
366+
.. _class_EditorExportPlatformWeb_property_variant/extensions_support:
365367

366368
.. rst-class:: classref-property
367369

368-
:ref:`int<class_int>` **variant/godot_pool_size** :ref:`🔗<class_EditorExportPlatformWeb_property_variant/godot_pool_size>`
369-
370-
Override for the default size of the :ref:`WorkerThreadPool<class_WorkerThreadPool>`. This setting is used when :ref:`ProjectSettings.threading/worker_pool/max_threads<class_ProjectSettings_property_threading/worker_pool/max_threads>` size is set to -1 (which it is by default). This size must be smaller than :ref:`variant/emscripten_pool_size<class_EditorExportPlatformWeb_property_variant/emscripten_pool_size>` otherwise deadlocks may occur.
370+
:ref:`bool<class_bool>` **variant/extensions_support** :ref:`🔗<class_EditorExportPlatformWeb_property_variant/extensions_support>`
371371

372-
When using threads this size needs to be large enough to accommodate features that rely on having a dedicated thread like :ref:`ProjectSettings.physics/2d/run_on_separate_thread<class_ProjectSettings_property_physics/2d/run_on_separate_thread>` or :ref:`ProjectSettings.rendering/driver/threads/thread_model<class_ProjectSettings_property_rendering/driver/threads/thread_model>`. In general, it is best to ensure that this is at least 4 and is at least 2 or 3 less than :ref:`variant/emscripten_pool_size<class_EditorExportPlatformWeb_property_variant/emscripten_pool_size>`.
372+
If ``true`` enables :ref:`GDExtension<class_GDExtension>` support for this web build.
373373

374374
.. rst-class:: classref-item-separator
375375

‎classes/class_httprequest.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ Can be used to make HTTP requests, i.e. download or upload files or web content
119119
http_request.request_completed.connect(self._http_request_completed)
120120

121121
# Perform the HTTP request. The URL below returns a PNG image as of writing.
122-
var error = http_request.request("https://placehold.co/512")
122+
var error = http_request.request("https://placehold.co/512.png")
123123
if error != OK:
124124
push_error("An error occurred in the HTTP request.")
125125

@@ -150,7 +150,7 @@ Can be used to make HTTP requests, i.e. download or upload files or web content
150150
httpRequest.RequestCompleted += HttpRequestCompleted;
151151

152152
// Perform the HTTP request. The URL below returns a PNG image as of writing.
153-
Error error = httpRequest.Request("https://placehold.co/512");
153+
Error error = httpRequest.Request("https://placehold.co/512.png");
154154
if (error != Error.Ok)
155155
{
156156
GD.PushError("An error occurred in the HTTP request.");

‎classes/class_renderingdevice.rst‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4460,6 +4460,14 @@ Support for MetalFX temporal upscaling.
44604460

44614461
Features support for buffer device address extension.
44624462

4463+
.. _class_RenderingDevice_constant_SUPPORTS_IMAGE_ATOMIC_32_BIT:
4464+
4465+
.. rst-class:: classref-enumeration-constant
4466+
4467+
:ref:`Features<enum_RenderingDevice_Features>` **SUPPORTS_IMAGE_ATOMIC_32_BIT** = ``7``
4468+
4469+
Support for 32-bit image atomic operations.
4470+
44634471
.. rst-class:: classref-item-separator
44644472

44654473
----

0 commit comments

Comments
 (0)