Merge pull request #431 from YoYoGames/2532-html-crash-in-vertex-submit-in-202311

Changed check for valid texture on vertex_submit to avoid false positive error reporting.

Author: pkraif

scripts/Builders/yyVBufferBuilder.js

@@ -385,10 +385,10 @@ function yyVBufferBuilder(_size) {
                 // Check whether the webgl texture has been initialised yet and do so if not
                 if (_texture && !_texture.WebGLTexture.webgl_textureid) {
                     WebGL_BindTexture(_texture.TPE);
-                    if (!WebGL_IsTextureValid(_texture.WebGLTexture.webgl_textureid, WebGL_gpu_get_tex_mip_enable())) {
-                        yyError("vertex_submit: trying to use a texture that does not exist");
-                        return;
-                    }
+                    if(!WebGL_IsTextureImageValid(_texture.WebGLTexture.webgl_textureid)) {
+                        yyError("vertex_submit: trying to use an invalid texture");
+						return;
+					}
                 }
                 g_webGL.DispatchVBuffer(_primType, _texture.WebGLTexture.webgl_textureid, m_VBuffer, _offset, vertexCount);
             }
@@ -401,10 +401,11 @@ function yyVBufferBuilder(_size) {
                 // Check whether the webgl texture has been initialised yet and do so if not
                 if (_texture && !_texture.WebGLTexture.webgl_textureid) {
                     WebGL_BindTexture(_texture.TPE);
-                    if (!WebGL_IsTextureValid(_texture.WebGLTexture.webgl_textureid, WebGL_gpu_get_tex_mip_enable())) {
-                        yyError("vertex_submit: trying to use a texture that does not exist");
-                        return;
-                    }
+                    if(!WebGL_IsTextureImageValid(_texture.WebGLTexture.webgl_textureid)) {
+                        yyError("vertex_submit: trying to use an invalid texture");
+						return;
+					}
+					
                 }
                 pBuff = g_webGL.AllocVerts(_primType, _texture.WebGLTexture.webgl_textureid, m_FVF, vertexCount);
             }

scripts/yyWebGL.js

@@ -5046,6 +5046,26 @@ function WebGL_IsTextureValid(_tex, _mipoptions)
     }
 }
 
+function WebGL_IsTextureImageValid(_tex)
+{
+	// check if bound image is a valid object that a texture can be created from
+	if(_tex.Image == undefined || _tex.Image == null)
+	{
+		return false;
+	}
+	
+	if(_tex.Image instanceof HTMLImageElement
+		|| _tex.Image instanceof HTMLCanvasElement
+		|| _tex.Image instanceof HTMLVideoElement
+		|| _tex.Image instanceof ImageData
+		|| _tex.Image instanceof Uint8Array
+	)
+	{
+		return true;
+	}
+	return false;
+}
+