Commit Graph

4409 Commits

Author SHA1 Message Date
James Rowe 031c0c05d2 Merge pull request #2478 from jfmherokiller/master
fixed the override warning
2017-01-27 15:02:20 -07:00
noah the goodra 0adb56a6b2 fixed the override warning
```
In file included from citra/src/audio_core/sink_details.cpp:11:
citra/src/./audio_core/sdl2_sink.h:25:10: warning: 'SetDevice' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
    void SetDevice(int device_id);
         ^
citra/src/./audio_core/sink.h:39:18: note: overridden virtual function is here
    virtual void SetDevice(int device_id) = 0;
                 ^
```
2017-01-27 14:24:14 -06:00
Yuri Kunde Schlesner 19e4fd28ef Merge pull request #2346 from yuriks/shader-refactor2
More shader refactoring
2017-01-27 14:29:10 -03:00
Kloen Lansfiel 637f58dd1e SDL: Select audio device (#2403)
* Initial Commit

Added Device logic to Sinks
Started on UI for selecting devices

Removed redundant import

* Audio Core: Complete Device Switching

Complete the device switching implementation by allowing the output
device to be loaded, changed and saved through the configurations menu.

Worked with the Sink abstraction and tuned the "Device Selection"
configuration so that the Device List is automatically populated when
the Sink is changed.
This hopefully addresses the concerns and recommendations mentioned in
the comments of the PR.

* Clean original implementation.

* Refactor GetSinkDetails
2017-01-25 22:33:26 -05:00
Yuri Kunde Schlesner ab0b74b0f3 VideoCore/Shader: Move entry_point to SetupBatch 2017-01-25 18:53:25 -08:00
Yuri Kunde Schlesner 1994f1a6f2 VideoCore/Shader: Move per-batch ShaderEngine state into ShaderSetup 2017-01-25 18:53:25 -08:00
Yuri Kunde Schlesner c863fc36ce Shader: Remove OutputRegisters struct 2017-01-25 18:53:25 -08:00
Yuri Kunde Schlesner b0ec4da3b0 Shader: Initialize conditional_code in interpreter
This doesn't belong in LoadInputVertex because it also happens for
non-VS invocations. Since it's not used by the JIT it seems adequate to
initialize it in the interpreter which is the only thing that cares
about them.
2017-01-25 18:53:24 -08:00
Yuri Kunde Schlesner e500250c97 Shader: Don't read ShaderSetup from global state 2017-01-25 18:53:24 -08:00
Yuri Kunde Schlesner 5b046f49c9 shader_jit_x64: Don't read program from global state 2017-01-25 18:53:24 -08:00
Yuri Kunde Schlesner 46fc50931f VideoCore/Shader: Move ProduceDebugInfo to InterpreterEngine 2017-01-25 18:53:24 -08:00
Yuri Kunde Schlesner 2c14dbdb64 Debugger: Always use interpreter for shader debugging 2017-01-25 18:53:24 -08:00
Yuri Kunde Schlesner 931a2b0ca4 VideoCore/Shader: Split interpreter and JIT into separate ShaderEngines 2017-01-25 18:53:24 -08:00
Yuri Kunde Schlesner 88b533871e VideoCore/Shader: Rename shader_jit_x64{ => _compiler}.{cpp,h} 2017-01-25 18:53:23 -08:00
Yuri Kunde Schlesner 73e7bc2592 VideoCore/Shader: Split shader uniform state and shader engine
Currently there's only a single dummy implementation, which will be
split in a following commit.
2017-01-25 18:53:23 -08:00
Yuri Kunde Schlesner f887eccd74 VideoCore/Shader: Add constness to methods 2017-01-25 18:53:23 -08:00
Yuri Kunde Schlesner 03d2b6aa89 VideoCore/Shader: Use only entry_point as ShaderSetup param
This removes all implicit dependency of ShaderState on global PICA
state.
2017-01-25 18:53:23 -08:00
Yuri Kunde Schlesner d6533112fe VideoCore/Shader: Use self instead of g_state.vs in ShaderSetup 2017-01-25 18:53:23 -08:00
Yuri Kunde Schlesner 2771bde17a VideoCore/Shader: Extract input vertex loading code into function 2017-01-25 18:53:20 -08:00
Yuri Kunde Schlesner c25a9cf64d Merge pull request #2434 from mailwl/nfc-amiibo
Service/NFC: stub some functions
2017-01-25 23:47:56 -03:00
Yuri Kunde Schlesner f672c42404 Merge pull request #2469 from Kloen/killing-warnings
Fixing some MSVC warnings
2017-01-24 20:58:11 -03:00
Kloen Lansfiel 016d033a93 github: fixed issue template forum links (#2470) 2017-01-24 10:23:03 -03:00
Kloen 55c137a3ab video_core: fix shader.cpp signed / unsigned warning 2017-01-23 16:53:31 +01:00
Kloen efb168a1ce video_core: gl_rasterizer float to int warning 2017-01-23 16:53:30 +01:00
Kloen b969f82292 video_core: fix gl_rasterizer warning on MSVC 2017-01-23 16:53:30 +01:00
Kloen b377b96ca0 core: fix mic_u warnings on MSVC 2017-01-23 16:53:05 +01:00
3dsemu ba770cc447 Changed FAQ link (#2462)
Changed the FAQ link so it leads to the FAQ on the Citra website, instead of the FAQ hosted
on GitHub
2017-01-23 02:34:50 -03:00
bunnei b82ea2750d Merge pull request #2466 from Kloen/we-dont-need-this
Removed unused and outdated external qhexedit
2017-01-22 22:35:13 -05:00
Kloen 9578e123ec Removed unused and outdated external qhexedit 2017-01-22 18:46:48 +01:00
Kloen e0e1b347a4 citra-qt: Removed unused and unimplemented ramview files. 2017-01-22 18:42:15 +01:00
bunnei d6f681b35f Merge pull request #2458 from wwylele/reset-accel-gyro
HID: reset acceleroeter and gyroscope index in Init
2017-01-20 21:14:44 -05:00
bunnei 9c0e7d2c31 Merge pull request #2459 from 3ds-emu/patch-1
Updated Citra forum link
2017-01-20 19:34:35 -05:00
3ds-emu 3a05edace5 Updated Citra forum link
The Citra forum (discuss.citra-emu.org) has recently been down. The link that has been added 
in this file now leads to an error pages. I update updated the link so it now leads to Citra's new
forum.
2017-01-21 10:09:22 +11:00
wwylele d678c306b8 HID: reset acceleroeter and gyroscope index in Init 2017-01-20 23:33:50 +02:00
Yuri Kunde Schlesner 018f4ac971 Merge pull request #2450 from Xtansia/master
loader: Add support for 3DSX special relocation types
2017-01-19 01:30:59 -03:00
Thomas Farr c1d05a2df5 loader: Add support for 3DSX special relocation types, fixes citra-emu/citra#2449
As per devkitPro/3dstools@47bea18
2017-01-19 01:34:58 +13:00
Yuri Kunde Schlesner 46b0050e2f Merge pull request #2442 from wwylele/hid-signal
HID: manages updating itself using correct ticks
2017-01-16 19:38:35 -03:00
wwylele 34440c54a9 CoreTiming: use named constant for ARM11 clock rate 2017-01-16 09:59:16 +02:00
wwylele 8f807fc8ef HID: manages updating itself using correct ticks 2017-01-16 09:51:44 +02:00
mailwl b777c9ae81 Service/NFC: stub some functions
Tested on: Mini-Mario & Friends - amiibo Challenge
2017-01-14 16:15:16 +03:00
Yuri Kunde Schlesner d01195febc Merge pull request #2435 from mailwl/gsp-mask
GSP::WriteHWRegsWithMask: fix register mask
2017-01-14 07:52:53 -03:00
mailwl ecf76c326c GSP::WriteHWRegsWithMask: fix register mask 2017-01-14 13:37:04 +03:00
bunnei fab819c064 Merge pull request #2423 from Kloen/floats-should-be-float
SDL2: Config, fix double to float warning
2017-01-13 12:04:27 -05:00
bunnei dcd17e7d50 Merge pull request #2424 from Kloen/qt-ui-warnings-really
Qt: Fix UI related warnings and bonus ui file format
2017-01-12 10:15:12 -05:00
bunnei b1133afc28 Merge pull request #2425 from Subv/cleanup_todos
Implement some TODOs in the code.
2017-01-12 10:14:30 -05:00
bunnei d71a04381c Merge pull request #2308 from mailwl/ac-i
Service/AC: add ac:i service
2017-01-12 10:12:46 -05:00
Subv a81290ffb4 Threads: Check the process' resource limit for the max allowed priority when creating a thread and remove the priority clamping code. 2017-01-11 16:38:05 -05:00
Subv fbe090645c Thread: Added priority range checking to svcSetThreadPriority and removed priority clamping code from Thread::SetPriority. 2017-01-11 16:38:04 -05:00
Subv c77cafb0a7 Y2R: Use the proper error code when GetStandardCoefficient receives an invalid value. 2017-01-11 16:38:03 -05:00
Kloen 93c2abb5d8 QT: Fix ui file format 2017-01-11 13:52:26 +01:00