mirror of https://github.com/PCSX2/pcsx2.git
GSdx: last commit broke the sw renderer, the compiler seems to misalign the "this" pointer for member callbacks when two base classes have virtual destructors at the same time (or just virtual members, didn't test it).
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1467 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
parent
ae62a56cc1
commit
2ed180d7c0
|
@ -25,7 +25,8 @@ template<int i> class GSAlignedClass
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
GSAlignedClass() {}
|
GSAlignedClass() {}
|
||||||
virtual ~GSAlignedClass() {}
|
|
||||||
|
// never put a destructor here, breaks the member callbacks of GSDrawScanline which also inherits IDrawScanline
|
||||||
|
|
||||||
void* operator new (size_t size)
|
void* operator new (size_t size)
|
||||||
{
|
{
|
||||||
|
|
|
@ -248,6 +248,7 @@ protected:
|
||||||
|
|
||||||
public:
|
public:
|
||||||
GSTextureFX();
|
GSTextureFX();
|
||||||
|
virtual ~GSTextureFX() {}
|
||||||
|
|
||||||
virtual bool Create(GSDevice* dev);
|
virtual bool Create(GSDevice* dev);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue