Commit 147f6686 by Alexis Hetu Committed by Alexis Hétu

Fixed Mac build

The Linux build fix had broken the Mac build, so the new "typeinfo" virtual function were moved from the header files to the source files to fix both builds simultaneously. Change-Id: I37f5ef4bd5ec4da34a19531dcb85df6a98728aa1 Reviewed-on: https://swiftshader-review.googlesource.com/8748Tested-by: 's avatarAlexis Hétu <sugoi@google.com> Reviewed-by: 's avatarAlexis Hétu <sugoi@google.com>
parent bf6169dd
...@@ -35,6 +35,7 @@ namespace sw ...@@ -35,6 +35,7 @@ namespace sw
FrameBuffer::Cursor FrameBuffer::cursor = {0}; FrameBuffer::Cursor FrameBuffer::cursor = {0};
bool FrameBuffer::topLeftOrigin = false; bool FrameBuffer::topLeftOrigin = false;
void FrameBuffer::typeinfo() {}
FrameBuffer::FrameBuffer(int width, int height, bool fullscreen, bool topLeftOrigin) FrameBuffer::FrameBuffer(int width, int height, bool fullscreen, bool topLeftOrigin)
{ {
......
...@@ -105,8 +105,6 @@ namespace sw ...@@ -105,8 +105,6 @@ namespace sw
static bool topLeftOrigin; static bool topLeftOrigin;
}; };
inline void FrameBuffer::typeinfo() {}
} }
#endif // sw_FrameBuffer_hpp #endif // sw_FrameBuffer_hpp
...@@ -1178,6 +1178,8 @@ namespace egl ...@@ -1178,6 +1178,8 @@ namespace egl
} }
} }
void Image::typeinfo() {}
Image::~Image() Image::~Image()
{ {
if(parentTexture) if(parentTexture)
......
...@@ -194,8 +194,6 @@ protected: ...@@ -194,8 +194,6 @@ protected:
void loadD32FS8ImageData(GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, int inputPitch, int inputHeight, const void *input, void *buffer); 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__ #ifdef __ANDROID__
inline GLenum GLPixelFormatFromAndroid(int halFormat) inline GLenum GLPixelFormatFromAndroid(int halFormat)
......
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
namespace egl namespace egl
{ {
void Display::typeinfo() {}
Display *Display::get(EGLDisplay dpy) Display *Display::get(EGLDisplay dpy)
{ {
......
...@@ -99,8 +99,6 @@ namespace egl ...@@ -99,8 +99,6 @@ namespace egl
gl::NameSpace<Image> mSharedImageNameSpace; gl::NameSpace<Image> mSharedImageNameSpace;
}; };
inline void Display::typeinfo() {}
} }
#endif // INCLUDE_DISPLAY_H_ #endif // INCLUDE_DISPLAY_H_
...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
namespace egl namespace egl
{ {
void Surface::typeinfo() {}
Surface::Surface(const Display *display, const Config *config) : display(display), config(config) Surface::Surface(const Display *display, const Config *config) : display(display), config(config)
{ {
......
...@@ -98,8 +98,6 @@ protected: ...@@ -98,8 +98,6 @@ protected:
EGLint swapInterval; EGLint swapInterval;
}; };
inline void Surface::typeinfo() {}
class WindowSurface : public Surface class WindowSurface : public Surface
{ {
public: public:
......
...@@ -39,6 +39,7 @@ namespace sw ...@@ -39,6 +39,7 @@ namespace sw
unsigned int *Surface::palette = 0; unsigned int *Surface::palette = 0;
unsigned int Surface::paletteID = 0; unsigned int Surface::paletteID = 0;
void Surface::typeinfo() {}
void Rect::clip(int minX, int minY, int maxX, int maxY) void Rect::clip(int minX, int minY, int maxX, int maxY)
{ {
......
...@@ -477,8 +477,6 @@ namespace sw ...@@ -477,8 +477,6 @@ namespace sw
namespace sw namespace sw
{ {
inline void Surface::typeinfo() {}
void *Surface::lock(int x, int y, int z, Lock lock, Accessor client, bool internal) 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); return internal ? lockInternal(x, y, z, lock, client) : lockExternal(x, y, z, lock, client);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment