Add dummy key methods for UBSan RTTI.

src/Main/FrameBuffer.hpp

@@ -36,6 +36,8 @@ namespace sw
 
 	class FrameBuffer
 	{
+		virtual void typeinfo();   // Dummy key method (https://gcc.gnu.org/onlinedocs/gcc/Vague-Linkage.html)
+
 	public:
 		FrameBuffer(int width, int height, bool fullscreen, bool topLeftOrigin);
 
@@ -103,6 +105,8 @@ namespace sw
 
 		static bool topLeftOrigin;
 	};
+
+	inline void FrameBuffer::typeinfo() {}
 }
 
 #endif	 //	sw_FrameBuffer_hpp

src/OpenGL/common/Image.hpp

@@ -48,6 +48,8 @@ size_t ComputePackingOffset(GLenum format, GLenum type, GLsizei width, GLsizei h
 
 class Image : public sw::Surface, public gl::Object
 {
+	virtual void typeinfo();   // Dummy key method (https://gcc.gnu.org/onlinedocs/gcc/Vague-Linkage.html)
+
 public:
 	// 2D texture image
 	Image(Texture *parentTexture, GLsizei width, GLsizei height, GLenum format, GLenum type)
@@ -192,6 +194,8 @@ protected:
 	void loadD32FS8ImageData(GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, int inputPitch, int inputHeight, const void *input, void *buffer);
 };
 
+inline void Image::typeinfo() {}
+
 #ifdef __ANDROID__
 
 inline GLenum GLPixelFormatFromAndroid(int halFormat)

src/OpenGL/libEGL/BUILD.gn

@@ -57,11 +57,6 @@ shared_library("swiftshader_libEGL") {
 
   if (is_debug) {
     sources += [ "../common/debug.cpp" ]
-  } else if (is_linux) {
-    sources += [
-      "../../Renderer/Surface.cpp",
-      "../common/Image.cpp",
-    ]
   }
 
   if (is_mac) {

src/OpenGL/libEGL/Display.h

@@ -37,6 +37,8 @@ namespace egl
 
 	class Display
 	{
+		virtual void typeinfo();   // Dummy key method (https://gcc.gnu.org/onlinedocs/gcc/Vague-Linkage.html)
+
 	public:
 		static Display *get(EGLDisplay dpy);
 
@@ -97,6 +99,8 @@ namespace egl
 
 		gl::NameSpace<Image> mSharedImageNameSpace;
 	};
+
+	inline void Display::typeinfo() {}
 }
 
 #endif   // INCLUDE_DISPLAY_H_

src/OpenGL/libEGL/EGLSurface.h

@@ -33,6 +33,8 @@ class Image;
 
 class Surface : public gl::Object
 {
+	virtual void typeinfo();   // Dummy key method (https://gcc.gnu.org/onlinedocs/gcc/Vague-Linkage.html)
+
 public:
 	virtual bool initialize();
 	virtual void swap() = 0;
@@ -96,6 +98,8 @@ protected:
 	EGLint swapInterval;
 };
 
+inline void Surface::typeinfo() {}
+
 class WindowSurface : public Surface
 {
 public:

src/Renderer/Surface.hpp

@@ -250,6 +250,8 @@ namespace sw
 			bool dirty;
 		};
 
+		virtual void typeinfo();   // Dummy key method (https://gcc.gnu.org/onlinedocs/gcc/Vague-Linkage.html)
+
 	public:
 		Surface(int width, int height, int depth, Format format, void *pixels, int pitch, int slice);
 		Surface(Resource *texture, int width, int height, int depth, Format format, bool lockable, bool renderTarget, int pitchP = 0);
@@ -475,6 +477,8 @@ namespace sw
 
 namespace sw
 {
+	inline void Surface::typeinfo() {}
+
 	void *Surface::lock(int x, int y, int z, Lock lock, Accessor client, bool internal)
 	{
 		return internal ? lockInternal(x, y, z, lock, client) : lockExternal(x, y, z, lock, client);