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

GSdx: updated linux project files. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4329 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gabest11 2011-02-20 19:21:18 +00:00
parent dcf81693f6
commit 564c44bf7e
3 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
plugins/GSdx/GSTextureSW.cpp
View File

@ -63,8 +63,6 @@ bool GSTextureSW::Update(const GSVector4i& r, const void* data, int pitch)
bool GSTextureSW::Map(GSMap& m, const GSVector4i* r) bool GSTextureSW::Map(GSMap& m, const GSVector4i* r)
{ {
HRESULT hr;
if(m_data != NULL && r->left >= 0 && r->right <= m_size.x && r->top >= 0 && r->bottom <= m_size.y) if(m_data != NULL && r->left >= 0 && r->right <= m_size.x && r->top >= 0 && r->bottom <= m_size.y)
{ {
if(!_interlockedbittestandset(&m_mapped, 0)) if(!_interlockedbittestandset(&m_mapped, 0))
@ -111,6 +109,8 @@ struct BITMAPINFOHEADER
uint32 biClrUsed; uint32 biClrUsed;
uint32 biClrImportant; uint32 biClrImportant;
}; };
#define BI_RGB 0
#pragma pack(pop) #pragma pack(pop)
@ -126,19 +126,23 @@ bool GSTextureSW::Save(const string& fn, bool dds)
memset(&bih, 0, sizeof(bih)); memset(&bih, 0, sizeof(bih));
bih.biSize = sizeof(bih); bih.biSize = sizeof(bih);
bih.biWidth = m_size.x; bih.biWidth = m_size.x;
bih.biHeight = m_size.y; bih.biHeight = m_size.y;
bih.biPlanes = 1; bih.biPlanes = 1;
bih.biBitCount = 32; bih.biBitCount = 32;
bih.biCompression = BI_RGB; bih.biCompression = BI_RGB;
bih.biSizeImage = m_size.x * m_size.y << 2; bih.biSizeImage = m_size.x * m_size.y << 2;
BITMAPFILEHEADER bfh; BITMAPFILEHEADER bfh;
memset(&bfh, 0, sizeof(bfh)); memset(&bfh, 0, sizeof(bfh));
bfh.bfType = 'MB'; uint8* bfType = (uint8*)bfh.bfType;
// bfh.bfType = 'MB';
bfType[0] = 0x42;
bfType[1] = 0x4d;
bfh.bfOffBits = sizeof(bfh) + sizeof(bih); bfh.bfOffBits = sizeof(bfh) + sizeof(bih);
bfh.bfSize = bfh.bfOffBits + bih.biSizeImage; bfh.bfSize = bfh.bfOffBits + bih.biSizeImage;
bfh.bfReserved1 = bfh.bfReserved2 = 0; bfh.bfReserved1 = bfh.bfReserved2 = 0;

4
plugins/GSdx/GSdx.gcc.cbp
View File

@ -82,6 +82,8 @@
<Unit filename="GSDevice.h" /> <Unit filename="GSDevice.h" />
<Unit filename="GSDeviceNull.cpp" /> <Unit filename="GSDeviceNull.cpp" />
<Unit filename="GSDeviceNull.h" /> <Unit filename="GSDeviceNull.h" />
<Unit filename="GSDeviceSW.cpp" />
<Unit filename="GSDeviceSW.h" />
<Unit filename="GSDirtyRect.cpp" /> <Unit filename="GSDirtyRect.cpp" />
<Unit filename="GSDirtyRect.h" /> <Unit filename="GSDirtyRect.h" />
<Unit filename="GSDrawScanline.cpp" /> <Unit filename="GSDrawScanline.cpp" />
@ -124,6 +126,8 @@
<Unit filename="GSTextureCacheSW.h" /> <Unit filename="GSTextureCacheSW.h" />
<Unit filename="GSTextureNull.cpp" /> <Unit filename="GSTextureNull.cpp" />
<Unit filename="GSTextureNull.h" /> <Unit filename="GSTextureNull.h" />
<Unit filename="GSTextureSW.cpp" />
<Unit filename="GSTextureSW.h" />
<Unit filename="GSThread.cpp" /> <Unit filename="GSThread.cpp" />
<Unit filename="GSThread.h" /> <Unit filename="GSThread.h" />
<Unit filename="GSUtil.cpp" /> <Unit filename="GSUtil.cpp" />

10
plugins/GSdx/GSdx.icc.cbp
View File

@ -13,6 +13,10 @@
<Option compiler="icc" /> <Option compiler="icc" />
<Option createDefFile="1" /> <Option createDefFile="1" />
<Option createStaticLib="1" /> <Option createStaticLib="1" />
<Compiler>
<Add option="-O0" />
<Add option="-g" />
</Compiler>
</Target> </Target>
<Target title="Release"> <Target title="Release">
<Option output="bin/Release/libGSdx" prefix_auto="1" extension_auto="1" /> <Option output="bin/Release/libGSdx" prefix_auto="1" extension_auto="1" />
@ -22,7 +26,7 @@
<Option createDefFile="1" /> <Option createDefFile="1" />
<Option createStaticLib="1" /> <Option createStaticLib="1" />
<Compiler> <Compiler>
<Add option="-Ob2" /> <Add option="-msse2" />
<Add option="-O2" /> <Add option="-O2" />
</Compiler> </Compiler>
</Target> </Target>
@ -73,6 +77,8 @@
<Unit filename="GSDevice.h" /> <Unit filename="GSDevice.h" />
<Unit filename="GSDeviceNull.cpp" /> <Unit filename="GSDeviceNull.cpp" />
<Unit filename="GSDeviceNull.h" /> <Unit filename="GSDeviceNull.h" />
<Unit filename="GSDeviceSW.cpp" />
<Unit filename="GSDeviceSW.h" />
<Unit filename="GSDirtyRect.cpp" /> <Unit filename="GSDirtyRect.cpp" />
<Unit filename="GSDirtyRect.h" /> <Unit filename="GSDirtyRect.h" />
<Unit filename="GSDrawScanline.cpp" /> <Unit filename="GSDrawScanline.cpp" />
@ -114,6 +120,8 @@
<Unit filename="GSTextureCacheSW.h" /> <Unit filename="GSTextureCacheSW.h" />
<Unit filename="GSTextureNull.cpp" /> <Unit filename="GSTextureNull.cpp" />
<Unit filename="GSTextureNull.h" /> <Unit filename="GSTextureNull.h" />
<Unit filename="GSTextureSW.cpp" />
<Unit filename="GSTextureSW.h" />
<Unit filename="GSThread.cpp" /> <Unit filename="GSThread.cpp" />
<Unit filename="GSThread.h" /> <Unit filename="GSThread.h" />
<Unit filename="GSUtil.cpp" /> <Unit filename="GSUtil.cpp" />