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

GSdx: more alignment fixes for gcc. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4341 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gabest11 2011-02-22 20:58:21 +00:00
parent f205fa09af
commit 23a6b85852
17 changed files with 455 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
3rdparty/SDL-1.3.0-5387/SDL-1.3/SDL-1.3.cbp vendored
View File

@ -7,7 +7,7 @@
<Option compiler="gcc" /> <Option compiler="gcc" />
<Build> <Build>
<Target title="Debug"> <Target title="Debug">
<Option output="SDL-1" prefix_auto="1" extension_auto="1" /> <Option output="../../../bin/plugins/libSDL-1.3" prefix_auto="1" extension_auto="1" />
<Option object_output="obj/Debug/" /> <Option object_output="obj/Debug/" />
<Option type="3" /> <Option type="3" />
<Option compiler="gcc" /> <Option compiler="gcc" />
@ -18,7 +18,7 @@
</Compiler> </Compiler>
</Target> </Target>
<Target title="Release"> <Target title="Release">
<Option output="SDL-1" prefix_auto="1" extension_auto="1" /> <Option output="../../../bin/plugins/libSDL-1.3" prefix_auto="1" extension_auto="1" />
<Option object_output="obj/Release/" /> <Option object_output="obj/Release/" />
<Option type="3" /> <Option type="3" />
<Option compiler="gcc" /> <Option compiler="gcc" />
@ -659,6 +659,7 @@
<Extensions> <Extensions>
<code_completion /> <code_completion />
<debugger /> <debugger />
<envvars />
</Extensions> </Extensions>
</Project> </Project>
</CodeBlocks_project_file> </CodeBlocks_project_file>

282
3rdparty/SDL-1.3.0-5387/include/SDL_config.h vendored
View File

@ -1,3 +1,4 @@
/* include/SDL_config.h. Generated from SDL_config.h.in by configure. */
/* /*
SDL - Simple DirectMedia Layer SDL - Simple DirectMedia Layer
Copyright (C) 1997-2011 Sam Lantinga Copyright (C) 1997-2011 Sam Lantinga
@ -23,27 +24,274 @@
#ifndef _SDL_config_h #ifndef _SDL_config_h
#define _SDL_config_h #define _SDL_config_h
#include "SDL_platform.h"
/** /**
* \file SDL_config.h * \file SDL_config.h.in
* *
* SDL_config.h for any platform that doesn't build using the configure system. * This is a set of defines to configure the SDL features
*/ */
/* Add any platform that doesn't build using the configure system. */ /* General platform specific identifiers */
#if defined(__WIN32__) #include "SDL_platform.h"
#include "SDL_config_windows.h"
#elif defined(__MACOSX__) /* Make sure that this isn't included by Visual C++ */
#include "SDL_config_macosx.h" #ifdef _MSC_VER
#elif defined(__IPHONEOS__) #error You should copy include/SDL_config.h.default to include/SDL_config.h
#include "SDL_config_iphoneos.h" #endif
#elif defined(__ANDROID__)
#include "SDL_config_android.h" /* C language features */
#elif defined(__NINTENDODS__) /* #undef const */
#include "SDL_config_nintendods.h" /* #undef inline */
/* #undef volatile */
/* C datatypes */
#if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H)
/* #undef size_t */
/* #undef int8_t */
/* #undef uint8_t */
/* #undef int16_t */
/* #undef uint16_t */
/* #undef int32_t */
/* #undef uint32_t */
/* #undef int64_t */
/* #undef uint64_t */
/* #undef uintptr_t */
#endif /* !_STDINT_H_ && !HAVE_STDINT_H */
#define SIZEOF_VOIDP 4
#define SDL_HAS_64BIT_TYPE 1
#define HAVE_GCC_ATOMICS 1
/* #undef HAVE_GCC_SYNC_LOCK_TEST_AND_SET */
/* Comment this if you want to build without any C library requirements */
#define HAVE_LIBC 1
#if HAVE_LIBC
/* Useful headers */
#define HAVE_ALLOCA_H 1
#define HAVE_SYS_TYPES_H 1
#define HAVE_STDIO_H 1
#define STDC_HEADERS 1
#define HAVE_STDLIB_H 1
#define HAVE_STDARG_H 1
#define HAVE_MALLOC_H 1
#define HAVE_MEMORY_H 1
#define HAVE_STRING_H 1
#define HAVE_STRINGS_H 1
#define HAVE_INTTYPES_H 1
#define HAVE_STDINT_H 1
#define HAVE_CTYPE_H 1
#define HAVE_MATH_H 1
#define HAVE_ICONV_H 1
#define HAVE_SIGNAL_H 1
/* C library functions */
#define HAVE_MALLOC 1
#define HAVE_CALLOC 1
#define HAVE_REALLOC 1
#define HAVE_FREE 1
#define HAVE_ALLOCA 1
#ifndef __WIN32__ /* Don't use C runtime versions of these on Windows */
#define HAVE_GETENV 1
#define HAVE_SETENV 1
#define HAVE_PUTENV 1
#define HAVE_UNSETENV 1
#endif
#define HAVE_QSORT 1
#define HAVE_ABS 1
#define HAVE_BCOPY 1
#define HAVE_MEMSET 1
#define HAVE_MEMCPY 1
#define HAVE_MEMMOVE 1
#define HAVE_MEMCMP 1
#define HAVE_STRLEN 1
/* #undef HAVE_STRLCPY */
/* #undef HAVE_STRLCAT */
#define HAVE_STRDUP 1
/* #undef HAVE__STRREV */
/* #undef HAVE__STRUPR */
/* #undef HAVE__STRLWR */
/* #undef HAVE_INDEX */
/* #undef HAVE_RINDEX */
#define HAVE_STRCHR 1
#define HAVE_STRRCHR 1
#define HAVE_STRSTR 1
/* #undef HAVE_ITOA */
/* #undef HAVE__LTOA */
/* #undef HAVE__UITOA */
/* #undef HAVE__ULTOA */
#define HAVE_STRTOL 1
#define HAVE_STRTOUL 1
/* #undef HAVE__I64TOA */
/* #undef HAVE__UI64TOA */
#define HAVE_STRTOLL 1
#define HAVE_STRTOULL 1
#define HAVE_STRTOD 1
#define HAVE_ATOI 1
#define HAVE_ATOF 1
#define HAVE_STRCMP 1
#define HAVE_STRNCMP 1
/* #undef HAVE__STRICMP */
#define HAVE_STRCASECMP 1
/* #undef HAVE__STRNICMP */
#define HAVE_STRNCASECMP 1
#define HAVE_SSCANF 1
#define HAVE_SNPRINTF 1
#define HAVE_VSNPRINTF 1
#define HAVE_M_PI
#define HAVE_ATAN 1
#define HAVE_ATAN2 1
#define HAVE_CEIL 1
#define HAVE_COPYSIGN 1
#define HAVE_COS 1
#define HAVE_COSF 1
#define HAVE_FABS 1
#define HAVE_FLOOR 1
#define HAVE_LOG 1
#define HAVE_POW 1
#define HAVE_SCALBN 1
#define HAVE_SIN 1
#define HAVE_SINF 1
#define HAVE_SQRT 1
#define HAVE_SIGACTION 1
#define HAVE_SETJMP 1
#define HAVE_NANOSLEEP 1
#define HAVE_SYSCONF 1
/* #undef HAVE_SYSCTLBYNAME */
/* #undef HAVE_CLOCK_GETTIME */
/* #undef HAVE_GETPAGESIZE */
#define HAVE_MPROTECT 1
#define HAVE_ICONV 1
#else #else
#include "SDL_config_minimal.h" /* We may need some replacement for stdarg.h here */
#endif /* platform config */ #include <stdarg.h>
#endif /* HAVE_LIBC */
/* SDL internal assertion support */
/* #undef SDL_DEFAULT_ASSERT_LEVEL */
/* Allow disabling of core subsystems */
/* #undef SDL_ATOMIC_DISABLED */
#define SDL_AUDIO_DISABLED 1
/* #undef SDL_AUDIO_DISABLED */
/* #undef SDL_CPUINFO_DISABLED */
/* #undef SDL_EVENTS_DISABLED */
/* #undef SDL_FILE_DISABLED */
/* #undef SDL_JOYSTICK_DISABLED */
/* #undef SDL_HAPTIC_DISABLED */
/* #undef SDL_LOADSO_DISABLED */
/* #undef SDL_RENDER_DISABLED */
/* #undef SDL_THREADS_DISABLED */
/* #undef SDL_TIMERS_DISABLED */
/* #undef SDL_VIDEO_DISABLED */
/* #undef SDL_POWER_DISABLED */
/* Enable various audio drivers */
/* #undef SDL_AUDIO_DRIVER_ARTS */
/* #undef SDL_AUDIO_DRIVER_ARTS_DYNAMIC */
/* #undef SDL_AUDIO_DRIVER_BEOSAUDIO */
/* #undef SDL_AUDIO_DRIVER_BSD */
/* #undef SDL_AUDIO_DRIVER_COREAUDIO */
/* #undef SDL_AUDIO_DRIVER_DMEDIA */
/* #undef SDL_AUDIO_DRIVER_DSOUND */
/* #undef SDL_AUDIO_DRIVER_MMEAUDIO */
/* #undef SDL_AUDIO_DRIVER_NDS */
/* #undef SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H */
/* #undef SDL_AUDIO_DRIVER_PAUDIO */
/* #undef SDL_AUDIO_DRIVER_QSA */
/* #undef SDL_AUDIO_DRIVER_SUNAUDIO */
/* #undef SDL_AUDIO_DRIVER_WINWAVEOUT */
/* #undef SDL_AUDIO_DRIVER_FUSIONSOUND */
/* #undef SDL_AUDIO_DRIVER_FUSIONSOUND_DYNAMIC */
/* Enable various input drivers */
#define SDL_INPUT_LINUXEV 1
/* #undef SDL_INPUT_TSLIB */
/* #undef SDL_JOYSTICK_BEOS */
/* #undef SDL_JOYSTICK_DINPUT */
/* #undef SDL_JOYSTICK_DUMMY */
/* #undef SDL_JOYSTICK_IOKIT */
#define SDL_JOYSTICK_LINUX 1
/* #undef SDL_JOYSTICK_NDS */
/* #undef SDL_JOYSTICK_WINMM */
/* #undef SDL_JOYSTICK_USBHID */
/* #undef SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H */
/* #undef SDL_HAPTIC_DUMMY */
#define SDL_HAPTIC_LINUX 1
/* #undef SDL_HAPTIC_IOKIT */
/* #undef SDL_HAPTIC_DINPUT */
/* Enable various shared object loading systems */
/* #undef SDL_LOADSO_BEOS */
/* #undef SDL_LOADSO_DLCOMPAT */
#define SDL_LOADSO_DLOPEN 1
/* #undef SDL_LOADSO_DUMMY */
/* #undef SDL_LOADSO_LDG */
/* #undef SDL_LOADSO_WINDOWS */
/* Enable various threading systems */
/* #undef SDL_THREAD_BEOS */
/* #undef SDL_THREAD_NDS */
#define SDL_THREAD_PTHREAD 1
#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX 1
/* #undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP */
/* #undef SDL_THREAD_SPROC */
/* #undef SDL_THREAD_WINDOWS */
/* Enable various timer systems */
/* #undef SDL_TIMER_BEOS */
/* #undef SDL_TIMER_DUMMY */
/* #undef SDL_TIMER_NDS */
#define SDL_TIMER_UNIX 1
/* #undef SDL_TIMER_WINDOWS */
/* #undef SDL_TIMER_WINCE */
/* Enable various video drivers */
/* #undef SDL_VIDEO_DRIVER_BWINDOW */
/* #undef SDL_VIDEO_DRIVER_COCOA */
/* #undef SDL_VIDEO_DRIVER_DIRECTFB */
/* #undef SDL_VIDEO_DRIVER_DIRECTFB_DYNAMIC */
#define SDL_VIDEO_DRIVER_DUMMY 1
/* #undef SDL_VIDEO_DRIVER_NDS */
/* #undef SDL_VIDEO_DRIVER_WINDOWS */
#define SDL_VIDEO_DRIVER_X11 1
#define SDL_VIDEO_DRIVER_X11_DYNAMIC "libX11.so.6"
#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT "libXext.so.6"
#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR "libXrandr.so.2"
#define SDL_VIDEO_DRIVER_X11_DYNAMIC_XINPUT "libXi.so.6"
/* #undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XSS */
#define SDL_VIDEO_DRIVER_X11_VIDMODE 1
#define SDL_VIDEO_DRIVER_X11_XINERAMA 1
#define SDL_VIDEO_DRIVER_X11_XRANDR 1
#define SDL_VIDEO_DRIVER_X11_XINPUT 1
/* #undef SDL_VIDEO_DRIVER_X11_SCRNSAVER */
#define SDL_VIDEO_DRIVER_X11_XV 1
#define SDL_VIDEO_DRIVER_X11_XSHAPE 1
/* #undef SDL_VIDEO_RENDER_D3D */
#define SDL_VIDEO_RENDER_OGL 1
/* #undef SDL_VIDEO_RENDER_OGL_ES */
/* #undef SDL_VIDEO_RENDER_DIRECTFB */
/* Enable OpenGL support */
#define SDL_VIDEO_OPENGL 1
/* #undef SDL_VIDEO_OPENGL_ES */
/* #undef SDL_VIDEO_OPENGL_BGL */
/* #undef SDL_VIDEO_OPENGL_CGL */
#define SDL_VIDEO_OPENGL_GLX 1
/* #undef SDL_VIDEO_OPENGL_WGL */
/* #undef SDL_VIDEO_OPENGL_OSMESA */
/* #undef SDL_VIDEO_OPENGL_OSMESA_DYNAMIC */
/* Enable system power support */
#define SDL_POWER_LINUX 1
/* #undef SDL_POWER_WINDOWS */
/* #undef SDL_POWER_MACOSX */
/* #undef SDL_POWER_BEOS */
/* #undef SDL_POWER_NINTENDODS */
/* #undef SDL_POWER_HARDWIRED */
/* Enable assembly routines */
#define SDL_ASSEMBLY_ROUTINES 1
#endif /* _SDL_config_h */ #endif /* _SDL_config_h */

12
plugins/GSdx/GSDevice.cpp
View File

@ -110,7 +110,7 @@ void GSDevice::Present(GSTexture* st, GSTexture* dt, const GSVector4& dr, int sh
StretchRect(st, dt, dr, shader); StretchRect(st, dt, dr, shader);
} }
GSTexture* GSDevice::Fetch(int type, int w, int h, bool msaa, int format) GSTexture* GSDevice::FetchSurface(int type, int w, int h, bool msaa, int format)
{ {
GSVector2i size(w, h); GSVector2i size(w, h);
@ -126,7 +126,7 @@ GSTexture* GSDevice::Fetch(int type, int w, int h, bool msaa, int format)
} }
} }
return Create(type, w, h, msaa, format); return CreateSurface(type, w, h, msaa, format);
} }
void GSDevice::EndScene() void GSDevice::EndScene()
@ -168,22 +168,22 @@ void GSDevice::AgePool()
GSTexture* GSDevice::CreateRenderTarget(int w, int h, bool msaa, int format) GSTexture* GSDevice::CreateRenderTarget(int w, int h, bool msaa, int format)
{ {
return Fetch(GSTexture::RenderTarget, w, h, msaa, format); return FetchSurface(GSTexture::RenderTarget, w, h, msaa, format);
} }
GSTexture* GSDevice::CreateDepthStencil(int w, int h, bool msaa, int format) GSTexture* GSDevice::CreateDepthStencil(int w, int h, bool msaa, int format)
{ {
return Fetch(GSTexture::DepthStencil, w, h, msaa, format); return FetchSurface(GSTexture::DepthStencil, w, h, msaa, format);
} }
GSTexture* GSDevice::CreateTexture(int w, int h, int format) GSTexture* GSDevice::CreateTexture(int w, int h, int format)
{ {
return Fetch(GSTexture::Texture, w, h, false, format); return FetchSurface(GSTexture::Texture, w, h, false, format);
} }
GSTexture* GSDevice::CreateOffscreen(int w, int h, int format) GSTexture* GSDevice::CreateOffscreen(int w, int h, int format)
{ {
return Fetch(GSTexture::Offscreen, w, h, false, format); return FetchSurface(GSTexture::Offscreen, w, h, false, format);
} }
void GSDevice::StretchRect(GSTexture* st, GSTexture* dt, const GSVector4& dr, int shader, bool linear) void GSDevice::StretchRect(GSTexture* st, GSTexture* dt, const GSVector4& dr, int shader, bool linear)

8
plugins/GSdx/GSDevice.h
View File

@ -65,8 +65,8 @@ protected:
struct {size_t stride, start, count, limit;} m_vertices; struct {size_t stride, start, count, limit;} m_vertices;
unsigned int m_frame; // for ageing the pool unsigned int m_frame; // for ageing the pool
virtual GSTexture* Create(int type, int w, int h, bool msaa, int format) = 0; virtual GSTexture* CreateSurface(int type, int w, int h, bool msaa, int format) = 0;
virtual GSTexture* Fetch(int type, int w, int h, bool msaa, int format); virtual GSTexture* FetchSurface(int type, int w, int h, bool msaa, int format);
virtual void DoMerge(GSTexture* st[2], GSVector4* sr, GSTexture* dt, GSVector4* dr, bool slbg, bool mmod, const GSVector4& c) = 0; virtual void DoMerge(GSTexture* st[2], GSVector4* sr, GSTexture* dt, GSVector4* dr, bool slbg, bool mmod, const GSVector4& c) = 0;
virtual void DoInterlace(GSTexture* st, GSTexture* dt, int shader, bool linear, float yoffset) = 0; virtual void DoInterlace(GSTexture* st, GSTexture* dt, int shader, bool linear, float yoffset) = 0;
@ -107,10 +107,10 @@ public:
virtual GSTexture* CopyOffscreen(GSTexture* src, const GSVector4& sr, int w, int h, int format = 0) {return NULL;} virtual GSTexture* CopyOffscreen(GSTexture* src, const GSVector4& sr, int w, int h, int format = 0) {return NULL;}
virtual void CopyRect(GSTexture* st, GSTexture* dt, const GSVector4i& r) {} virtual void CopyRect(GSTexture* st, GSTexture* dt, const GSVector4i& r) {}
virtual void StretchRect(GSTexture* st, GSTexture* dt, const GSVector4& dr, int shader = 0, bool linear = true);
virtual void StretchRect(GSTexture* st, const GSVector4& sr, GSTexture* dt, const GSVector4& dr, int shader = 0, bool linear = true) {} virtual void StretchRect(GSTexture* st, const GSVector4& sr, GSTexture* dt, const GSVector4& dr, int shader = 0, bool linear = true) {}
void StretchRect(GSTexture* st, GSTexture* dt, const GSVector4& dr, int shader = 0, bool linear = true);
virtual void PSSetShaderResources(GSTexture* sr0, GSTexture* sr1) {} virtual void PSSetShaderResources(GSTexture* sr0, GSTexture* sr1) {}
virtual void PSSetShaderResource(int i, GSTexture* sr) {} virtual void PSSetShaderResource(int i, GSTexture* sr) {}
virtual void OMSetRenderTargets(GSTexture* rt, GSTexture* ds, const GSVector4i* scissor = NULL) {} virtual void OMSetRenderTargets(GSTexture* rt, GSTexture* ds, const GSVector4i* scissor = NULL) {}

2
plugins/GSdx/GSDevice11.cpp
View File

@ -365,7 +365,7 @@ void GSDevice11::ClearStencil(GSTexture* t, uint8 c)
m_ctx->ClearDepthStencilView(*(GSTexture11*)t, D3D11_CLEAR_STENCIL, 0, c); m_ctx->ClearDepthStencilView(*(GSTexture11*)t, D3D11_CLEAR_STENCIL, 0, c);
} }
GSTexture* GSDevice11::Create(int type, int w, int h, bool msaa, int format) GSTexture* GSDevice11::CreateSurface(int type, int w, int h, bool msaa, int format)
{ {
HRESULT hr; HRESULT hr;

2
plugins/GSdx/GSDevice11.h
View File

@ -32,7 +32,7 @@ struct GSVertexShader11
class GSDevice11 : public GSDeviceDX class GSDevice11 : public GSDeviceDX
{ {
GSTexture* Create(int type, int w, int h, bool msaa, int format); GSTexture* CreateSurface(int type, int w, int h, bool msaa, int format);
void DoMerge(GSTexture* st[2], GSVector4* sr, GSTexture* dt, GSVector4* dr, bool slbg, bool mmod, const GSVector4& c); void DoMerge(GSTexture* st[2], GSVector4* sr, GSTexture* dt, GSVector4* dr, bool slbg, bool mmod, const GSVector4& c);
void DoInterlace(GSTexture* st, GSTexture* dt, int shader, bool linear, float yoffset = 0); void DoInterlace(GSTexture* st, GSTexture* dt, int shader, bool linear, float yoffset = 0);

2
plugins/GSdx/GSDevice9.cpp
View File

@ -566,7 +566,7 @@ void GSDevice9::ClearStencil(GSTexture* t, uint8 c)
m_dev->SetDepthStencilSurface(dssurface); m_dev->SetDepthStencilSurface(dssurface);
} }
GSTexture* GSDevice9::Create(int type, int w, int h, bool msaa, int format) GSTexture* GSDevice9::CreateSurface(int type, int w, int h, bool msaa, int format)
{ {
HRESULT hr; HRESULT hr;

2
plugins/GSdx/GSDevice9.h
View File

@ -67,7 +67,7 @@ struct GSVertexShader9
class GSDevice9 : public GSDeviceDX class GSDevice9 : public GSDeviceDX
{ {
GSTexture* Create(int type, int w, int h, bool msaa, int format); GSTexture* CreateSurface(int type, int w, int h, bool msaa, int format);
void DoMerge(GSTexture* st[2], GSVector4* sr, GSTexture* dt, GSVector4* dr, bool slbg, bool mmod, const GSVector4& c); void DoMerge(GSTexture* st[2], GSVector4* sr, GSTexture* dt, GSVector4* dr, bool slbg, bool mmod, const GSVector4& c);
void DoInterlace(GSTexture* st, GSTexture* dt, int shader, bool linear, float yoffset = 0); void DoInterlace(GSTexture* st, GSTexture* dt, int shader, bool linear, float yoffset = 0);

4
plugins/GSdx/GSDeviceDX.cpp
View File

@ -35,14 +35,14 @@ GSDeviceDX::~GSDeviceDX()
{ {
} }
GSTexture* GSDeviceDX::Fetch(int type, int w, int h, bool msaa, int format) GSTexture* GSDeviceDX::FetchSurface(int type, int w, int h, bool msaa, int format)
{ {
if(m_msaa < 2) if(m_msaa < 2)
{ {
msaa = false; msaa = false;
} }
return __super::Fetch(type, w, h, msaa, format); return __super::FetchSurface(type, w, h, msaa, format);
} }
bool GSDeviceDX::SetFeatureLevel(D3D_FEATURE_LEVEL level, bool compat_mode) bool GSDeviceDX::SetFeatureLevel(D3D_FEATURE_LEVEL level, bool compat_mode)

2
plugins/GSdx/GSDeviceDX.h
View File

@ -270,7 +270,7 @@ protected:
uint32 m_msaa; uint32 m_msaa;
DXGI_SAMPLE_DESC m_msaa_desc; DXGI_SAMPLE_DESC m_msaa_desc;
GSTexture* Fetch(int type, int w, int h, bool msaa, int format); GSTexture* FetchSurface(int type, int w, int h, bool msaa, int format);
public: public:
GSDeviceDX(); GSDeviceDX();

2
plugins/GSdx/GSDeviceNull.cpp
View File

@ -40,7 +40,7 @@ bool GSDeviceNull::Reset(int w, int h)
return true; return true;
} }
GSTexture* GSDeviceNull::Create(int type, int w, int h, bool msaa, int format) GSTexture* GSDeviceNull::CreateSurface(int type, int w, int h, bool msaa, int format)
{ {
return new GSTextureNull(type, w, h, format); return new GSTextureNull(type, w, h, format);
} }

2
plugins/GSdx/GSDeviceNull.h
View File

@ -27,7 +27,7 @@
class GSDeviceNull : public GSDevice class GSDeviceNull : public GSDevice
{ {
private: private:
GSTexture* Create(int type, int w, int h, bool msaa, int format); GSTexture* CreateSurface(int type, int w, int h, bool msaa, int format);
void DoMerge(GSTexture* st[2], GSVector4* sr, GSTexture* dt, GSVector4* dr, bool slbg, bool mmod, const GSVector4& c) {} void DoMerge(GSTexture* st[2], GSVector4* sr, GSTexture* dt, GSVector4* dr, bool slbg, bool mmod, const GSVector4& c) {}
void DoInterlace(GSTexture* st, GSTexture* dt, int shader, bool linear, float yoffset = 0) {} void DoInterlace(GSTexture* st, GSTexture* dt, int shader, bool linear, float yoffset = 0) {}

2
plugins/GSdx/GSDeviceSW.cpp
View File

@ -48,7 +48,7 @@ bool GSDeviceSW::Reset(int w, int h)
return true; return true;
} }
GSTexture* GSDeviceSW::Create(int type, int w, int h, bool msaa, int format) GSTexture* GSDeviceSW::CreateSurface(int type, int w, int h, bool msaa, int format)
{ {
if(format != 0) return false; // there is only one format if(format != 0) return false; // there is only one format

2
plugins/GSdx/GSDeviceSW.h
View File

@ -26,7 +26,7 @@
class GSDeviceSW : public GSDevice class GSDeviceSW : public GSDevice
{ {
GSTexture* Create(int type, int w, int h, bool msaa, int format); GSTexture* CreateSurface(int type, int w, int h, bool msaa, int format);
void DoMerge(GSTexture* st[2], GSVector4* sr, GSTexture* dt, GSVector4* dr, bool slbg, bool mmod, const GSVector4& c); void DoMerge(GSTexture* st[2], GSVector4* sr, GSTexture* dt, GSVector4* dr, bool slbg, bool mmod, const GSVector4& c);
void DoInterlace(GSTexture* st, GSTexture* dt, int shader, bool linear, float yoffset = 0); void DoInterlace(GSTexture* st, GSTexture* dt, int shader, bool linear, float yoffset = 0);

199
plugins/GSdx/GSLinuxDialog.cpp
View File

@ -20,109 +20,128 @@
*/ */
#include "stdafx.h" #include "stdafx.h"
#include "gtk/gtk.h" #include <gtk/gtk.h>
#include "GSdx.h"
static void SysMessage(const char *fmt, ...) static void SysMessage(const char *fmt, ...)
{ {
va_list list; va_list list;
char msg[512]; char msg[512];
va_start(list, fmt); va_start(list, fmt);
vsprintf(msg, fmt, list); vsprintf(msg, fmt, list);
va_end(list); va_end(list);
if (msg[strlen(msg)-1] == '\n') msg[strlen(msg)-1] = 0; if (msg[strlen(msg)-1] == '\n') msg[strlen(msg) - 1] = 0;
GtkWidget *dialog; GtkWidget *dialog;
dialog = gtk_message_dialog_new (NULL, dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_INFO, GTK_BUTTONS_OK, "%s", msg);
GTK_DIALOG_DESTROY_WITH_PARENT, gtk_dialog_run (GTK_DIALOG (dialog));
GTK_MESSAGE_INFO, gtk_widget_destroy (dialog);
GTK_BUTTONS_OK,
"%s", msg);
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
} }
bool RunLinuxDialog() bool RunLinuxDialog()
{ {
GtkWidget *dialog; GtkWidget *dialog;
GtkWidget *main_frame, *main_box; GtkWidget *main_frame, *main_box;
GtkWidget *res_label, *res_combo_box; GtkWidget *res_label, *res_combo_box;
GtkWidget *render_label, *render_combo_box; GtkWidget *render_label, *render_combo_box;
GtkWidget *interlace_label, *interlace_combo_box; GtkWidget *interlace_label, *interlace_combo_box;
GtkWidget *aspect_label, *aspect_combo_box; GtkWidget *aspect_label, *aspect_combo_box;
GtkWidget *texture_check, *log_check, *an_8_bit_check, *alpha_check, *aa_check, *win_check; GtkWidget *texture_check, *log_check, *an_8_bit_check, *alpha_check, *aa_check, *win_check;
int return_value; int return_value;
/* Create the widgets */ /* Create the widgets */
dialog = gtk_dialog_new_with_buttons ( dialog = gtk_dialog_new_with_buttons (
"GSdx Config", "GSdx Config",
NULL, /* parent window*/ NULL, /* parent window*/
(GtkDialogFlags)(GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT), (GtkDialogFlags)(GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT),
GTK_STOCK_OK, GTK_STOCK_OK,
GTK_RESPONSE_ACCEPT, GTK_RESPONSE_ACCEPT,
GTK_STOCK_CANCEL, GTK_STOCK_CANCEL,
GTK_RESPONSE_REJECT, GTK_RESPONSE_REJECT,
NULL); NULL);
main_box = gtk_vbox_new(false, 5); main_box = gtk_vbox_new(false, 5);
main_frame = gtk_frame_new ("GSdx Config"); main_frame = gtk_frame_new ("GSdx Config");
gtk_container_add (GTK_CONTAINER(main_frame), main_box); gtk_container_add (GTK_CONTAINER(main_frame), main_box);
res_label = gtk_label_new ("Interpolation:"); res_label = gtk_label_new ("Interpolation:");
res_combo_box = gtk_combo_box_new_text (); res_combo_box = gtk_combo_box_new_text ();
gtk_combo_box_append_text(GTK_COMBO_BOX(res_combo_box), "640x480@60"); gtk_combo_box_append_text(GTK_COMBO_BOX(res_combo_box), "640x480@60");
gtk_combo_box_append_text(GTK_COMBO_BOX(res_combo_box), "800x600@60"); gtk_combo_box_append_text(GTK_COMBO_BOX(res_combo_box), "800x600@60");
gtk_combo_box_append_text(GTK_COMBO_BOX(res_combo_box), "1024x768@60"); gtk_combo_box_append_text(GTK_COMBO_BOX(res_combo_box), "1024x768@60");
gtk_combo_box_append_text(GTK_COMBO_BOX(res_combo_box), "And a few other values like that."); gtk_combo_box_append_text(GTK_COMBO_BOX(res_combo_box), "And a few other values like that.");
// Or whatever the default value is. // Or whatever the default value is.
gtk_combo_box_set_active(GTK_COMBO_BOX(res_combo_box), 2); gtk_combo_box_set_active(GTK_COMBO_BOX(res_combo_box), 2);
gtk_container_add(GTK_CONTAINER(main_box), res_label); gtk_container_add(GTK_CONTAINER(main_box), res_label);
gtk_container_add(GTK_CONTAINER(main_box), res_combo_box); gtk_container_add(GTK_CONTAINER(main_box), res_combo_box);
render_label = gtk_label_new ("Renderer:"); render_label = gtk_label_new ("Renderer:");
render_combo_box = gtk_combo_box_new_text (); render_combo_box = gtk_combo_box_new_text ();
gtk_combo_box_append_text(GTK_COMBO_BOX(render_combo_box), "Null Renderer");
gtk_combo_box_set_active(GTK_COMBO_BOX(render_combo_box), 0); for(size_t i = 6; i < theApp.m_gs_renderers.size(); i++)
{
const GSSetting& s = theApp.m_gs_renderers[i];
string label = s.name;
if(!s.note.empty()) label += format(" (%s)", s.note.c_str());
gtk_combo_box_append_text(GTK_COMBO_BOX(render_combo_box), label.c_str());
}
gtk_combo_box_set_active(GTK_COMBO_BOX(render_combo_box), 0);
gtk_container_add(GTK_CONTAINER(main_box), render_label); gtk_container_add(GTK_CONTAINER(main_box), render_label);
gtk_container_add(GTK_CONTAINER(main_box), render_combo_box); gtk_container_add(GTK_CONTAINER(main_box), render_combo_box);
interlace_label = gtk_label_new ("Interlace:"); interlace_label = gtk_label_new ("Interlace:");
interlace_combo_box = gtk_combo_box_new_text (); interlace_combo_box = gtk_combo_box_new_text ();
gtk_combo_box_append_text(GTK_COMBO_BOX(interlace_combo_box), "None");
gtk_combo_box_append_text(GTK_COMBO_BOX(interlace_combo_box), "Weave tff (sawtooth)");
gtk_combo_box_append_text(GTK_COMBO_BOX(interlace_combo_box), "Weave bff (sawtooth)");
gtk_combo_box_append_text(GTK_COMBO_BOX(interlace_combo_box), "Bob tff (use blend if shaking)");
gtk_combo_box_append_text(GTK_COMBO_BOX(interlace_combo_box), "Bob bff (use blend if shaking)");
gtk_combo_box_append_text(GTK_COMBO_BOX(interlace_combo_box), "Blend tff (slight blur, 1/2 fps)");
gtk_combo_box_append_text(GTK_COMBO_BOX(interlace_combo_box), "Blend bff (slight blur, 1/2 fps)");
gtk_combo_box_set_active(GTK_COMBO_BOX(interlace_combo_box), 0); for(size_t i = 0; i < theApp.m_gs_interlace.size(); i++)
{
const GSSetting& s = theApp.m_gs_interlace[i];
string label = s.name;
if(!s.note.empty()) label += format(" (%s)", s.note.c_str());
gtk_combo_box_append_text(GTK_COMBO_BOX(interlace_combo_box), label.c_str());
}
gtk_combo_box_set_active(GTK_COMBO_BOX(interlace_combo_box), 0);
gtk_container_add(GTK_CONTAINER(main_box), interlace_label); gtk_container_add(GTK_CONTAINER(main_box), interlace_label);
gtk_container_add(GTK_CONTAINER(main_box), interlace_combo_box); gtk_container_add(GTK_CONTAINER(main_box), interlace_combo_box);
aspect_label = gtk_label_new ("Aspect Ratio:"); aspect_label = gtk_label_new ("Aspect Ratio:");
aspect_combo_box = gtk_combo_box_new_text (); aspect_combo_box = gtk_combo_box_new_text ();
gtk_combo_box_append_text(GTK_COMBO_BOX(aspect_combo_box), "Stretch");
gtk_combo_box_append_text(GTK_COMBO_BOX(aspect_combo_box), "4:3");
gtk_combo_box_append_text(GTK_COMBO_BOX(aspect_combo_box), "16:9");
gtk_combo_box_set_active(GTK_COMBO_BOX(aspect_combo_box), 0); for(size_t i = 0; i < theApp.m_gs_aspectratio.size(); i++)
{
const GSSetting& s = theApp.m_gs_aspectratio[i];
string label = s.name;
if(!s.note.empty()) label += format(" (%s)", s.note.c_str());
gtk_combo_box_append_text(GTK_COMBO_BOX(aspect_combo_box), label.c_str());
}
gtk_combo_box_set_active(GTK_COMBO_BOX(aspect_combo_box), 0);
gtk_container_add(GTK_CONTAINER(main_box), aspect_label); gtk_container_add(GTK_CONTAINER(main_box), aspect_label);
gtk_container_add(GTK_CONTAINER(main_box), aspect_combo_box); gtk_container_add(GTK_CONTAINER(main_box), aspect_combo_box);
texture_check = gtk_check_button_new_with_label("Texture Filtering"); texture_check = gtk_check_button_new_with_label("Texture Filtering");
log_check = gtk_check_button_new_with_label("Logarithmic Z"); log_check = gtk_check_button_new_with_label("Logarithmic Z");
an_8_bit_check = gtk_check_button_new_with_label("Allow 8 bit textures"); an_8_bit_check = gtk_check_button_new_with_label("Allow 8 bit textures");
alpha_check = gtk_check_button_new_with_label("Alpha correction (FBA)"); alpha_check = gtk_check_button_new_with_label("Alpha correction (FBA)");
aa_check = gtk_check_button_new_with_label("Edge anti-aliasing"); aa_check = gtk_check_button_new_with_label("Edge anti-aliasing");
win_check = gtk_check_button_new_with_label("Disable Effects Processing"); win_check = gtk_check_button_new_with_label("Disable Effects Processing");
gtk_container_add(GTK_CONTAINER(main_box), texture_check); gtk_container_add(GTK_CONTAINER(main_box), texture_check);
gtk_container_add(GTK_CONTAINER(main_box), log_check); gtk_container_add(GTK_CONTAINER(main_box), log_check);
@ -131,35 +150,35 @@ bool RunLinuxDialog()
gtk_container_add(GTK_CONTAINER(main_box), aa_check); gtk_container_add(GTK_CONTAINER(main_box), aa_check);
gtk_container_add(GTK_CONTAINER(main_box), win_check); gtk_container_add(GTK_CONTAINER(main_box), win_check);
// These should be set to their actual values, not false. // These should be set to their actual values, not false.
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(texture_check), false); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(texture_check), false);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(log_check), false); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(log_check), false);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(an_8_bit_check), false); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(an_8_bit_check), false);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(alpha_check), false); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(alpha_check), false);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(aa_check), false); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(aa_check), false);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(win_check), false); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(win_check), false);
gtk_container_add (GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), main_frame); gtk_container_add (GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), main_frame);
gtk_widget_show_all (dialog); gtk_widget_show_all (dialog);
return_value = gtk_dialog_run (GTK_DIALOG (dialog)); return_value = gtk_dialog_run (GTK_DIALOG (dialog));
if (return_value == GTK_RESPONSE_ACCEPT) if (return_value == GTK_RESPONSE_ACCEPT)
{ {
// Get all the settings from the dialog box. // Get all the settings from the dialog box.
#if 0 // I'll put the right variable names in later. #if 0 // I'll put the right variable names in later.
if (gtk_combo_box_get_active(GTK_COMBO_BOX(res_combo_box)) != -1) if (gtk_combo_box_get_active(GTK_COMBO_BOX(res_combo_box)) != -1)
resolution = gtk_combo_box_get_active(GTK_COMBO_BOX(res_combo_box)); resolution = gtk_combo_box_get_active(GTK_COMBO_BOX(res_combo_box));
if (gtk_combo_box_get_active(GTK_COMBO_BOX(render_combo_box)) != -1) if (gtk_combo_box_get_active(GTK_COMBO_BOX(render_combo_box)) != -1)
renderer = gtk_combo_box_get_active(GTK_COMBO_BOX(render_combo_box)); renderer = gtk_combo_box_get_active(GTK_COMBO_BOX(render_combo_box));
if (gtk_combo_box_get_active(GTK_COMBO_BOX(interlace_combo_box)) != -1) if (gtk_combo_box_get_active(GTK_COMBO_BOX(interlace_combo_box)) != -1)
interlace = gtk_combo_box_get_active(GTK_COMBO_BOX(interlace_combo_box)); interlace = gtk_combo_box_get_active(GTK_COMBO_BOX(interlace_combo_box));
if (gtk_combo_box_get_active(GTK_COMBO_BOX(aspect_combo_box)) != -1) if (gtk_combo_box_get_active(GTK_COMBO_BOX(aspect_combo_box)) != -1)
aspect = gtk_combo_box_get_active(GTK_COMBO_BOX(aspect_combo_box)); aspect = gtk_combo_box_get_active(GTK_COMBO_BOX(aspect_combo_box));
texture = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(texture_check)); texture = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(texture_check));
@ -172,9 +191,11 @@ bool RunLinuxDialog()
#endif #endif
gtk_widget_destroy (dialog); gtk_widget_destroy (dialog);
return true;
}
gtk_widget_destroy (dialog); return true;
}
gtk_widget_destroy (dialog);
return false; return false;
} }

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

@ -44,6 +44,7 @@
</Compiler> </Compiler>
<Linker> <Linker>
<Add option="-lpthread" /> <Add option="-lpthread" />
<Add option="-llibSDL-1.3" />
</Linker> </Linker>
<Unit filename="GPU.cpp" /> <Unit filename="GPU.cpp" />
<Unit filename="GPU.h" /> <Unit filename="GPU.h" />

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

@ -77,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="GSDeviceSDL.cpp" />
<Unit filename="GSDeviceSDL.h" />
<Unit filename="GSDeviceSW.cpp" /> <Unit filename="GSDeviceSW.cpp" />
<Unit filename="GSDeviceSW.h" /> <Unit filename="GSDeviceSW.h" />
<Unit filename="GSDirtyRect.cpp" /> <Unit filename="GSDirtyRect.cpp" />