Commit Graph

143 Commits

Author SHA1 Message Date
Jordan Woyak 159ed43f67 Move some shared gfx plugin code into VideoCommon. Changed "Renderer" class to use virtual functions. (setting stuff up for video plugin merging)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6433 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-18 02:21:26 +00:00
Jordan Woyak db35fe4100 Made the graphics plugins use a shared configuration dialog. There are a few minor issues: unsupported settings are shown, dx9 3d settings are missing, tabs/groups could be organized better, could use tooltips, cmake and scons need to be fixed.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6422 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-15 09:54:07 +00:00
NeoBrainX 6fe343df61 Silently remove Plugin_VideoMerge again...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6404 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-14 13:11:28 +00:00
Shawn Hoffman 7ad7acd248 move wiiuse to Source/Core and add to the main dolphin solution
make wiiuse link dynamically with hid.dll, removing the need for WDK
compile wiiuse as c++

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6394 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-11-13 19:15:43 +00:00
Jordan Woyak 7e08fc19fc Moved WiimoteNew into Dolphin and eliminated the old wiimote plugin. Removed wiimote plugin support. Moved input dialog related InputUICommon stuff into DolphinWX. Removed now unused InputCommon files. UDPWiimote stuff is temporarily disabled until it is reorganized so Core won't depend on wx. Real wiimotes are now initialized on first need(wiimote diag open or game start) and left initialized until Dolphin exit.(maybe this will work better for Linux/OS X) (scons probably needs some fixes)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6270 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-10-12 19:42:29 +00:00
Jordan Woyak 32143f9457 Fix "Plugin_VideoMerge" dependencies.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6220 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-09-20 22:53:32 +00:00
Jordan Woyak 194493cc04 Some work on merging the video plugins: Added a new plugin to the solution(shouldn't build by default) which combines the DX9, DX11, and OGL plugins with their common code merged (and some things temporarily removed). In it's current state the plugin is hardly usable. Perhaps someone with knowledge of the video plugins will be able to fix the things I have broken more easily than me(or point me in the right direction). I will continue to work on it as well.
Main Issues:
DX11 is functional with a ~2MB/s mem leak.
OpenGL/DirectX9 have a black display while game runs. (DirectX 9 flashes good display on emulation stop)
Too many virtual function calls. (once everything is working, I will work on removing them)
Won't build on non-Windows in its current state. (mainly EmuWindow will need changes for Linux/OS X)
Probably other stuff.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6219 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-09-20 21:45:47 +00:00
Shawn Hoffman 2ac8691911 ok...svnrev crap finally under control? please?
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6074 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-08-08 16:34:32 +00:00
Shawn Hoffman 4ae77b2d70 revert last two commits. screw it.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6072 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-08-08 15:37:18 +00:00
Shawn Hoffman 7823eddd4e kill that annoying relinking once and for all!
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6070 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-08-08 15:21:29 +00:00
j4ck.fr0st aa43f0a575 Fix DebugFast/win32 build configuration
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5810 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-29 10:23:15 +00:00
Orphis 685bae34e5 Dynamically load OpenCL on Windows with CLRun. There shouldn't be the need to make a separate build now or download a big SDK to link Dolphin.
If compilation fails, rebuild the whole solution as Visual Studio struggles with the not so complex project dependencies.
ATI users still need to install the Stream SDK as it's the only way to have an OpenCL driver.
NVidia users just have to install a recent driver (version 197 is tested and working).

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5808 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-29 02:23:09 +00:00
Orphis c2e32371f6 Refactor and prepare the OpenCL texture decoder for decoding textures to RGBA format required by DX11.
Fix the decoder codepath when OpenCL is enabled and the DX11 plugin is used.
Added the DX11 plugin to the Dolphin project dependencies.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5764 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-22 00:52:17 +00:00
Jordan Woyak 9e3b653688 GCPad/New Wiimote Plugin: Individual keyboard and mouse devices are now listed on Windows(2 player with 2 keyboards possible). Improved the ability to map multiple inputs to the same control. Inputs from different devices can be mapped to the same button (example: Mouse Left and XInput A). More advanced mappings such as "Button 1 or 2 and NOT button 3" are possible. I hope the GUI after right clicking a button isn't too confusing(may change it to be a bit more user friendly). Hopefully, I didn't break OSX stuff by 'const'ing a few functions.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5757 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-21 03:12:16 +00:00
NeoBrainX 3ea2a1387c Add a DX11 video plugin.
Might or might not work for you, yet.
Anyway, read the soon to be created forum thread on this plugin before asking any questions.

Huge thanks to rodolfoosvaldobogado for helping me out in various areas.
Also, thanks to everyone on IRC who supported me during development ;)


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5680 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-13 19:50:06 +00:00
hrydgard 8cae2fee56 Merge the pad plugin into Dolphin. Since there's only one plugin left under active development, and it's awesome, we no longer have a need for a pad plugin mechanism.
In the future if we merge wiimote too, this will bring the advantage that the two will be able to cooperate, to no longer fight over control of input devices which can sometimes cause problems.

Thanks shuffle2 for the patience.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5670 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-13 09:14:40 +00:00
hrydgard 7c103fbc4e (cleanup) Move WXInputBase into InputUICommon. Delete some leftovers from the last change.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5665 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-12 19:58:02 +00:00
hrydgard 1cd25e2406 (cleanup) InputPluginCommon is dead. Long live InputCommon and InputUICommon.
I hope I didn't break the mac+linux builds - if i did, fixing it should be a simple matter of adjusting the sconscripts.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5661 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-12 17:39:33 +00:00
hrydgard ebbe2d905c Delete the old GCPad plugin. GCPadNew should now be better in pretty much every way, so it's time.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5656 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-12 13:50:24 +00:00
hrydgard a3c96ac42c Warp back to 5578. Sorry for the lost changes, please re-apply. Reason: 5579 is a complete disaster.
Not only does it change tons of files to switch to a new and non-working (it doesn't parse my ini files, at least) ini parser, it also reshuffles a lot of code and removes a plugin. The latter part is fine, but doing these two major switches in one revision, one of which is broken, is completely unacceptable. I said to merge tiny changes, not massive reworkings.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5589 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-03 18:05:08 +00:00
Shawn Hoffman e4085f0f04 Merge GCPadNew into Dolphin. This takes place in three segments: Core, InputCommon, and InputUICommon. From now on it can be referred to just as "GCPad".
Switch to Billiard's IniFile implementation throughout Dolphin (it's faster!!).

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5579 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-03 04:55:39 +00:00
Soren Jorvang 664cea45c7 Meta:
Using Unix tools to operate on a tree containing filename with spaces in them
is really annoying, so rename the handful of instances where there were spaces.

Host.cpp has never been used.

Games tend to lookup the following directories that we don't yet have anything
to put in, so prepopulate them in Data/User/Wii:

title/00010001
title/00010002
title/00010003
title/00010004
title/00010005
title/00010006
title/00010007
meta
shared2/title
 
Set eol-style native on a number of text files which didn't already have it.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5572 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-06-02 18:00:22 +00:00
Jordan Woyak ba89d91872 Moved InputPluginCommon into the Plugins directory. I don't think it made sense in Core. Some minor fixes to the new wiimote plugin also.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5362 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-04-14 03:48:37 +00:00
Jordan Woyak d8906d2a0c Commited my new wiimote plugin work so far. Some code was copied from the current wiimote plugin. I have cleaned up most of the functions, but there are still a bunch of unused structs and stuff that I need to clean up.
Moved ControllerInterface to InputCommon. Moved GCPadNew GUI/Config code to a new project, InputPluginCommon. It is used by both GCPadNew and WiimoteNew. I hope that I included everyone's fixes to GCPadNew and ControllerInterface.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5355 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-04-13 05:15:38 +00:00
j4ck.fr0st 57a3c87815 DSPJit: disabled NR again until we fix DSPEmitter::increase_addr_reg.
And to help test things like that: DSPJitTester (use with caution on x64, most likely fails there; r5250 might be why)

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5306 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-04-09 19:18:50 +00:00
Jordan Woyak f51d8fffa0 Plugin that should eventually replace the GCPad and emulated Wiimote plugin:
It's currently only really usable on Windows. Linux/OS X will need keyboard support added in, but SDL should work for joysticks on non-Windows without too many modifications.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5254 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-03-30 19:14:11 +00:00
Shawn Hoffman b6a3df2fcf commit current GBA link cable work. no touching (unless you're skid_au or ask first) :P
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5096 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-21 18:50:44 +00:00
ayuanx 802504dd18 PadSimple is out of phase.
Thanks to glennricster for testing GCPad on Linux.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4976 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-01-28 03:29:49 +00:00
ayuanx 0128e92068 Fixes the capital letter as well as path that could cause problem in future (Finish)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4935 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-01-23 17:30:40 +00:00
Shawn Hoffman e7c8ef359b win64 Buildfix
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4927 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-01-23 01:04:02 +00:00
ayuanx 68a4eacb62 Merged PadSimple with nJoy
(Linux build could be broken, X360Pad support could be broken)

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4924 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-01-22 23:19:16 +00:00
hrydgard 576990c5a3 JitIL is no longer a separate .exe/binary - it's now a simple option, Dolphin.exe now contains both cores.
Advantages:
* Less confusion for users
* No need to build twice to make sure you didn't break something
* Easier to switch between the cores for testing

Disadvantages:
* None, as far as I can tell :) Maybe some extra code complexity, but not much.

Also break some include chains that caused <windows.h> to get included into everything, slowing down the build on Windows. There's more to do here though, there's still a lot of files that get it included that don't need it at all.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4891 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-01-19 19:28:27 +00:00
Shawn Hoffman 651b5addf4 DiscIO.vcproj depends on zlib...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4590 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-11-19 03:12:14 +00:00
Shawn Hoffman 06aa62504c revert to r4531, but keep the changes from the following revisions: 4533,4550-4551,4556-4559
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4566 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-11-14 17:08:32 +00:00
John Peterson 7a6eb0f350 GUI > Fixed the restart to debugging/non-debugging option, GetModuleFileName use the full path now, should not fail
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4541 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-11-12 19:50:45 +00:00
John Peterson 71506bc0f7 Wiimote and nJoy > Gamepad changes
1. Added LiveUpdates, while the configuration window is open nJoy and Wiimote will check for connected/disconnected pads
2. Removed the 'Nintendo RVL-CNT-01' device from the device list, and other SDL devices with no axes/buttons
3. Added SDL (from the current SVN) to get debugging information for SDL.dll
4. Added 'Upright Wiimote' option to emulated Wiimote options

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4534 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-11-12 18:57:35 +00:00
Shawn Hoffman 5123ece26a fix some warnings, compile Plugin_VideoSoftware against the plain multithreaded version of libc instead of the MT DLL version.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4460 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-10-24 01:00:45 +00:00
Shawn Hoffman 5fb95d0443 fix issue 1557 (build order incorrect for quad core users)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4450 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-10-22 05:01:38 +00:00
XTra.KrazzY a887a475e3 SWV: Software Video now compiles and runs on x64
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4411 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-10-12 17:39:09 +00:00
donkopunchstania 9b16c36014 Adding software rendering plugin. This is aimed at accurate emulation, not fast. Its more like a debugging tool than actually useful.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4407 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-10-12 00:48:24 +00:00
Shawn Hoffman 2c7214f2af msvc: fix wxw build order
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4304 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-09-20 04:01:22 +00:00
death2droid b3194e596e Fix win32 build and remove a warning from sln.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4243 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-09-09 23:19:24 +00:00
Shawn Hoffman 463e93c41a fix debugfast build (msvc)
external libs go to $(SolutionDir)\$(ConfigurationName)\$(PlatformName), and debugfast build uses Release build of external libs.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4230 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-09-08 15:46:51 +00:00
John Peterson 4d9a47f6dc VS solution: Fixed sln file
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4167 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-09-02 19:26:52 +00:00
John Peterson 5d3814aa68 VS solution: Removed duplicate DebugFast configuration for non-wx externals to avoid double linking errors. If there is a need for a third configuration for an external library, file names needs to be adjusted, for example.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4166 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-09-02 19:21:09 +00:00
rice1964 d616f132d7 Debugger for DX9 plugin.
Debugger panel is displayed only if Dolphin is started with /d option.
Dump features are not implemented.
Pause/Resume buttons works, only if the plugin is built in DEBUG or DEBUGFAST configuration, not in RELEASE. These features are really only for devs, not for regular gamers.

You will be able to pause frame by frame, or by n frames, or by n primitive flushes. Other pausing options are not implemented yet.

When other pausing and dumping features are implemented, debugging will be much easier.

I have changed the DX9 project setting to use unicode character set in order to use wxWidge tools. If this causes Dolphin building problems for you, check your project setting.txt




git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4154 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-09-02 06:33:41 +00:00
hrydgard 3db8bf7774 ...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4130 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-08-31 22:56:46 +00:00
hrydgard e4d8021a86 tiny build config fix
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4128 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-08-31 22:49:37 +00:00
death2droid 135a0818eb Add SFML_Network to the building.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4102 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-08-30 02:50:03 +00:00
XTra.KrazzY ac1a4abbef Renamed solution files
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4101 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-08-29 22:24:51 +00:00