5169804a61
Remove duplicated X11 code.
2012-12-26 12:12:26 -06:00
93f72d8463
Don't add superfluous whitespace to the CMake file
2012-12-26 11:07:33 -06:00
2d4c3c7c91
Beautify some tabs.
2012-12-26 10:33:45 -06:00
e2489196e4
Got overzealous. We aren't removing CG quite yet with this branch.
2012-12-26 00:41:25 -06:00
9a58f9a3bb
Rename another function...
2012-12-26 00:34:09 -06:00
c43a0dac2e
Add to more than 32bit debug
2012-12-26 00:25:49 -06:00
fa9abfdc42
Add a include directory
2012-12-26 00:22:17 -06:00
a35c5a7f22
Add a include directory
2012-12-26 00:20:09 -06:00
f4e7a280a9
Remove cg.lib from some files for Windows and renaming a function.
2012-12-26 00:07:43 -06:00
e9099459bb
Maybe fix Windows compiling.
2012-12-25 22:52:30 -06:00
0de073edea
When using the "Keep window on top option" make sure that the effect of
...
that option ends when emulation ends when using render to main.
2012-12-25 21:12:51 -06:00
c884dbf654
Mistype in WX.cpp
2012-12-25 19:18:03 -06:00
01953ff64a
Rename the interface files and hopefully fix OSX building.
2012-12-25 19:08:24 -06:00
b3ed3bdb91
Define NvOptimusEnablement to tell the Nvidia driver we need high performance
2012-12-25 13:51:13 +01:00
ba348c29d7
Merge branch 'new-ax-hle'
...
Only AX GC is merged so far, the new Wii AX development will be done in a
separate branch when I'll start working on it.
There are still a few AX GC bugs remaining, but overall a lot less games have
sound issues than before.
Thanks to everyone who helped test the development builds of this branch and
reported results on the forum thread.
Conflicts:
Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.cpp
2012-12-25 13:33:53 +01:00
4a74da3e87
Readd the old AXWii (rename the new version to NewAXWii) and set it as default
2012-12-25 13:30:55 +01:00
bff0faea2d
Merge branch 'immediate-removal'
...
Conflicts:
Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
2012-12-25 12:39:00 +01:00
b3714f4874
Don't show compress iso option for wbfs and ciso files.
...
Fixes issue 5809.
2012-12-25 06:31:31 -05:00
399a6af66d
revert update the rasterfont shader to GLSL3.3 - OGL 2.0 should be enough
2012-12-25 12:22:02 +01:00
4798524b75
Dolphin 3.5 release.
2012-12-24 21:29:24 +01:00
e3e14af0dd
Revert "VertexShaderGen: Fix a shader compilation error.". I'm an idiot :p
...
This reverts commit 4d868705fd
2012-12-24 21:29:24 +01:00
2c58385fe2
Revert "Uninitialized usage.. or so it thought."
...
This reverts commit 7839676c87
2012-12-24 21:23:28 +01:00
4d868705fd
VertexShaderGen: Fix a shader compilation error.
2012-12-24 19:50:16 +01:00
5a78351033
TextureCacheBase: Fix a potential bug when using custom textures.
2012-12-24 19:50:16 +01:00
249afa5eac
Change copyright year to 2013 in the about dialog.
2012-12-24 19:50:16 +01:00
2fedab3bad
OGL: Make OSD messages fade out properly instead of having them disappear spontaneously.
2012-12-24 19:50:16 +01:00
2dd570c880
Should completely fix game list sorting.
2012-12-24 13:29:19 -05:00
da5e61b45b
Fix another sorting bug.
2012-12-24 13:04:57 -05:00
14a31d9b3a
Fix sorting bug.
2012-12-24 12:48:14 -05:00
09b05c0f6c
Add header guards to InterfaceBase.h
2012-12-24 09:46:37 -06:00
296b9b1c16
Small bit of clean up in GLES-software.
2012-12-24 09:37:12 -06:00
78ff8a769c
Merge branch 'osx-savegame-fix'
2012-12-24 13:30:59 +01:00
eedca57270
Revert "support retina display"
...
This reverts commit 3aa9901618
2012-12-24 08:01:44 +13:00
59ec1fe180
Fix some random warnings.
2012-12-24 07:37:50 +13:00
bd0abb3d2f
revert last commit, add CheckInvalidState to VideoBackend
2012-12-23 13:32:23 +01:00
f865450b5a
Changed to non conflicting overload.
2012-12-24 00:00:45 +13:00
a8ddc3e069
Function definition was not updated.
2012-12-24 00:00:25 +13:00
7839676c87
Uninitialized usage.. or so it thought.
2012-12-24 00:00:04 +13:00
4dbd2ed7fb
Unused variable.
2012-12-23 23:59:44 +13:00
589222857f
Someone changed this to a u32... it's definitely a s32 :)
2012-12-23 23:59:10 +13:00
3aa9901618
support retina display
2012-12-23 21:33:52 +13:00
e3eebdf591
Fixes swprintf_s issues hopefully.
...
Also fixed an include not using correct caps.
According to:
http://connect.microsoft.com/VisualStudio/feedback/details/646532
2012-12-23 20:25:11 +13:00
089434b719
Apply same force to float fix as has already been done for DX11.
2012-12-23 20:01:58 +13:00
3a2c0b778a
Fixed stupid bool to int conversion warnings.
2012-12-23 19:53:15 +13:00
1c01fd9c9d
Remove warning about ambigious if/else.
2012-12-23 19:24:30 +13:00
d66dd970cd
Implement select audio backend CLI option.
...
Fixes issue 4920.
2012-12-22 18:25:52 -05:00
ffddfd8662
do only invalid hashes instead of all textures on loading
...
this is a hack, but only the gpu thread is allowed to call ogl commands
suggestion: create an unused texture cache, so we can move all textures there
2012-12-22 17:30:13 +01:00
2df0c31d13
add invalid flag for BPStructs (fix issue 5790)
...
this flag will be set on loading a state and checked before every rendering.
2012-12-21 21:04:53 +01:00
b0cbac174b
Implemented dpop samples support
2012-12-19 08:31:17 +01:00
2db4549174
Fix a memory leak based on Lioncash's patches.
2012-12-18 23:35:28 -06:00
071b27f0bb
Fix volume mixing in DownloadAndMixWithVolume (same issue with >1.0 volumes)
2012-12-19 05:56:57 +01:00
16ac7803f1
Add support for recording bongos.
2012-12-18 23:20:26 -05:00
2c10ca4e46
Rewrite the linear sample rate conversion algorithm to make it less hacky and to support arbitrarly big ratios
2012-12-18 17:38:41 +01:00
1bd42b7acc
Merge branch 'rehash-msw-cursor-hide'
2012-12-18 08:07:47 -06:00
1cecbaedce
Fix MixAdd with volume. The previous volume formula completely failed with volumes >= 1.0 (0x8000). Fixes Tomb Raider Legends (GC) music.
2012-12-18 07:01:22 +01:00
faaaa97c9e
Added a utility function to dump an AX PB for debugging
2012-12-18 07:00:24 +01:00
1abbfd4b15
Remove some useless 'inline' attributes from the AX HLE voice mixing functions
2012-12-18 07:00:04 +01:00
70b3980f46
Fix AX HLE command 12 arguments: takes 4 u16, not 1
2012-12-18 06:58:47 +01:00
ed59f8ff1d
Remove UCode_AX_ADPCM.h, now useless (incorporated into UCode_AX_Voice.h)
2012-12-18 05:55:40 +01:00
f6ef6fa0d9
I had the wrong header for Windows in GLVideoInterface.h
2012-12-17 16:23:02 -06:00
f2004b2474
Blindly add WGL.cpp file to the Windows project file. Just for Neo
2012-12-17 16:19:55 -06:00
512cae69f8
Add a useful comment to DSP.cpp
2012-12-17 15:55:34 -06:00
6099148541
Blind coding fail
2012-12-17 15:33:19 -06:00
8082323c44
Should hopefully fix OSX
2012-12-17 15:29:38 -06:00
3cb5dffbc9
Missed the video interface files.
2012-12-17 15:01:52 -06:00
b78f5debe6
Initial push of GLES and GLUtil file breakup.
2012-12-17 14:54:20 -06:00
0811311604
TextureCacheBase: Delete textures completely instead of just invalidating them in ClearRenderTargets.
...
That's what would've been done in the next TCB::Load() call, anyway.
Fixes issue 5742.
Additionally, change efb copies to specify 1 as the number of mipmaps because that makes more sense than anything else.
2012-12-17 19:36:31 +01:00
98ed34d50b
Use wxNullCursor to put the cursor back to its default instead of
...
explicitly setting the cursor to the arrow.
2012-12-17 11:32:10 -06:00
f1cc5c2ff9
Define the icon for "dolphin". The IDI_ICON1 seems to be preempted by the wx resource. This one does not.
2012-12-17 08:33:42 -06:00
4c7b63cf0e
Save secondary list sorting.
...
Allow sorting by platform ascending.
Fixes issue 5774.
2012-12-17 06:08:45 -05:00
0a918782cf
Reorder the inclusions to hopefully fix the icon issue.
2012-12-17 00:11:59 -06:00
ff7041804c
Make sure that the wxWidgets manifest does not override the dolphin one.
2012-12-16 23:55:22 -06:00
832a5a0b26
Add the resource include in only one place for all builds.
2012-12-16 23:39:05 -06:00
d34fb84734
Add the resource inclusion to the other builds.
2012-12-16 23:21:11 -06:00
a581c75a37
Make the resource include path relative.
2012-12-16 22:52:29 -06:00
d1a812231e
Rework the way that windows mouse cursor hiding is done to use the built
...
in wxWidgets methods.
2012-12-16 21:32:14 -06:00
351979795c
revert changes to banner background color
2012-12-16 15:29:25 -08:00
8838944cd3
Revert "Use the global ::wxSetCursor instead of the local one from our panel object. Should close 3956."
...
This reverts commit 884006e4c8
2012-12-15 00:04:10 -06:00
884006e4c8
Use the global ::wxSetCursor instead of the local one from our panel object. Should close 3956.
2012-12-14 15:19:22 -06:00
88b890824b
(CoreAudio) Retain volume value until initialization. Makes volume slider work when game isn't running. Fixes issue 5383.
2012-12-14 12:15:01 -06:00
3b559d89ec
If the HOME environment variable isn't set, fall back on to PWD. Closes 5584.
2012-12-14 11:47:12 -06:00
532fdada96
Adds the Wii Korean settings file. It was handled in the wii-network branch in rev c42a6f156e. Master handles the settings files differently. Until wii-network merges in to master, this closes issue 5642.
2012-12-14 11:37:26 -06:00
79a7ce4827
move glBindBuffer and glBindVertexArray out of VertexManager
...
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
2012-12-13 15:28:52 -06:00
09274e2483
Check texture params before updateing them
...
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
2012-12-13 15:28:48 -06:00
61836f8c51
helper for compiling glsl
...
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
2012-12-13 15:28:44 -06:00
48812f7bf7
update the rasterfont shader to GLSL3.3 - so OGL 3.3 is needed
...
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
2012-12-13 15:28:39 -06:00
1bd21f44b2
custom shader for RasterFont, fix color support
...
OpenGL2.0 compatible
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
2012-12-13 15:28:36 -06:00
23a3336f9a
increase hash size to u64
...
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
2012-12-13 15:28:32 -06:00
75dd48247f
initial release of new RasterFont without color support
...
this new design will once create a texture for all chars.
while rendering a string, a list of polygons (position on screen + texture)
for this string is generated on the fly and print at once by glDrawArrays.
atm, there is no support for colors, so everything will display white.
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
2012-12-13 15:28:28 -06:00
c207422987
using of vao, warning: ARB_vertex_array_object is needed
...
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
2012-12-13 15:28:25 -06:00
5c8800968a
also check for vbo updates in EncodeToRamUsingShader
...
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
2012-12-13 15:28:22 -06:00
1f1b32b663
only update vbo on changes in XFBSource::Draw
...
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
2012-12-13 15:28:19 -06:00
34b1451fbe
cache vbos in TextureCache::TCacheEntry::FromRenderTarget
...
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
2012-12-13 15:28:15 -06:00
d0c4332d99
don't update vbo, if there are no changes in Renderer::Swap
...
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
2012-12-13 15:28:13 -06:00
bbcb442983
in the end, also Renderer::Swap in vbo
...
two last draw-calls are missing:
VertexManager::Draw (see Graphic_Update branch)
RasterFont::printString (perhaps reimplement with an texture)
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
2012-12-13 15:28:10 -06:00
b41c06a9ac
EncodeToRamUsingShader in vbo
...
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
2012-12-13 15:28:05 -06:00
8ea2ddbc50
XFBSource::Draw in vbo
...
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
2012-12-13 15:27:59 -06:00
d44228f1b7
TextureCache::TCacheEntry::FromRenderTarget as vbo
...
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
2012-12-13 15:27:56 -06:00
6b3125728b
use vbo for ShowEFBCopyRegions
...
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
2012-12-13 15:27:53 -06:00
8b62be2025
fix ShowEFBCopyRegions
...
those fancy colors were the result of the usage of non-allocated heap
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
2012-12-13 15:27:49 -06:00
6864b40e26
reset glEnableClientState befor every draw
...
should be done with VAO, but atm, this is not possible :-(
this also partial revert the fix in fb92c338af
2012-12-13 15:27:46 -06:00
888b5fb061
remove usage of glMultiTexCoord2f
...
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
2012-12-13 15:27:38 -06:00
a6374f25fd
Fix OSX build once again. Apparently OSX needs to get with the times.
2012-12-10 10:31:08 -06:00
c82136abdc
PixelShaderGen: Drop some useless and potentially buggy code.
...
Thanks to glennrics for noticing.
2012-12-10 16:13:22 +01:00
f6df3d1513
OSX build fix for the unordered_map/hash_map issue.
2012-12-10 08:40:27 -06:00
330ea74d19
Allow input displays to work without an active movie.
2012-12-10 06:20:06 -05:00
e85438cba0
Clean up gcc/g++ compiler warnings that have accumulated.
2012-12-10 00:40:28 -06:00
43d673b576
Save game list sorting.
...
Fixes issue 5771.
2012-12-08 23:53:50 -05:00
4fc0125fb3
Fix OS X 10.6 compatibility.
...
Patch by mathieudel.
2012-12-07 19:49:08 +01:00
30718230b2
Fix some warnings.
2012-12-06 20:25:07 -05:00
aeb5782395
Merge conflict. Fixes issue 5471.
2012-12-06 21:16:27 +11:00
bbf7c3a4d0
Fix a save state crash in some situation.
2012-12-05 17:11:19 -05:00
423024110e
Includes are case sensitive and Common is in the include directories so including the file this way was silly.
2012-12-04 11:44:28 -06:00
470a4eee8b
Fixing wiimote savestate and recording.
2012-12-03 21:14:25 -05:00
983d5d1f73
Making cheats manager resizeable, maximizable, hideable (parentless), higher by default.
2012-12-03 20:58:25 -05:00
47aaca89eb
Fix error message about state undo backup always appearing when no movie is active.
2012-12-02 02:08:43 -05:00
bed260aa14
VertexShaderManager: Fix redundant shader constant updates.
...
Thanks to konpie for spotting this.
Might give a fairly perceivable speedup in the D3D11 backend.
2012-12-01 14:23:24 +01:00
3ca77cf077
Fix samples clamping and interlacing in the OUTPUT command. Shouldn't have assumed previous AX HLE was doing something right.
2012-12-01 00:54:25 +01:00
04b1ee0016
Implemented command 01 (download data and mix to MAIN/AUXA/AUXB with volume control). Fixes missing weapon sounds in Metroid Prime 2.
2012-11-28 15:22:02 +01:00
4cf2856284
Improve savestates support in AX and AXWii
2012-11-28 03:31:46 +01:00
f11a40f858
Command 13 should upload only AUXA LRS, not MAIN LRS + AUXA LRS. Fixes more GC EA games sound/music (including FIFA 06, Madden 08).
2012-11-28 01:48:27 +01:00
1a129abe0d
AUX return data should be mixed to main buffers, not AUX buffers. Fixes a regression introduced by r954c55e35afb, now EA games sound works again.
2012-11-27 21:48:59 +01:00
9270b62830
Rewrite MixAUXSamples to make it more clean
2012-11-27 20:36:34 +01:00
2120f536d5
Implement command 07 in GC AX (download data to main LR and reset main surround)
2012-11-27 20:36:14 +01:00
aaeeef48da
Compile fix for linux.
2012-11-26 23:36:47 -05:00
c0bb7aa8f3
Turns out you have to actually commit a change before merging if you want it to be included.
2012-11-26 18:17:07 -05:00
9b1a66245e
Fix an AUX mixing issue introduced when implementing AXWii. Now FIFA 06 sounds great with AX HLE.
2012-11-27 00:03:40 +01:00
706939e632
Implement command 10, used by FIFA 06 and linked to AUXB mixing. Sound still broken in that game.
2012-11-27 00:03:02 +01:00
fb1ecd90b0
Implemented command 13 in GC AX, used in some EA games (FIFA 06 now has broken sound, which is still better than no sound)
2012-11-26 23:34:18 +01:00
db458a234a
Merge branch 'desync-fixes' into movie-fixes
2012-11-26 12:40:56 -05:00
38e0d06e8c
Whoops, was calling GetMD5() twice.
2012-11-26 12:29:36 -05:00
3d9712a99e
Remove more unused code.
2012-11-26 03:48:04 -05:00
c2146921f9
Call InputUpdate() for wii games when using gc controller but not wiimote.
2012-11-26 03:04:17 -05:00
97f5b1665f
what is this even...
2012-11-26 02:11:52 -05:00
0903e20817
Expand input buffer as needed, instead of hardcoding it at 40 MiB.
...
Patch (mostly) by Ilari.
2012-11-25 22:41:48 -05:00
1917f83244
Cleanup and misc movie fixes.
2012-11-25 19:26:37 -05:00
0c6dad6a37
Clear unneeded variables upon stopping emulation.
2012-11-24 18:27:20 -05:00
d26c7fea17
Remove old, unused code.
2012-11-24 01:40:34 -05:00
f251704df2
The trick to multithreaded emulation is to include thread.h more than once.
...
Also, rewords some awkardly written messages.
2012-11-24 01:15:26 -05:00
a374f9f049
Check md5 when recording from save state too.
2012-11-23 22:47:32 -05:00
ca650d4435
Record md5 of game file to .dtm, and check it when playing back.
2012-11-23 22:23:58 -05:00
085c81da86
Mapped the addco and subfco PowerPC instructions. Fixes Frogger: Hyper Arcade Edition.
2012-11-24 00:04:28 +11:00
0fcb246b7e
Enable GFX debugger functionality in Release builds.
2012-11-20 17:54:48 +01:00
9d85052a66
Implement Wiimote audio output in AXWii. Not very useful yet as no sound is currently being mixed to the wiimote channels.
2012-11-20 11:34:49 +01:00
affdf08fd6
Real fix for the crashes on Windows with AXWii
2012-11-20 09:49:27 +01:00
e858835c7e
Fixing the hack fix (I can't multiply 32x32)
2012-11-20 04:26:07 +01:00
0d3c3f6339
Fix a crash in AXWii with SRC ratio > 4 (which I thought was impossible, but AXWii changed the SRC algorithm)
2012-11-20 04:18:48 +01:00
321e3a8421
Add global volume handling for AUX mixing and L/R output in AXWii
2012-11-20 03:32:29 +01:00
ae85159a94
Add surround sound support to GC AX HLE
2012-11-20 03:22:24 +01:00
954c55e35a
New AXWii now working properly in some games I tested
2012-11-20 03:13:55 +01:00
Ryan Houdek