ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GSdx: should fix Issue 263, but I could not verify it 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1338 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gabest11 2009-06-06 10:11:22 +00:00
parent cdd68f345e
commit 743e93f3ee
5 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/GSdx/GSRenderer.cpp
View File

@ -243,7 +243,7 @@ bool GSRenderer::Merge(int field)
int field2 = 1 - ((m_interlace - 1) & 1); int field2 = 1 - ((m_interlace - 1) & 1);
int mode = (m_interlace - 1) >> 1; int mode = (m_interlace - 1) >> 1;
m_dev->Interlace(ds, field ^ field2, mode, tex[1]->m_scale.y); m_dev->Interlace(ds, field ^ field2, mode, tex[1] ? tex[1]->m_scale.y : tex[0]->m_scale.y);
} }
} }

2
plugins/GSdx/GSTexture.h
View File

@ -35,10 +35,12 @@ public:
enum {None, RenderTarget, DepthStencil, Texture, Offscreen}; enum {None, RenderTarget, DepthStencil, Texture, Offscreen};
virtual operator bool() = 0; virtual operator bool() = 0;
virtual int GetType() const = 0; virtual int GetType() const = 0;
virtual int GetWidth() const = 0; virtual int GetWidth() const = 0;
virtual int GetHeight() const = 0; virtual int GetHeight() const = 0;
virtual int GetFormat() const = 0; virtual int GetFormat() const = 0;
virtual bool Update(const GSVector4i& r, const void* data, int pitch) = 0; virtual bool Update(const GSVector4i& r, const void* data, int pitch) = 0;
virtual bool Map(uint8** bits, int& pitch, const GSVector4i* r = NULL) = 0; virtual bool Map(uint8** bits, int& pitch, const GSVector4i* r = NULL) = 0;
virtual void Unmap() = 0; virtual void Unmap() = 0;

1
plugins/GSdx/GSTexture10.h
View File

@ -41,6 +41,7 @@ public:
int GetWidth() const; int GetWidth() const;
int GetHeight() const; int GetHeight() const;
int GetFormat() const; int GetFormat() const;
bool Update(const GSVector4i& r, const void* data, int pitch); bool Update(const GSVector4i& r, const void* data, int pitch);
bool Map(uint8** bits, int& pitch, const GSVector4i* r); bool Map(uint8** bits, int& pitch, const GSVector4i* r);
void Unmap(); void Unmap();

1
plugins/GSdx/GSTexture7.h
View File

@ -41,6 +41,7 @@ public:
int GetWidth() const; int GetWidth() const;
int GetHeight() const; int GetHeight() const;
int GetFormat() const; int GetFormat() const;
bool Update(const GSVector4i& r, const void* data, int pitch); bool Update(const GSVector4i& r, const void* data, int pitch);
bool Map(uint8** bits, int& pitch, const GSVector4i* r); bool Map(uint8** bits, int& pitch, const GSVector4i* r);
void Unmap(); void Unmap();

3
plugins/GSdx/GSTexture9.h
View File

@ -41,13 +41,12 @@ public:
int GetWidth() const; int GetWidth() const;
int GetHeight() const; int GetHeight() const;
int GetFormat() const; int GetFormat() const;
bool Update(const GSVector4i& r, const void* data, int pitch); bool Update(const GSVector4i& r, const void* data, int pitch);
bool Map(uint8** bits, int& pitch, const GSVector4i* r); bool Map(uint8** bits, int& pitch, const GSVector4i* r);
void Unmap(); void Unmap();
bool Save(const string& fn, bool dds = false); bool Save(const string& fn, bool dds = false);
//IDirect3DTexture9* operator->(); // TODO: remove direct access
operator IDirect3DSurface9*(); operator IDirect3DSurface9*();
operator IDirect3DTexture9*(); operator IDirect3DTexture9*();
}; };