mirrors/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-15 16:53:27 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity
10,065 Commits 6 Branches 12 Tags 98 GiB
d1baa8edd9
Commit Graph

8966 Commits

Author SHA1 Message Date
NeoBrainX
e3c0a39d5d Merge branch 'shader-uids-awesome-after-hours'. 2013-06-28 17:45:19 +02:00
NeoBrainX
166a9c5637 Finishing touches. 2013-06-28 17:43:53 +02:00
Jasper St. Pierre
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
Ryan Houdek
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
degasus
72d49e05a7 fix opengl debug build on win32 2013-06-27 10:34:53 +02:00
Jasper St. Pierre
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
Jasper St. Pierre
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
Jasper St. Pierre
c11ae9ea4b Revert "Core: Update default bound controls for new ExpressionParser" 
This reverts commit 54e1b58199.

We now support barewords control names, so use those instead.

Conflicts:
	Source/Core/Core/Src/HW/WiimoteEmu/WiimoteEmu.cpp
 2013-06-26 20:25:37 -04:00
Jasper St. Pierre
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
Jasper St. Pierre
03fdebac09 ExpressionParser: Don't crash when we can't find a device 2013-06-26 16:54:48 -04:00
Ryan Houdek
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
degasus
99d32e756f only provide ES2_compatibility workaround for non gles devices 2013-06-26 13:14:46 +02:00
Ryan Houdek
0037acbbaa [Android] Actually copy Dolphin.ini correctly... 2013-06-26 05:32:56 -05:00
Rachel Bryk
63a747edc0 Add shortcut to (dis)connect the balance board. 
Fixes issue 6383.
 2013-06-26 06:23:29 -04:00
Ryan Houdek
06d721984d [Android] Make the navigation drawer not so blindingly dark. 2013-06-26 04:58:34 -05:00
Ryan Houdek
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
Jasper St. Pierre
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
degasus
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
Rachel Bryk
5904ffb21d Fix last commit, and set the position on mouse down instead of mouse up. 2013-06-25 11:04:28 -04:00
Rachel Bryk
b892d838ff Allow dragging the analog sticks with the tas input. 2013-06-25 10:52:25 -04:00
John Peterson
e250550de3 Removing muted Wiimote audio 
because that reduce writes
 2013-06-25 09:24:45 -04:00
John Peterson
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
John Peterson
0fd3acd152 Saving real Wiimote state 
because that's simpler than reconnecting
 2013-06-25 09:24:14 -04:00
NeoBrainX
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
Jasper St. Pierre
748ee50536 Core: Fix a typo in the binding of IR Up 
Whoops.
 2013-06-25 01:58:22 -04:00
Jasper St. Pierre
54e1b58199 Core: Update default bound controls for new ExpressionParser 2013-06-25 01:46:13 -04:00
Jasper St. Pierre
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
Jasper St. Pierre
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
Jasper St. Pierre
62281fbfde InputConfigDiag: Give the input text field a monospace font 2013-06-25 00:58:30 -04:00
Jasper St. Pierre
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
Jasper St. Pierre
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
Jasper St. Pierre
d2753cce66 ExpressionParser: Add support for the add operator 
Use "+" instead of "^" this time.
 2013-06-25 00:58:30 -04:00
Jasper St. Pierre
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
Jasper St. Pierre
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
Ryan Houdek
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
Rachel Bryk
970661a0c5 Warning fix. 2013-06-24 12:30:08 -04:00
Rachel Bryk
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
Ryan Houdek
5f91998302 [Android] Add default Android config file 2013-06-24 01:42:35 -05:00
Ryan Houdek
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
Ryan Houdek
ae395639b0 [Android] Fix drawing on screen control setting being derpy at times. 2013-06-24 01:42:34 -05:00
Ryan Houdek
06b98225e7 [Android] 0.6 Release 2013-06-24 01:42:34 -05:00
NeoBrainX
597a6b34cb Compactify VertexShader uid struct. 2013-06-23 19:29:02 +02:00
degasus
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
Tetsuo55
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
Ryan Houdek
eb579e4264 Merge in JP's change to fix audio stuttering with OpenAL. 2013-06-23 02:46:45 -05:00
Ryan Houdek
6bb7cc5fea [Android] Add an about screen that shows build revision. 2013-06-22 22:54:36 -05:00
Jordan Cristiano
8cf515359c fixed uninitialzed audio_size variable in WaveFileWriter 2013-06-22 23:24:05 -04:00
Jordan Cristiano
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
Jordan Cristiano
911d73d85a added new license header to missed audio source files 2013-06-22 23:20:48 -04:00
NeoBrainX
bdc28106ee Optimize shader uid checks by checking the number of uid values which are actually used. 2013-06-22 21:47:22 +02:00
NeoBrainX
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
Ryan Houdek
d86185ca54 [Android] Fix ant build? 2013-06-22 08:06:39 -05:00
Ryan Houdek
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
NeoBrainX
15943de313 Revert "Added optimizations to ClassifyFloat/Double functions in Mathutil.cpp and to PPCCache.cpp" 
This reverts commit 7aae9ccbc0.

Reasons:
- no test results have been provided to prove the usefulness of the patch
- broken coding style
- the author hasn't replied to any criticism
 2013-06-22 12:25:03 +02:00
Rachel Bryk
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
Rachel Bryk
716f656d28 Save sync gpu setting to dtm header. 2013-06-20 06:08:17 -04:00
degasus
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
degasus
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.

The context creation may be moved to Video_Prepare, but the window creation isn't allowed to.
Eg we set the window title or read the mouse position, both need the window.
Also the readback of the window size didn't worked any more.
 2013-06-19 09:17:33 +02:00
Ryan Houdek
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
Ryan Houdek
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
NeoBrainX
c4eb659fec BPMemory: Assign a more descriptive name to a field in the genmode register. 2013-06-18 17:25:16 +02:00
Ryan Houdek
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
Lioncash
fbb82ccab3 Whoops, look like the previous commit was also the case with VideoDX9 2013-06-18 10:48:16 -04:00
Lioncash
f59f059fbf Fix a char buffer destination size in Render.cpp for VideoDX11. 2013-06-18 10:45:57 -04:00
Lioncash
d78f00971b Fix a free that should have been a delete. 2013-06-18 10:13:37 -04:00
Ryan Houdek
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
Ryan Houdek
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
booto
a518a1cbdc buffer fixes found via cppcheck/tetsuo-- 2013-06-18 13:17:50 +08:00
degasus
c57a90c5b5 don't define clipPos twice 
fix issue 6378
 2013-06-17 23:24:54 +02:00
NeoBrainX
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
NeoBrainX
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
NeoBrainX
f724b47f45 PixelShaderGen: Fix more critical issues, some of which are regressions of revision 32b78a85. 2013-06-17 13:08:38 +02:00
NeoBrainX
2b2ca5260f PixelShaderGen: Fixed some bugs, removed unused shader uid fields. 2013-06-17 13:03:38 +02:00
NeoBrainX
7a01ceba73 PixelShaderGen: Fix various merge conflicts and a critical regression from revision 32b78a85. 2013-06-17 12:51:57 +02:00
Matthew Parlane
868c627876 Fixes Issue 6353 Remove extract apploader/dol from top level 2013-06-17 22:51:15 +12:00
NeoBrainX
c505260ec1 Fix some merge conflicts. 2013-06-17 12:29:47 +02:00
NeoBrainX
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
NeoBrainX
f0ea525d3b PixelShaderGen: Change a comment slightly. 2013-06-17 11:39:50 +02:00
NeoBrainX
20719081df PixelShaderGen: Move RegisterStates from global storage to stack. 2013-06-17 11:37:41 +02:00
NeoBrainX
7e0db58b1e Fix stuff 2013-06-17 10:50:16 +02:00
NeoBrainX
32b78a8572 First steps of making the pixel shader uid struct more compact. 2013-06-17 10:50:12 +02:00
Matthew Parlane
43a4d41889 Handle 1 partition only, fixes Issue #6353 2013-06-17 19:25:55 +12:00
Armada
9594cac42c Build fix: Android NDK doesn't support any locale switching. 
Also, Mac OS X doesn't support DX9.
 2013-06-16 14:51:38 +02:00
Armada
fc7099a905 Set the locale per-thread instead of globally when generating shaders. Add cross-compatible versions of newlocale, uselocale and freelocale. 
This commit fixes a rare race condition when generating shaders because setlocale is global.
 2013-06-16 12:33:13 +02:00
John Peterson
825c5ca09a Equalising the 32 and 64 bit state compression 
because that allow loading both
 2013-06-15 23:28:04 +02:00
John Peterson
5bd44d7e3f Build fix 2013-06-13 18:38:05 +02:00
John Peterson
adb83cfabe Clarifying the OpenAL loop 
because it isn't as clear as it can be
 2013-06-13 18:04:02 +02:00
Ryan Houdek
3ddd24872b Merge branch 'GLES3' 
Conflicts:
	Source/Android/.idea/workspace.xml
 2013-06-12 03:29:18 -05:00
Ryan Houdek
fa4ad82878 Fix Windows Compiling? 2013-06-12 03:14:13 -05:00
Ryan Houdek
e4a3919a2b [Android] 0.5 Release. 2013-06-12 03:11:59 -05:00
Ryan Houdek
baf16a72b6 [Android] Back to enforcing ICS or above limitation. Tired of this nonsense. 2013-06-11 08:45:31 -05:00
Ryan Houdek
ab6151a5ba Build Fix 2x 2013-06-11 08:41:30 -05:00
Ryan Houdek
9df3dbe13c Build Fix 2013-06-11 08:38:45 -05:00
Ryan Houdek
703a51e4c0 [Android] Start of *working* GLES3 support. Needs to be able to compile in Windows still. 2013-06-11 08:33:56 -05:00
Ryan Houdek
1bea76a6e0 [Android] Remove artificial limitation to not leave the sdcard directory in the folder browser as well. 2013-06-11 08:25:15 -05:00
Ryan Houdek
fcf86f112a [Android] Remove artificial limitation to not leave the sdcard directory. Keep screen on while running. 2013-06-11 08:24:23 -05:00
Ryan Houdek
8efdbcda9e [Android] Fix drawn buttons causing rendering issues. 2013-06-11 08:23:32 -05:00
Rachel Bryk
3e40f28369 Get video backend name via g_video_backend->GetName() instead of sconfig for movies, since that can be wrong. 
Also, I still can't code. Or even notice when something obviously doesn't work.
 2013-06-10 21:04:55 -04:00
skidau
92fdc15aa3 Implemented field order detection for PAL games. Fixes the shaking of the screen when XFB is enabled with a PAL game. 
Fixes issue 6316.
 2013-06-08 14:05:02 +10:00
skidau
196d152ad7 Invalidate the texture cache using the GPU thread when the CPU thread makes a request. 
Fixes issue 6350.
 2013-06-08 11:28:54 +10:00