Commit Graph

4416 Commits

Author SHA1 Message Date
Yuri Kunde Schlesner 3ad8bec4d4 Merge pull request #2491 from Kloen/killing-warnings-2.5HDRemix
core: emu_window.cpp, fix conversion warnings from float to s16 on MSVC
2017-01-29 11:42:23 -08:00
Kloen 11acca36a2 core: emu_window.cpp, fix conversion warnings from float to s16 on MSVC 2017-01-29 16:39:31 +01:00
Yuri Kunde Schlesner d7dacc6d4f Merge pull request #2485 from Kloen/killing-warnings-computehash64
Switch ComputeHash64 len param to size_t instead of int
2017-01-28 10:37:40 -08:00
Yuri Kunde Schlesner 16f1c3bced Merge pull request #2484 from Kloen/killing-warnings-nihstro
Updated nihstro to latest master. Fix warning on MSVC
2017-01-28 10:36:55 -08:00
Kloen e761ad9f29 common: add <cstddef> to hash.h 2017-01-28 15:30:18 +01:00
Kloen f56f1b4440 common: switch ComputeHash64 len param to size_t instead of int, fix warning on MSVC on dsp_dsp.cpp 2017-01-28 14:47:14 +01:00
Kloen 7f2e9aedfa externals: Updated nihstro to latest master. Fix warning on MSVC 2017-01-28 14:30:50 +01:00
James Rowe a943bbc23a Merge pull request #2478 from jfmherokiller/master
fixed the override warning
2017-01-27 15:02:20 -07:00
noah the goodra 306e198adf 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 7a3aebe5ee Merge pull request #2346 from yuriks/shader-refactor2
More shader refactoring
2017-01-27 14:29:10 -03:00
Kloen Lansfiel ff31276d53 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 18324c6e80 VideoCore/Shader: Move entry_point to SetupBatch 2017-01-25 18:53:25 -08:00
Yuri Kunde Schlesner 454b464c55 VideoCore/Shader: Move per-batch ShaderEngine state into ShaderSetup 2017-01-25 18:53:25 -08:00
Yuri Kunde Schlesner 8140f649a6 Shader: Remove OutputRegisters struct 2017-01-25 18:53:25 -08:00
Yuri Kunde Schlesner 5e50257cc1 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 b6fe26eaab Shader: Don't read ShaderSetup from global state 2017-01-25 18:53:24 -08:00
Yuri Kunde Schlesner 170177fb22 shader_jit_x64: Don't read program from global state 2017-01-25 18:53:24 -08:00
Yuri Kunde Schlesner 80d3c9090f VideoCore/Shader: Move ProduceDebugInfo to InterpreterEngine 2017-01-25 18:53:24 -08:00
Yuri Kunde Schlesner bf53845b3e Debugger: Always use interpreter for shader debugging 2017-01-25 18:53:24 -08:00
Yuri Kunde Schlesner f56a58b1e1 VideoCore/Shader: Split interpreter and JIT into separate ShaderEngines 2017-01-25 18:53:24 -08:00
Yuri Kunde Schlesner 0a92fc3c52 VideoCore/Shader: Rename shader_jit_x64{ => _compiler}.{cpp,h} 2017-01-25 18:53:23 -08:00
Yuri Kunde Schlesner e38a8280e6 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 d08969675a VideoCore/Shader: Add constness to methods 2017-01-25 18:53:23 -08:00
Yuri Kunde Schlesner 20e3c94102 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 590b8ecaa9 VideoCore/Shader: Use self instead of g_state.vs in ShaderSetup 2017-01-25 18:53:23 -08:00
Yuri Kunde Schlesner 46c74145be VideoCore/Shader: Extract input vertex loading code into function 2017-01-25 18:53:20 -08:00
Yuri Kunde Schlesner ef8b18c261 Merge pull request #2434 from mailwl/nfc-amiibo
Service/NFC: stub some functions
2017-01-25 23:47:56 -03:00
Yuri Kunde Schlesner 2a806aa5be Merge pull request #2469 from Kloen/killing-warnings
Fixing some MSVC warnings
2017-01-24 20:58:11 -03:00
Kloen Lansfiel 0119397267 github: fixed issue template forum links (#2470) 2017-01-24 10:23:03 -03:00
Kloen 04d4afa8d1 video_core: fix shader.cpp signed / unsigned warning 2017-01-23 16:53:31 +01:00
Kloen 70fe1857f8 video_core: gl_rasterizer float to int warning 2017-01-23 16:53:30 +01:00
Kloen 4e1cfad4eb video_core: fix gl_rasterizer warning on MSVC 2017-01-23 16:53:30 +01:00
Kloen 2b6bc49538 core: fix mic_u warnings on MSVC 2017-01-23 16:53:05 +01:00
3dsemu b6056bfa43 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 41ff4c57ac 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 c1369b02f3 Removed unused and outdated external qhexedit 2017-01-22 18:46:48 +01:00
Kloen fa19e1685b citra-qt: Removed unused and unimplemented ramview files. 2017-01-22 18:42:15 +01:00
bunnei 9519c4227d 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 1529efde60 Merge pull request #2459 from 3ds-emu/patch-1
Updated Citra forum link
2017-01-20 19:34:35 -05:00
3ds-emu 6bde01cecf 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 3928dde1c2 HID: reset acceleroeter and gyroscope index in Init 2017-01-20 23:33:50 +02:00
Yuri Kunde Schlesner d44a04cef9 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 baa5f3cecd 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 a3b98a8739 Merge pull request #2442 from wwylele/hid-signal
HID: manages updating itself using correct ticks
2017-01-16 19:38:35 -03:00
wwylele 402f3d9ae7 CoreTiming: use named constant for ARM11 clock rate 2017-01-16 09:59:16 +02:00
wwylele 84c595e522 HID: manages updating itself using correct ticks 2017-01-16 09:51:44 +02:00
mailwl bbdec25c68 Service/NFC: stub some functions
Tested on: Mini-Mario & Friends - amiibo Challenge
2017-01-14 16:15:16 +03:00
Yuri Kunde Schlesner b80a68965e Merge pull request #2435 from mailwl/gsp-mask
GSP::WriteHWRegsWithMask: fix register mask
2017-01-14 07:52:53 -03:00
mailwl 4d8ffc1a34 GSP::WriteHWRegsWithMask: fix register mask 2017-01-14 13:37:04 +03:00
bunnei b88f1e9e0f 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