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

GSdx: as usual, going back to msvc, suddenly wild errors appear. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4964 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gabest11 2011-11-08 13:22:54 +00:00
parent 0cf87a943b
commit f47ef5e644
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/GSdx/GS.cpp
View File

@ -553,7 +553,7 @@ EXPORT_C GSirqCallback(void (*irq)())
} }
} }
void pt(char* str){ void pt(const char* str){
struct tm *current; struct tm *current;
time_t now; time_t now;

18
plugins/GSdx/GSRendererHW.h
View File

@ -30,14 +30,7 @@
template<class Vertex> template<class Vertex>
class GSRendererHW : public GSRendererT<Vertex> class GSRendererHW : public GSRendererT<Vertex>
{ {
int m_width; protected:
int m_height;
int m_skip;
bool m_reset;
bool m_nativeres;
int m_upscale_multiplier;
int m_userhacks_skipdraw;
using GSRendererT<Vertex>::m_vt; using GSRendererT<Vertex>::m_vt;
using GSRendererT<Vertex>::m_count; using GSRendererT<Vertex>::m_count;
using GSRendererT<Vertex>::m_env; using GSRendererT<Vertex>::m_env;
@ -55,6 +48,15 @@ class GSRendererHW : public GSRendererT<Vertex>
using GSRendererT<Vertex>::s_savez; using GSRendererT<Vertex>::s_savez;
using GSRendererT<Vertex>::s_n; using GSRendererT<Vertex>::s_n;
private:
int m_width;
int m_height;
int m_skip;
bool m_reset;
bool m_nativeres;
int m_upscale_multiplier;
int m_userhacks_skipdraw;
#pragma region hacks #pragma region hacks
typedef bool (GSRendererHW::*OI_Ptr)(GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t); typedef bool (GSRendererHW::*OI_Ptr)(GSTexture* rt, GSTexture* ds, GSTextureCache::Source* t);