mirror of
https://github.com/PCSX2/pcsx2.git
synced 2026-11-17 19:44:19 +01:00
GSdx: got rid of that bogus multiple inheritance, it just didn't feel right
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1468 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
1 parent
2ed180d7c0
commit
fad91c7ebf
4 files changed
+5
-7
No files matched your search
@@ -26,9 +26,8 @@
|
||||
#include "GPUScanlineEnvironment.h"
|
||||
#include "GPUSetupPrimCodeGenerator.h"
|
||||
#include "GPUDrawScanlineCodeGenerator.h"
|
||||
#include "GSAlignedClass.h"
|
||||
|
||||
class GPUDrawScanline : public GSAlignedClass<16>, public IDrawScanline
|
||||
class GPUDrawScanline : public IDrawScanline
|
||||
{
|
||||
GPUScanlineEnvironment m_env;
|
||||
|
||||
|
||||
@@ -25,9 +25,8 @@ template<int i> class GSAlignedClass
|
||||
{
|
||||
public:
|
||||
GSAlignedClass() {}
|
||||
virtual ~GSAlignedClass() {}
|
||||
|
||||
// never put a destructor here, breaks the member callbacks of GSDrawScanline which also inherits IDrawScanline
|
||||
|
||||
void* operator new (size_t size)
|
||||
{
|
||||
return _aligned_malloc(size, i);
|
||||
|
||||
@@ -26,9 +26,8 @@
|
||||
#include "GSScanlineEnvironment.h"
|
||||
#include "GSSetupPrimCodeGenerator.h"
|
||||
#include "GSDrawScanlineCodeGenerator.h"
|
||||
#include "GSAlignedClass.h"
|
||||
|
||||
class GSDrawScanline : public GSAlignedClass<16>, public IDrawScanline
|
||||
class GSDrawScanline : public IDrawScanline
|
||||
{
|
||||
GSScanlineEnvironment m_env;
|
||||
GSScanlineSelector m_sel;
|
||||
|
||||
@@ -25,6 +25,7 @@
|
||||
#include "GSVertexSW.h"
|
||||
#include "GSFunctionMap.h"
|
||||
#include "GSThread.h"
|
||||
#include "GSAlignedClass.h"
|
||||
|
||||
__declspec(align(16)) class GSRasterizerData
|
||||
{
|
||||
@@ -46,7 +47,7 @@ public:
|
||||
virtual void PrintStats() = 0;
|
||||
};
|
||||
|
||||
class IDrawScanline
|
||||
class IDrawScanline : public GSAlignedClass<16>
|
||||
{
|
||||
public:
|
||||
typedef void (__fastcall *DrawScanlineStaticPtr)(int right, int left, int top, const GSVertexSW& v);
|
||||
|
||||
Reference in new issue
Block a user