nitsuja
d2f61fa155
some movie playback fixes
2011-12-15 09:22:16 -08:00
Maarten ter Huurne
e13f4644bb
Link weakly to OpenCL on OS X.
...
This makes sure Dolphin still loads when OpenCL is not available.
OpenCL was added in OS X 10.6, while we also support 10.5.
2011-12-15 06:54:42 +01:00
Maarten ter Huurne
27590c3a8f
Suppress link warning about QuickTime being 32-bit only.
...
If we are actually missing symbols because a required architecture is missing
from a library, we'll get a link error as usual, so suppressing this warning
is pretty safe.
2011-12-15 06:41:39 +01:00
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
9ede977a56
Added QuickTime framework as dependency for wxWidgets on OS X.
...
It seems that the required functions are in an already included framework
on x86_64, but on i386 we depend on QuickTime.
2011-12-11 21:24:40 +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
Ryan Houdek
ad13f2d23d
Instead of querying the vertex attribute location. Let's bind it to where CG expects it to be as well. Was causing problems when we were trying to activate the components below and they weren't available. This fixes cubivore with GLSL shader. Also any other game that uses 3 normal pointers.
2011-12-11 06:18:01 -06:00
Jordan Woyak
c908e1173d
glMapBuffer was slow, go back to glBufferSubData, single combined ps/vs ubo now
2011-12-11 06:11:38 -06:00
Jordan Woyak
a613012d08
try combining vs/ps ubo
2011-12-11 06:02:47 -06:00
Jordan Woyak
5ae1f674f5
make use of glMapBuffer to set ubo data
2011-12-11 05:29:15 -06:00
Ryan Houdek
16b58a8825
Show a bit of information when using GLSL shaders.
2011-12-11 05:15:08 -06:00
Jordan Woyak
bcb2abbcf1
fix stupid indentation
2011-12-11 04:32:57 -06:00
Jordan Woyak
031c523fba
have separate variables/functions for VS/PS ubo stuff, array was confusing.
2011-12-11 04:28:02 -06:00
Ryan Houdek
fbef258dab
Disable UBO buffer generation if hardware doesn't support it.
2011-12-11 04:19:11 -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
Ryan Houdek
1724385c8c
Actually have Dual Source blending work for people. Forgot about this change.
2011-12-11 03:10:03 -06: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
2907ffd72c
Make this pretty
2011-12-10 15:58:44 -06:00
Ryan Houdek
c678172f32
Make sure our UBO buffers are always aligned correctly.
2011-12-10 15:52:20 -06: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
49664bff61
More for Billiard <3
2011-12-10 02:02:22 -06:00
Ryan Houdek
24336171f1
Firin ma lazer
2011-12-10 01:57:27 -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
4fe9792760
Merge branch 'GLSL-master' of https://code.google.com/p/dolphin-emu into GLSL-master
2011-12-09 17:30:50 -06:00
Ryan Houdek
8e5bb59cb6
Add in UBOs, doesn't work yet. Still debugging here.
2011-12-09 17:30:05 -06:00
LPFaint99
87c3c37ba7
add ProgramShaderCache.* to visual studio project files
2011-12-09 14:28:59 -08: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
