Ryan Houdek
2cb53854f7
Merge branch 'GLSL-master' of https://code.google.com/p/dolphin-emu into GLSL-master
2011-12-27 12:36:23 -06:00
Ryan Houdek
88d20f1a2b
Had a few vec4 and float4(0) calls floating around.
2011-12-27 12:35:35 -06:00
Shawn Hoffman
c8d0c8e217
oops, forgot to make sure the gl program is actually free'd.
2011-12-26 10:27:18 -05:00
Ryan Houdek
6f729f8cbf
Woops, better not forget the ing
2011-12-26 04:09:36 -06:00
Ryan Houdek
3773d29b6d
Remove some warnings in ProgramShadercache, Was using wrong variable for checking dual source blending.
2011-12-26 03:54:44 -06:00
Shawn Hoffman
5f296d0be7
refactor ProgramShaderCache::PCacheEntry
2011-12-26 02:58:52 -05:00
Shawn Hoffman
16f9d8e06d
Checking GLEW_VERSION_4_0 is superfluous since we check GL_ARB_get_program_binary, and it's a runtime variable anyways.
2011-12-26 00:43:47 -05:00
Shawn Hoffman
4bc14c3473
fix formatting uglies introduced in glsl-master branch
2011-12-26 00:15:54 -05:00
Shawn Hoffman
f59063c8e7
default to GLSL instead of Cg
2011-12-25 22:00:24 -05:00
Ryan Houdek
b607695103
Add in the Windows fix.
2011-12-25 12:21:31 -06:00
Pierre Bourdon
af8a866afc
Implement what was done by r9a627e89 using a stub device
...
This is arguably better then using the slot0 device for slot1, because it maps
the real hardware better (nothing can be mounted on slot1 on a Wii AFAICT).
This also makes Kirby: Return to Dreamland work properly and fixes some of the
SD card problems (libs do not expect to have the same SD card mounted two times
in RW...).
2011-12-25 01:55:25 +01:00
Pierre Bourdon
070c933088
Revert "Add unimplemented device map for sdio/slot1 and slot2. Fixes #4932."
...
This reverts commit 9a627e89fb2e5a8f00ad158fde595926298cc573.
The attempted Kirby: Return to Dreamland fix does not work properly and while
it fixes this particular game, it completely breaks SD card support on Dolphin.
BTW, I've never head of /dev/sdio/slot2 before...
2011-12-25 00:03:45 +01:00
Ryan Houdek
8349cc2551
Only use explicit attribute locations when we are supporting GLSL > 1.2 since we need in/out instead of attribute variable types. This was brought to my attention from MESA. MESA supports GL_ARB_explicit_attrib_location, but yets to support GLSL 1.3, so basically useless extension to MESA right now?
2011-12-24 08:58:51 -06:00
Ryan Houdek
aa2032af2c
Write all shaders to disk on emulator stop instead of constantly. Also change pair from u64 to u32.
2011-12-24 02:19:30 -06:00
Ryan Houdek
b90fa37c60
If user doesn't compile with glew 1.6, cut out program binaries so everything still compiles.
2011-12-24 00:37:13 -06:00
Ryan Houdek
9bc6b83fd0
If CG isn't available, still compile and fallback on GLSL
2011-12-24 00:24:13 -06:00
LPFaint99
d389f7139b
restore wii sorting order by using the ascii string from the banner instead of the iso file
2011-12-22 15:53:41 -08:00
LPFaint99
ca8af741b8
Merge branch 'unicode_gamelist'
2011-12-22 14:29:47 -08:00
LPFaint99
825e2ea4df
fix an ascii/wxstring in gamelistctrl, replace fromascii("") with wxemptystring, don't push_back 0 at the end of wstrings
2011-12-22 14:28:12 -08:00
Sonicadvance1
7c558df283
Missed a if, don't want people crashing now do we?
2011-12-21 22:33:33 +00:00
Ryan Houdek
8e0172374c
Give OSX users more of a chance of supporting Single pass DSB in the future.
2011-12-21 01:29:29 -06:00
Ryan Houdek
a10656b1b2
Implement Program shaders cache. Seems to reduce a small amount of stuttering when F-Zero starts. Did it because I can :|
2011-12-21 00:15:48 -06:00
Ryan Houdek
31a9b6c322
Go back to using glGetString with GL_EXTENSIONS because glew 1.7 is required to check for newer 4.2 extensions that way.
2011-12-20 23:07:42 -06:00
Ryan Houdek
dc134b9bac
Move the GLSL extension checks over here so it is nicer.
2011-12-20 21:55:11 -06:00
LPFaint99
8f6c25a5aa
cleanup: merge handling of ntsc/pal games in gamelist/isoproperties
2011-12-20 02:19:46 -08:00
LPFaint99
e4c4602d9e
use windows-1252 for gamename/description, fixes copyright/tm symbol in the gamelist & isoproperties
2011-12-20 02:10:40 -08:00
LPFaint99
9ddb67d4a9
fix shift-jis conversion on linux, and check for the codepage on windows in the memorycard manager like everywhere else
2011-12-20 01:35:12 -08:00
nitsuja
33f0f9fd9f
fix ZWW intro music crackling with DSPHLE
2011-12-19 21:52:47 -08:00
Ryan Houdek
f6b33cf0be
Add a define back so we work without GLEW 1.6, Also I missed a line when I was fixing binding sampler locations last night when I was tired.
2011-12-19 19:10:05 -06:00
nitsuja
3006d0696c
fix the read-only menu item being disabled when emulation is paused (the hotkey was fine but I guess some people still use the menu)
2011-12-19 16:38:07 -08:00
nitsuja
3e773f093d
fixed a freeze on emu shutdown in windows build
2011-12-19 15:13:26 -08:00
Ryan Houdek
9ce17a43ec
There we go, actually found the issue.
2011-12-19 00:15:07 -06:00
LPFaint99
de4e3e7462
add wstring name(s)/description to the cachefile, use when available in gamelist and properties window
2011-12-18 22:01:46 -08:00
LPFaint99
7f4efa094e
add the function to read the game name and description from the banner as unicode
2011-12-18 21:56:13 -08:00
LPFaint99
a73ad3554c
add the function to read all unicode gamenames from a wad file
2011-12-18 21:42:20 -08:00
Ryan Houdek
768a683f04
This thing fails when we don't support binding. Not 100% sure why I need to set this multiple times.
2011-12-18 23:31:00 -06:00
nitsuja
567e90bbd5
fix for an un-threadsafe call to UpdateGUI (oops)
2011-12-18 20:38:54 -08:00
nitsuja
4a88d5ae93
fix for wiimote dying if you use savesetates too fast
...
(by dying I mean all wiimote slots permanently disconnecting until emulation reset)
2011-12-18 19:47:11 -08:00
Ryan Houdek
3513dd7115
Looky, OSX found an issue for me.
2011-12-18 21:06:28 -06:00
Glenn Rice
4ecb48eaf8
Update a few more translations and add Farsi.
2011-12-18 14:03:57 -06:00
Pierre Bourdon
b20c26f0b7
Adding more drama to the git history.
2011-12-18 13:58:44 +01:00
kostamarino@hotmail.com
9829beab42
Gameini database update, mainly changes to the emulation issues lines (make them shorter, with more substance and less bla bla, update outdated stuff). The emulation issues lines can be further improved(this is a start).
...
Also re - implement the emulation issues column that was reverted, make it a bit bigger since sentences need more words and delete the issues portion of the emustate tooltip since it is unnecessary now.
2011-12-18 14:52:40 +02:00
nitsuja
d00b719966
give the audio thread a name (this doesn't really matter, but it was bugging me)
2011-12-18 02:25:50 -08:00
nitsuja
d44fc0c820
small fixes for some recording-related menu items
2011-12-18 02:23:59 -08:00
nitsuja
c88e4a097e
update ui after savestate load (because loading a savestate can affect whether certain items should be grayed out in the menu)
2011-12-18 01:15:59 -08:00
nitsuja
cfad00d6e0
added missing ExpansionInterface data to savestates, and related fixes (for savestate robustness)
2011-12-18 00:23:12 -08:00
nitsuja
e5286e0406
improve the movie savestate load verification a bit more
2011-12-18 00:22:57 -08:00
nitsuja
c6ea5f31f5
remove some suspect code in PowerPC::DoState which I think has already been supplanted by more correct code in CoreTiming::DoState
2011-12-18 00:22:31 -08:00
nitsuja
1e4e05fdc3
made ucode saving more reliable (especially for the case of loading across boundaries where the ucode changes). I think this is related to the occasional memory corruption I was seeing upon loading a savestate.
2011-12-18 00:22:21 -08:00
nitsuja
c68c8c388c
made savestate loads less fragile by adding some markers and rolling back on a mismatch.
...
This should make it so if you try to load an incompatible save, it simply doesn't load, instead of crashing dolphin. (I can't guarantee no crash but it's much less likely now)
2011-12-18 00:22:06 -08:00
