bd7ca7625b
Fix up last commit
...
I forgot to git add this change.
2013-07-21 00:51:07 -04:00
fe2fe8b6cc
Clean up all the GetName methods for XInput2 controls.
2013-07-20 13:58:02 -08:00
9fbc5ff27c
Add X11 XInput2 input plugin, including MPX and with support for axis controls.
...
Based on the original XLib plugin, and thus shares some of its warts.
2013-07-20 13:58:02 -08:00
41fe2e1466
Don't sync dual core setting in netplay.
2013-07-20 13:20:14 -04:00
96219df4fd
Allow non-SIDEVICE_GC_CONTROLLER controllers in netplay again.
2013-07-19 22:58:33 -04:00
e4767aec55
Sync some important settings with server during netplay.
2013-07-19 18:48:27 -04:00
919e54c695
Automatically connect the appropriate controllers for netplay.
2013-07-19 15:53:20 -04:00
0e1efd7d38
Poll the controllers with the same timing as movies for netplay. Might help prevent desyncs.
2013-07-19 15:01:04 -04:00
2e92e3814e
[Android] Tiny cleanup regarding method indentation in GameListAdapter.
...
getItem() and getView were a little off-kilter with the rest of the class. Keeps things more consistent, etc.
2013-07-18 09:00:20 -04:00
a3e289e802
[ARM] Reenable FMRX, it seems to work fine.
2013-07-17 04:29:17 -05:00
86826b28dc
[ARM] Implement LFD. Reorder VFP register allocation a bit.
2013-07-17 04:23:38 -05:00
dc66b3d474
Add Read_F32 and Read_F64 helper functions to MemmapFunctions.
2013-07-17 04:22:47 -05:00
5147e5167b
[ARM] Implement xorx
2013-07-17 02:34:20 -05:00
b30a697355
[ARM] Disable mfmsr. Implement stb and subfx.
2013-07-17 02:25:21 -05:00
5899013876
[ARM] Implement MFTB
2013-07-17 01:35:07 -05:00
fc6e06cb72
[ARM] Implement mfmsr
2013-07-17 01:25:06 -05:00
bab3032185
On ARM Hosts, increase the instruction run count to 64bit. 32bit is /very/ quickly overflown.
2013-07-16 22:20:18 -05:00
f4b414a9c1
Fix encoding issue with VADD(Integer)
2013-07-16 22:18:15 -05:00
a1b9a4dc5e
[Android] Oops. Keep the screenOrientation setting to landscape.
2013-07-16 09:08:41 -05:00
bd6218685f
[Android] Folder Browser a fragment as well. Removes the menu item for selected path, because it was just a confusing mechanic anyway. People just tap on the ISO in the browser anyway.
2013-07-16 06:59:07 -05:00
d1baa8edd9
[Android] Change input configuration to a fragment.
2013-07-16 06:30:50 -05:00
ee26564c65
[Android] In the About pane, show if the phone supports OpenGL ES 3. Makes it less confusing for users.
2013-07-16 05:43:45 -05:00
023922cd5b
[Android] Start making it so the side pane is visible on all activities by converting them to fragments. Only Browse Folder and Gamepad Config remain. Fix a issue that Lioncash introduced where no games would show up in the folder browser or the game list.
2013-07-16 05:32:14 -05:00
fbd67325a6
[Android] If one wants to use Android Studio. They can import the folder themselves.
2013-07-16 03:47:45 -05:00
9123f58bd5
Check for IDIVA/IDIVT correctly. Cortex-A5 parts would have had this set since it supports VFPv4 but not IDIVA. Qualcomm Krait/Krait 300 still doesn't report in the kernel that it supports this.
2013-07-16 01:22:25 -05:00
4c807fa7b4
Fix Device.h placement in VC++
2013-07-15 16:24:20 -04:00
c35916a3e5
Add .dff FIFO logs to the list of valid extensions in FolderBrowser.
2013-07-15 10:01:04 -04:00
0ba2594339
Use HashSets in FolderBrowser as well, like the last commit for GameListFragment.
...
Should have originally done this with the first refactor. My bad.
2013-07-15 09:58:54 -04:00
13f30d1d1d
[Android] Simplify GameListFragment.Fill a little bit.
...
Made the filtering check against a HashSet of specified supported extensions.
Not only does this get rid of the multitude of checks for extensions in the if-statement, but it also makes for less typing in the future if new file extensions/formats are used. Simply add the extension to support to the set, and you're done.
2013-07-15 09:35:45 -04:00
4e8c3b2f12
[Android] Make FolderBrowser.Fill look slightly nicer. Improve readability a bit.
...
- Added a basic function description.
- Modified the main parameter to be more informative of what should be passed. Helps people who read the codebase for the first time.
- Made a variable for storing the entry name so getName() isn't called a bunch of times.
- Added some comments to explain some parts.
- Rename the exception catch variable to ignored, since it currently isn't being used.
2013-07-15 09:16:20 -04:00
c86480d082
[Android] Fix a null pointer exception.
2013-07-14 16:31:47 -05:00
ea146627e6
[Android] Enable OpenGL ES 3 by default. Add in a modified GLES3/gl3.h header for supporting it.
2013-07-13 18:42:04 -05:00
737df2a68c
Patch from Degasus that removes the last of the the GL_TEXTURE_RECTANGLE usages. This is needed to have GLES3 support.
2013-07-13 17:24:23 -05:00
52cb398804
[Android] Actually push the library file to the correct location.
2013-07-13 10:32:23 -05:00
b64e882ba5
ExpressionParser: Parse fully qualified control names correctly
...
Without clearing out the "accumulator" for the backtick parsing,
our control name was full of junk (the previous device name) causing
us to not correctly find the control.
Ensure that always we clear the "accumulator" string during backtick
parsing.
2013-07-12 13:26:09 -04:00
c52a583090
Removing reading of the emulated Wiimote state in the real Wiimote mode
...
because
* the purpose of the emulated Wiimote state in the real Wiimote mode is to store the real Wiimote state rather than synchronise with an emulated Wiimote
2013-07-11 19:11:36 -04:00
a1822a3aca
fix AudioCommon::Mixer Buffer indices
...
This fix the 1h32 audio bug which outputs static sound after 1h32.
The mixer is used for 32->48kHz resampling and as output buffer for the async audio backends.
So this buffer was indiced by a writing and a reading pointer and the count of samples in it.
As this is redundant and the sample count isn't accurate calculateable because of the interpolation,
both indices gets out of sync. So after some time (~92min), this buffer overflows and return only garbage.
thx @ moosehunter + delroth for debugging on this issue. You did the most work :-)
2013-07-11 21:22:38 +02:00
95d4dc92c1
[Android] Show the OpenGL ES 3 backend video option only on devices that support it.
2013-07-11 11:22:02 -05:00
fd4a4410e5
Removing wait for real Wiimote connection
...
when
* opening the Wiimote configuration dialog
* booting from the emulated program entry point rather than a state
because
* it doesn't have meaning in these scenarios
* it has meaning when booting from a state
2013-07-11 11:32:14 -04:00
e36757bec1
Adding read data reply to the real Wiimote
...
because the emulated program expect it
2013-07-11 11:32:09 -04:00
e1f641424d
[Android] Show JIT cores based on host arch.
2013-07-11 10:18:03 -05:00
6e74d4b21d
[Android] Disable x64MemTools' backpatching. It isn't available on x86 anyway.
2013-07-11 09:00:08 -05:00
012c32c14c
[Android] Undefine the swaps in Android completely, not just on ARM Android.
2013-07-11 08:58:10 -05:00
33ca010115
[Android] Derp Squad. Show compressed files in the browse folder dialog. Show in red text and if one clicks on it. Say we don't support compressed file formats.
2013-07-11 03:57:24 -05:00
8b65775ee1
Fix a couple of compiler warnings that have cropped up.
2013-07-10 15:07:57 -05:00
16cd26d177
Add UPnP support.
...
Feedback is in logs as suggested by skid_au. The checkbox is still there, but
mostly for people who would like to opt out (unfortunately, I can not be sure
how this feature may behave for some routers - there's a hell of a lot of bad
UPnP implementations.)
The Visual Studio stuff is a little messy, so I apologize if anything is a bit
off. I tested most configurations and it worked.
I also tested CMake on Debian Wheezy, Ubuntu Saucy, and Mac OS X Mountain Lion.
All seemed to be OK.
2013-07-09 18:08:43 -04:00
379a15ba3b
Make confirm on stop default enabled.
2013-07-08 02:56:40 -05:00
22c80e1dc2
Fix ICC profiles in some of our PNGs (ic_drawer, Dolphin icon).
...
Also keep a PNG version of bin2c'd resources in order to make these kind of
changes easier in the future.
Fixes recent versions of libpng complaining loudly about our images.
2013-07-07 02:40:59 +02:00
9b128e9347
Disable LPF filtering in new-ax-hle
...
The current implementation is broken and this is a non critical feature.
Fixes new-ax-hle regression in Super Monkey Ball.
2013-07-06 14:35:19 +02:00
7b40874309
Implement AX command 0x11 (SET_OPPOSITE_LR)
2013-07-06 14:35:19 +02:00
b2e7248b58
LogWindow: Fix a bad initializer
...
Since these defaults aren't used, don't bother specifying them.
2013-07-05 22:39:18 -04:00
d584150851
Remove a warning from ARM includes already defining PAGE_SIZE and a warning in the FPR cache.
2013-07-05 20:56:17 -05:00
7d6b36bf73
Fix most ARM warnings
2013-07-05 19:56:15 -05:00
cdfd7905a0
[Android] Copy over DSP roms and font assets on build and first runs.
2013-07-05 19:18:33 -05:00
c19858ca87
[Android] Instead of wiping shared preferences, set the default values so the settings are actually selected when going in to the settings menu.
2013-07-05 18:49:59 -05:00
a610cdac8b
[Android] Fix Android 4.0 gamepad input.
2013-07-05 06:29:01 -05:00
691900aa90
Disable encryption when checking Wiimote extension for scan.
...
This is for when we are checking if it is a Balance Board.
2013-07-03 23:05:30 +12:00
998c4042c2
Add ability to dump Balance Board data to local udp port.
...
This probably won't work on Mac...
2013-07-03 23:05:29 +12:00
3de5b1bed9
Fix vendor retrieval for Tegra in VideoOGL.
2013-07-02 21:58:09 -04:00
03a47d3c6b
Fix a case where a boolean check (vector.empty()) was used when a clear (vector.clear()) was intended in ExpressionParser.cpp.
2013-07-02 21:42:44 -04:00
1f92ccc228
ShaderGen: Use u8 as uid storage base type. Fixes an off-by-one error introduced in revision bdc28106ee that caused some lighting issues.
2013-07-02 14:48:08 +02:00
de369dcc60
Misc cleanup and fixes for some of the bad code i've written.
...
Fixes a buffer overflow in the sscanf, move the movie.raw to the GC folder, and stops calling GetSettings() twice.
2013-07-01 17:44:42 -04:00
e4846de692
Add hotkeys for save/load state to/from file.
2013-06-30 19:01:30 -04:00
c34c82e7ae
VertexShaderGen: Fix a potential bug where vertex shader uids don't change when
...
pixel lighting is toggled.
Same as revision f524312fd1
2013-06-30 14:27:04 +02:00
b8b5427ba4
VertexShaderGen: Fix a dumb regression from revision f524312fd1.
2013-06-30 11:36:45 +00:00
d5983b587e
InputConfigDialog: Don't show "..." for complicated expressions
...
Just show the actual expression. We need to do a bit of mangling
here as wx has no way to turn off mnemonics parsing, so do that
as well.
2013-06-29 18:28:14 -04:00
eb153cfded
PixelShaderGen: Fix a small early-ztest related bug.
2013-06-29 23:14:08 +02:00
99301bd158
PixelShaderGen: Store early_ztest as part of shader uid.
2013-06-29 23:01:42 +02:00
f524312fd1
VertexShaderGen: Fix a potential bug where vertex shader uids don't change when pixel lighting is toggled.
2013-06-29 23:01:42 +02:00
1083d78721
InputConfigDiag: Put the colon after the device name
...
Oops. The dialog accidentally generated the wrong syntax for
this one.
2013-06-29 02:58:17 -04:00
e3c0a39d5d
Merge branch 'shader-uids-awesome-after-hours'.
2013-06-28 17:45:19 +02:00
166a9c5637
Finishing touches.
2013-06-28 17:43:53 +02:00
11fdd5a4ec
ExpressionParser: Search for control names first
...
Otherwise, valid control names like "Cursor X+" would be incorrectly
tokenized as "`Cursor` `X` +", causing the parser to first abort trying to
find a control named `Cursor` rather than aborting with invalid syntax on
the bad binop.
We could also do this by resolving devices lazily, but since simple
control name bindings are going to be 90% of usecases, just look for these
first.
2013-06-27 10:51:19 -04:00
72257d5f69
[Android] Support clicking on games in the folder browser to add the folder currently in. Mostly for derps that keep trying to run the game from the folder browser.
2013-06-27 04:47:39 -05:00
72d49e05a7
fix opengl debug build on win32
2013-06-27 10:34:53 +02:00
a92f6f68d6
DInputJoystick: Fix compile
...
Whoops. MSVC++ messed up somehow and didn't tell me it didn't work
locally.
2013-06-26 23:26:21 -04:00
cdb5b8b737
DInputJoystick: Always exclude XInput
...
Yeah, yeah, it's possible that some guy would try to build DInput
without XInput, but they're crazy, and I doubt it would have worked
since the header file mess was so fragile anyway. Always exclude
DInput devices when we don't have XInput.
2013-06-26 23:06:17 -04:00
c11ae9ea4b
Revert "Core: Update default bound controls for new ExpressionParser"
...
This reverts commit 54e1b58199
2013-06-26 20:25:37 -04:00
f53eefb491
ExpressionParser: Add support for simple barewords control names
...
If an expression can't be parsed normally, we then look to see if it's a
simple device name. This keeps backwards compatibility with simple input
ocnfigurations, where people just used the Detect button.
2013-06-26 20:19:23 -04:00
03fdebac09
ExpressionParser: Don't crash when we can't find a device
2013-06-26 16:54:48 -04:00
9edfb5c710
[Android] Disable OpenGL ES 3 EGL bit. This is due to drivers complaining(Which they should do) when they don't support GLES3. Qualcomm drivers don't care about it being ES2 or ES3 bit anyway. Intel drivers are untested in this code path, but GLES3 is untested entirely in desktop anyway.
2013-06-26 08:19:01 -05:00
99d32e756f
only provide ES2_compatibility workaround for non gles devices
2013-06-26 13:14:46 +02:00
0037acbbaa
[Android] Actually copy Dolphin.ini correctly...
2013-06-26 05:32:56 -05:00
63a747edc0
Add shortcut to (dis)connect the balance board.
...
Fixes issue 6383.
2013-06-26 06:23:29 -04:00
06d721984d
[Android] Make the navigation drawer not so blindingly dark.
2013-06-26 04:58:34 -05:00
fc0f347cea
[Android] Open the navigation drawer by clicking on the button. Woops, didn't realize that gmail did this as well.
2013-06-25 14:36:52 -05:00
55950365e3
InputConfigDiag: Fix complex bindings with with left-click Detect
...
This fixes the binding of XBox 360 controllers and similar devices
with complex control names.
2013-06-25 15:05:53 -04:00
21ca344a21
provide GL_ARB_ES2_compatibility workaround
...
ES2 is in ogl core since 4.1, but not all drivers support it
2013-06-25 18:14:41 +02:00
5904ffb21d
Fix last commit, and set the position on mouse down instead of mouse up.
2013-06-25 11:04:28 -04:00
b892d838ff
Allow dragging the analog sticks with the tas input.
2013-06-25 10:52:25 -04:00
e250550de3
Removing muted Wiimote audio
...
because that reduce writes
2013-06-25 09:24:45 -04:00
9e779c22b3
Removing Wii input use of an unsaved state value
...
because that allow the complete state to be loaded
2013-06-25 09:24:33 -04:00
0fd3acd152
Saving real Wiimote state
...
because that's simpler than reconnecting
2013-06-25 09:24:14 -04:00
ba310ce096
PixelShaderManager: Revert code introduced mainly in revision 0fdeb81038.
...
The shader constant usage profile functionality is still buggy and the code using it wasn't ever meant to be merged to master.
2013-06-25 13:37:38 +02:00
748ee50536
Core: Fix a typo in the binding of IR Up
...
Whoops.
2013-06-25 01:58:22 -04:00
54e1b58199
Core: Update default bound controls for new ExpressionParser
2013-06-25 01:46:13 -04:00
89e84163c2
ExpressionParser: Fix delimiter scanning
...
We need to make sure we eat the delimiter, otherwise we'll notice
the colon / backtick and think it's either a new control or part
of the control name
2013-06-25 01:44:28 -04:00
c5c86d17dc
InputConfigDiag: Use "..." for complicated expressions
...
The full expression is quite often too big for a simple button
label, so encourage people to use the full editor to edit it.
2013-06-25 00:58:31 -04:00
62281fbfde
InputConfigDiag: Give the input text field a monospace font
2013-06-25 00:58:30 -04:00
03a835ec07
InputConfigDiag: Update for the new expression language
...
Modify the buttons and editor interface for the new expression
language, like the new op name for add, the new device name syntax,
and add new editing features, like simple selection behavior on
unary ops.
2013-06-25 00:58:30 -04:00
a42388d061
ExpressionParser: Support bare words for simple control names
...
Using backticks for all control names can get a bit grating,
so support "A & B" instead of requiring "`A` & `B`".
2013-06-25 00:58:30 -04:00
d2753cce66
ExpressionParser: Add support for the add operator
...
Use "+" instead of "^" this time.
2013-06-25 00:58:30 -04:00
6246f6e815
InputCommon: Add a new ExpressionParser to replace the old hack language
...
This contains a new, hand-written expression parser to replace the old
hack language based on string munging. The new approach is a simple
AST-based evaluation approach, instead of the "list of operations"
infix-based hack that there was before.
The new language for configuration has support for parentheses, and
counts "!" as a unary operator instead of the binary "NOT OR" operator
it was before. A simple example:
(X & Y) | !B
Explicit device references, and complex device names ("Right Y+") are
handled with backticks and colons:
(`SDL/0/6 axis joystick:Right X+` & `DInput/0/Keyboard Mouse:A`)
The basic editor UI that inserts tokens has not been updated to reflect
the new language.
2013-06-25 00:58:30 -04:00
877106b027
InputCommon: Split Device stuff out
...
The ExpressionParser needs this to be out of here to prevent issues
with cyclic references.
2013-06-25 00:58:30 -04:00
143d2eccb4
[Android] Open drawer if there isn't anything in the game list, instead of on first run.
2013-06-24 12:17:31 -05:00
970661a0c5
Warning fix.
2013-06-24 12:30:08 -04:00
f73a97b242
Revert "fix warning: format '%x' expects argument of type 'unsigned int*', but argument 3 has type 'u8* {aka unsigned char*}'"
...
This reverts commit b9953f5d6a
2013-06-24 09:16:14 -04:00
5f91998302
[Android] Add default Android config file
2013-06-24 01:42:35 -05:00
852698ceef
[Android] On first run, open up the navigation drawer so people realize that there is a drawer.
2013-06-24 01:42:35 -05:00
ae395639b0
[Android] Fix drawing on screen control setting being derpy at times.
2013-06-24 01:42:34 -05:00
06b98225e7
[Android] 0.6 Release
2013-06-24 01:42:34 -05:00
597a6b34cb
Compactify VertexShader uid struct.
2013-06-23 19:29:02 +02:00
a2e132dd4b
small index generator optimiztions
...
- rewrite loops to not use divisions and multiplications
- remove warnings as the current implementations seems to be correct (ignore additional vertices)
2013-06-23 14:38:25 +02:00
b9953f5d6a
fix warning: format '%x' expects argument of type 'unsigned int*', but argument 3 has type 'u8* {aka unsigned char*}'
2013-06-23 11:03:30 +02:00
eb579e4264
Merge in JP's change to fix audio stuttering with OpenAL.
2013-06-23 02:46:45 -05:00
6bb7cc5fea
[Android] Add an about screen that shows build revision.
2013-06-22 22:54:36 -05:00
8cf515359c
fixed uninitialzed audio_size variable in WaveFileWriter
2013-06-22 23:24:05 -04:00
fafdc4fcef
DSBCAPS_GLOBALFOCUS allows sound to still play when the application is in the background. Other backends do this, so why not let dsound do it too.
2013-06-22 23:23:53 -04:00
911d73d85a
added new license header to missed audio source files
2013-06-22 23:20:48 -04:00
bdc28106ee
Optimize shader uid checks by checking the number of uid values which are actually used.
2013-06-22 21:47:22 +02:00
16ada5fa3d
Compactify generated UID generator assembly and generally cleanup code by storing tev stage hash values in a struct.
2013-06-22 21:47:22 +02:00
d86185ca54
[Android] Fix ant build?
2013-06-22 08:06:39 -05:00
2b9f79dff3
[Android] Remove SimonVT menudrawer library. Move to Google's support library for their navigation drawer support. Overall cleanup.
2013-06-22 07:45:05 -05:00
15943de313
Revert "Added optimizations to ClassifyFloat/Double functions in Mathutil.cpp and to PPCCache.cpp"
...
This reverts commit 7aae9ccbc0
2013-06-22 12:25:03 +02:00
266236d6a4
When loading a save state in read only that mismatches the current movie, load the input prior to the save state from the save state's movie, instead of using the current movie's input up to that point.
...
This prevents desyncing before the save state.
2013-06-21 01:53:50 -04:00
716f656d28
Save sync gpu setting to dtm header.
2013-06-20 06:08:17 -04:00
010165b2c2
fix gcc warning, probably also the logic
...
comparing two char pointers doesn't compare the strings
2013-06-20 10:43:09 +02:00
fb310f2247
Revert "Create our OGL context on the same thread in the OpenGL backend. Same issue with Qualcomm not working with threading correctly."
...
This reverts commit 2697b8c04f
2013-06-19 09:17:33 +02:00
02cbcc8ec4
[Android] When running OpenGL ES 3 backend, we've got to switch the screen coordinates or bad things happen. Adds a Driver bug that causes swap every single flush. Hard requirement currently to see /anything/ on screen.
2013-06-18 12:44:06 -05:00
9c32c923bc
Remove saturate function define in GLSL since we use clamp everywhere instead. Change the function defines over to just regular defines since Qualcomm can't handle function defines at all it seems.
2013-06-18 12:42:14 -05:00
c4eb659fec
BPMemory: Assign a more descriptive name to a field in the genmode register.
2013-06-18 17:25:16 +02:00
6143594db6
[Android] Qualcomm glGetShaderInfoLog returns a max of 1024 bytes(tested) for the log, and glGetShaderiv with GL_INFO_LOG_LENGTH /always/ returns 0 on compile failure.
2013-06-18 10:24:36 -05:00
fbb82ccab3
Whoops, look like the previous commit was also the case with VideoDX9
2013-06-18 10:48:16 -04:00
f59f059fbf
Fix a char buffer destination size in Render.cpp for VideoDX11.
2013-06-18 10:45:57 -04:00
d78f00971b
Fix a free that should have been a delete.
2013-06-18 10:13:37 -04:00
7df8a9cae8
Partial revert of 0247b2a97a. I'll add a work around for Qualcomm in a bit. Qualcomm shader compiler failing was only due to floating suffixes not whole function defines. Qualcomm video driver devs seem to have a good response time when it comes to OpenGL ES 3 issues.
2013-06-18 07:52:36 -05:00
7223778520
[Android] Gamepad input. Refactor JNI native functions to all pull from a single class instead of everywhere willy-nilly
2013-06-18 07:09:38 -05:00
a518a1cbdc
buffer fixes found via cppcheck/tetsuo--
2013-06-18 13:17:50 +08:00
c57a90c5b5
don't define clipPos twice
...
fix issue 6378
2013-06-17 23:24:54 +02:00
88bc8255b8
Merge branch 'shader-uids-awesome'.
...
Replaces the old, hardcoded shader ID generator with a semi-automatic mechanism that generates IDs from hints in the code generator.
Also introduces a flexible framework to do all kinds of funky stuff with the shader code generation logic. As an example, a uniform usage profile generation class is added (unused for now, though).
Functionality can still be tested by setting the EnableShaderDebugging field in the gfx config to True. Any two shaders which are identified with the same ID will be written to a file and an error message will be written to the Dolphin log.
2013-06-17 13:27:22 +02:00
8816369144
PixelShaderGen: Add some TODOs.
...
Totally the perfect commit message for a final commit before merging :p
2013-06-17 13:17:25 +02:00
f724b47f45
PixelShaderGen: Fix more critical issues, some of which are regressions of revision 32b78a85.
2013-06-17 13:08:38 +02:00
2b2ca5260f
PixelShaderGen: Fixed some bugs, removed unused shader uid fields.
2013-06-17 13:03:38 +02:00
7a01ceba73
PixelShaderGen: Fix various merge conflicts and a critical regression from revision 32b78a85.
2013-06-17 12:51:57 +02:00
868c627876
Fixes Issue 6353 Remove extract apploader/dol from top level
2013-06-17 22:51:15 +12:00
c505260ec1
Fix some merge conflicts.
2013-06-17 12:29:47 +02:00
ca22872dae
Merge 'master' into shader-uids-awesome.
...
Conflicts:
Source/Core/VideoCommon/Src/LightingShaderGen.cpp
Source/Core/VideoCommon/Src/PixelShaderGen.cpp
Source/Core/VideoCommon/Src/PixelShaderGen.h
Source/Core/VideoCommon/Src/VertexShaderGen.cpp
2013-06-17 12:05:47 +02:00
f0ea525d3b
PixelShaderGen: Change a comment slightly.
2013-06-17 11:39:50 +02:00
20719081df
PixelShaderGen: Move RegisterStates from global storage to stack.
2013-06-17 11:37:41 +02:00
7e0db58b1e
Fix stuff
2013-06-17 10:50:16 +02:00
Jasper St. Pierre