nitsuja
1ad05f7440
Merge branch 'master' of https://code.google.com/p/dolphin-emu
2011-12-14 21:34:55 -08:00
nitsuja
9470f9545f
many movie fixes (mainly for readonly mode), and some wii input display support
2011-12-14 21:26:42 -08:00
Maarten ter Huurne
4c7c29b8b6
Let "make install" on OS X copy the bundle to /Applications.
...
The "dsptool" executable is not included in the bundle.
The "tester" executable is not included in the bundle and it no longer
installed on other platforms, since it is neither expected nor useful
to install unit tests.
2011-12-14 02:50:36 +01:00
Jordan Woyak
b44918d1ed
Merge branch 'fix-real-gcpad-sticks'
2011-12-12 23:25:32 -06:00
Jordan Woyak
09d2301fed
detect input at 55% to catch silly c-stick range
2011-12-12 23:24:10 -06:00
Maarten ter Huurne
27bda2c054
Fixed range check on TryParse() for u32, again.
...
The code from 748be364e5ee incorrectly accepted -0x100000000 on x86_64.
Also if ERANGE is returned by strtoul(), reject the parsed value regardless
of what that value is. This fixes invalid values being returned when compiling
with Visual C++. Thanks to "cotton" for testing this.
2011-12-13 02:08:34 +01:00
nitsuja
f3325036be
fixed hotkeys getting ignored after tab is pressed
2011-12-11 21:54:50 -08:00
nitsuja
2c2ef9a961
made frame advance act normal (so it advances 1 frame each time instead of waiting for further unpause commands), and did some minor improvements to the read-only command (making the UI behavior a little nicer, no actual changes to what read-only does at this point)
2011-12-11 21:08:26 -08:00
Maarten ter Huurne
ee5a29e6f2
For CPUID, save EBX on the stack instead of in a register.
...
This fixes GCC running out of registers when compiling for x86
in release mode.
Thanks to kiesel.
2011-12-12 02:14:56 +01:00
Maarten ter Huurne
d75f45979b
Copy data files into OS X application bundle.
2011-12-12 01:30:42 +01:00
Maarten ter Huurne
7423c74deb
Force the "ebx" argument to be mapped to a register (not necessarily EBX).
...
Fixes crash on x86 under OS X.
Thanks to kiesel for the fix and to shuffle2 for remembering the problem.
2011-12-12 00:43:23 +01:00
Maarten ter Huurne
344ca5d360
Applied compile and link flags from SCons build for OS X to CMake build.
...
The following changes were made:
Restricted the "-march=core2" option to i386 because the first Intel Macs
had Intel Core CPUs, not Core2.
Removed the "-mdynamic-no-pic" flag as GCC lists it as a PPC specific flag.
Removed "-Wl,-read_only_relocs,suppress" because it seems to be related
to "-mdynamic-no-pic" and I see no need for it.
Removed "-Wextra-tokens -Wnewline-eof" because they are GCC specific and
not OS X specific.
2011-12-11 21:27:06 +01:00
Maarten ter Huurne
780e5e7244
Use a custom template to generate the Info.plist for the OS X bundle.
...
This allows us to add keys that don't exist in the CMake template.
I added the keys from the Info.plist that was generated by our SCons build
to the new template.
2011-12-11 16:54:37 +01:00
Maarten ter Huurne
c1cf4f80cf
Added bundle version and copyright string to OS X bundle info.
2011-12-11 16:21:17 +01:00
Maarten ter Huurne
9d2f589f01
Create application bundle on OS X.
2011-12-11 16:07:59 +01:00
Ryan Houdek
e85a3d68b0
Looks like we make use of fmod, make a GLSL function for it!
2011-12-11 07:02:13 -06:00
Pierre Bourdon
df283a56a0
More coding style fixes because I suck at sed
2011-12-11 11:14:02 +01:00
Pierre Bourdon
014c474024
8 spaces indentation -> tabs
2011-12-11 11:08:18 +01:00
Shawn Hoffman
b0ffa72e37
Merge branch 'large-mram'
2011-12-10 18:48:35 -08:00
Shawn Hoffman
62858c8c14
Small logging changes. Pause core if Jit64 tries to compile at 0.
2011-12-10 18:42:49 -08:00
Ryan Houdek
97c3c156e6
Use UBOs in every shader. I had missed a few. Only cache Uniform locations if we aren't using UBOs.
2011-12-10 15:40:10 -06:00
Ryan Houdek
c72a244809
Make sure to support everything even if GPU doesn't.
2011-12-10 14:35:37 -06:00
NeoBrainX
3d9c35f58e
VideoCommon: Fix upper and lower depth bytes being switched when performing Z16L EFB copies (EFB to texture only).
...
Fixes issue 4989.
Fixes issue 5056.
2011-12-10 16:08:26 +01:00
Ryan Houdek
5925feb6e0
yay, UBOs work 100% now.
2011-12-10 08:07:13 -06:00
Ryan Houdek
7ab38cff68
UBO works for Pixel Shaders if Binding for UBO is zero, otherwise fails. Probably why Vertex shader UBO is failing. Too tired to investigate right now.
2011-12-10 07:38:30 -06:00
Ryan Houdek
126dfa073b
Firin ma lazer
2011-12-10 01:56:37 -06:00
Ryan Houdek
54a90d08ce
Fix one error.
2011-12-09 21:15:15 -06:00
Ryan Houdek
e8087aa1a9
Remove bSupportsGLSLLocation since it won't work how I expect it.
2011-12-09 19:14:02 -06:00
Ryan Houdek
8e5bb59cb6
Add in UBOs, doesn't work yet. Still debugging here.
2011-12-09 17:30:05 -06:00
Ryan Houdek
9119399547
Put Vertex Uniforms in to the correct places to get ready for UBOs.
2011-12-09 16:13:04 -06:00
Ryan Houdek
c89c484dd0
Few compiler errors that got exposed once I got Dual Source Blending working. Seems it isn't working quite 100% either. Good chance I missed something anyway.
2011-12-08 05:32:17 -06:00
Ryan Houdek
0ccba2b581
Support Dual Source Blending in OGL plugin with GLSL.
2011-12-08 05:09:48 -06:00
Ryan Houdek
62b9a779c1
Playing through SSBM story made me find this.
2011-12-08 04:11:30 -06:00
Ryan Houdek
cecc3c3873
Bit of cleanup. Clean up my massive hack in the ShaderManagerFiles. Almost feature parity with Nvidia CG now I think. Just need to do Alpha test with Dual source blending now.
2011-12-08 03:20:31 -06:00
Ryan Houdek
1201988fe4
Add support for GL_ARB_shading_language_420pack so we don't have to binding sampler locations. Also add support for GL_ARB_separate_shader_objects which doesn't currently work for some reason....investigating.
2011-12-08 01:51:08 -06:00
Ryan Houdek
b01c973689
Missed one
2011-12-07 23:01:14 -06:00
Ryan Houdek
bf4ef054d3
Shader Compile fixes. Played SMS for two shines.
2011-12-07 22:47:13 -06:00
Ryan Houdek
33c24f0a15
Almost there.
2011-12-07 22:04:34 -06:00
Maarten ter Huurne
f9133a7376
Link to the required OS X frameworks.
...
Previously, there was just one list of frameworks regardless of which part
of the code depended on which frameworks. Now we keep separate lists for
the Dolphin core, the Dolphin GUI and internal use by wxWidgets.
2011-12-07 08:26:44 +01:00
Maarten ter Huurne
c04c3bd9d3
Use "unsigned int" instead of "unsigned".
...
By request of hrydgard.
See commit 045eb924d93b4532d5a91c8eab55e292e3a997ae.
2011-12-07 07:10:31 +01:00
Maarten ter Huurne
8a75351674
Link against OpenGL using the info gathered by the FindOpenGL module.
2011-12-05 06:18:04 +01:00
Maarten ter Huurne
958891b4eb
Compile with OpenAL support on OS X.
2011-12-05 05:49:08 +01:00
Maarten ter Huurne
d440dfe9b2
Link against systemwide LZO using the info gathered by check_lib().
2011-12-05 05:33:35 +01:00
Maarten ter Huurne
bb182d88b7
Link against systemwide OpenCL on OS X.
2011-12-05 05:26:28 +01:00
Ryan Houdek
164b56ff73
This is the terrible bit that can't be removed until we use UBOs in the GLSL shaders.
2011-12-02 20:20:53 -06:00
Ryan Houdek
804938e9fc
More stuff
2011-12-02 20:17:26 -06:00
Ryan Houdek
ae6ac5b439
moe
2011-12-02 19:04:37 -06:00
Maarten ter Huurne
748be364e5
Fixed range check on TryParse() for u32.
...
On x86-64, "unsigned long" is 64 bits wide, so it is possible for a number
to not trigger a range error on strtoul() but still not fit inside an u32.
An extra check is added to ensure that 32-bit and 64-bit builds will accept
the same numbers.
2011-12-02 02:24:43 +01:00
Maarten ter Huurne
045eb924d9
Changed type of GetTicksPer(Line|Frame) to unsigned.
...
Avoids a GCC warning about comparing signed and unsigned values
in Source/Core/Core/Src/State.cpp.
2011-12-02 00:33:45 +01:00
Maarten ter Huurne
f50ea590ce
Don't use the same name for two different local variables.
...
This avoids a warning when compiling with GCC.
2011-12-02 00:06:49 +01:00
