Merge pull request #10299 from Chaosus/shader_new_uniform_type

Add `samplerExternalOES` type to variable types of shading language
godotengine · Nov 21, 2024 · 0ceba58 · 0ceba58
2 parents 5b15d19 + c46c219
commit 0ceba58
Show file tree

Hide file tree

Showing 2 changed files with 158 additions and 148 deletions.
diff --git a/tutorials/shaders/shader_reference/shader_functions.rst b/tutorials/shaders/shader_reference/shader_functions.rst
@@ -2247,6 +2247,7 @@ Texture functions
     | | |gvec4_type|   | | :ref:`texture<shader_func_texture>`\ (\ |gsampler3D| s, vec3 p [, float bias] )                       |                                                                     |
     | | vec4           | | :ref:`texture<shader_func_texture>`\ (\ samplerCube s, vec3 p [, float bias] )                        |                                                                     |
     | | vec4           | | :ref:`texture<shader_func_texture>`\ (\ samplerCubeArray s, vec4 p [, float bias] )                   |                                                                     |
+    | | vec4           | | :ref:`texture<shader_func_texture>`\ (\ samplerExternalOES s, vec2 p [, float bias] )                 |                                                                     |
     +------------------+---------------------------------------------------------------------------------------------------------+---------------------------------------------------------------------+
     | | |gvec4_type|   | | :ref:`textureProj<shader_func_textureProj>`\ (\ |gsampler2D| s, vec3 p [, float bias] )               | Perform a texture read with projection.                             |
     | | |gvec4_type|   | | :ref:`textureProj<shader_func_textureProj>`\ (\ |gsampler2D| s, vec4 p [, float bias] )               |                                                                     |
@@ -2505,6 +2506,10 @@ vec4 **texture**\ (\ samplerCube s, vec3 p [, float bias] )
 
 vec4 **texture**\ (\ samplerCubeArray s, vec4 p [, float bias] )
 
+.. rst-class:: classref-method
+
+vec4 **texture**\ (\ samplerExternalOES s, vec2 p [, float bias] )
+
     Retrieves texels from a texture.
 
     Samples texels from the texture bound to ``s`` at texture coordinate ``p``. An optional bias, specified in ``bias`` is