Explorar o código

Merge pull request #29783 from Faless/js/fix_build

Fix HTML5 build failed due to undefined symbol
Fabio Alessandrelli %!s(int64=6) %!d(string=hai) anos
pai
achega
7e108da078
Modificáronse 1 ficheiros con 4 adicións e 1 borrados
  1. 4 1
      drivers/gles2/rasterizer_storage_gles2.cpp

+ 4 - 1
drivers/gles2/rasterizer_storage_gles2.cpp

@@ -4688,6 +4688,7 @@ void RasterizerStorageGLES2::_render_target_allocate(RenderTarget *rt) {
 	/* BACK FBO */
 	/* For MSAA */
 
+#ifndef JAVASCRIPT_ENABLED
 	if (rt->msaa != VS::VIEWPORT_MSAA_DISABLED && config.multisample_supported) {
 
 		rt->multisample_active = true;
@@ -4743,7 +4744,9 @@ void RasterizerStorageGLES2::_render_target_allocate(RenderTarget *rt) {
 
 		glBindRenderbuffer(GL_RENDERBUFFER, 0);
 
-	} else {
+	} else
+#endif
+	{
 		rt->multisample_active = false;
 	}