midou/citra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,118 Commits 1 Branch 0 Tags 60 MiB
b31ed30fb2
Commit Graph

5070 Commits

Author SHA1 Message Date
James Rowe
f346a9d372 Split multiplayer code into its own class 2018-04-19 10:28:15 -06:00
James Rowe
ddbbab8fd6 Add network status text to the status bar 2018-04-19 10:28:15 -06:00
James Rowe
871196bc10 Citra-qt: Add multiplayer ui 2018-04-19 10:28:14 -06:00
Weiyi Wang
bba2a60b22
Merge pull request #3670 from jbeich/qt 
Unbreak build with Qt 5.9.4 (at least on FreeBSD)
 2018-04-19 18:02:35 +03:00
Weiyi Wang
977abd2c7a
Merge pull request #3607 from adityaruplaha/sdl2-fullscreen 
SDL2: Implement fullscreen
 2018-04-19 16:16:37 +03:00
Jan Beich
394638e9c9 Qt: Add missing #include after 2f8bd18296 
In file included from src/citra_qt/citra-qt_autogen/mocs_compilation.cpp:14:
In file included from src/citra_qt/citra-qt_autogen/EWIEGA46WW/moc_game_list_p.cpp:9:
src/citra_qt/game_list_p.h:160:17: error: use of undeclared identifier 'QCoreApplication'; did you mean 'QApplication'?
        setText(QCoreApplication::translate("GameList", status.text));
                ^~~~~~~~~~~~~~~~
                QApplication
/usr/local/include/qt5/QtGui/qwindowdefs.h:81:7: note: 'QApplication' declared here
class QApplication;
      ^
In file included from src/citra_qt/citra-qt_autogen/mocs_compilation.cpp:14:
In file included from src/citra_qt/citra-qt_autogen/EWIEGA46WW/moc_game_list_p.cpp:9:
src/citra_qt/game_list_p.h:160:17: error: incomplete type 'QApplication' named in nested name specifier
        setText(QCoreApplication::translate("GameList", status.text));
                ^~~~~~~~~~~~~~~~~~
/usr/local/include/qt5/QtCore/qobject.h:446:18: note: forward declaration of 'QApplication'
    friend class QApplication;
                 ^
In file included from src/citra_qt/citra-qt_autogen/mocs_compilation.cpp:14:
In file included from src/citra_qt/citra-qt_autogen/EWIEGA46WW/moc_game_list_p.cpp:9:
src/citra_qt/game_list_p.h:161:20: error: use of undeclared identifier 'QCoreApplication'; did you mean 'QApplication'?
        setToolTip(QCoreApplication::translate("GameList", status.tooltip));
                   ^~~~~~~~~~~~~~~~
                   QApplication
/usr/local/include/qt5/QtGui/qwindowdefs.h:81:7: note: 'QApplication' declared here
class QApplication;
      ^
In file included from src/citra_qt/citra-qt_autogen/mocs_compilation.cpp:14:
In file included from src/citra_qt/citra-qt_autogen/EWIEGA46WW/moc_game_list_p.cpp:9:
src/citra_qt/game_list_p.h:161:20: error: incomplete type 'QApplication' named in nested name specifier
        setToolTip(QCoreApplication::translate("GameList", status.tooltip));
                   ^~~~~~~~~~~~~~~~~~
/usr/local/include/qt5/QtCore/qobject.h:446:18: note: forward declaration of 'QApplication'
    friend class QApplication;
                 ^
 2018-04-18 20:03:52 +00:00
Daniel Lim Wee Soong
10f0fbc0e5 core/gdbstub: Migrate logging macros 
Change to use the new logging macros
 2018-04-18 21:53:26 +08:00
Weiyi Wang
048b0fc0d3
Merge pull request #3662 from wwylele/shader-hash-cache 
shader: avoid recomputing hash for the same program
 2018-04-18 12:10:25 +03:00
adityaruplaha
e5f5fdee2e SDL2: Implement fullscreen 2018-04-17 23:22:23 +05:30
James Rowe
2f8bd18296 Use the QT_TRANSLATE_NOOP macro 2018-04-17 10:42:05 -06:00
wwylele
d52ddd0ec4 shader: avoid recomputing hash for the same program 2018-04-17 09:47:59 +03:00
wwylele
3cc460ab34 shader_jit: change passing ShaderSetup to passing uniforms struct into the program 
We are going to add private memebers to ShaderSetup, which forbids the usage of offsetof. The JIT program only use the uniform part of the setup, so we can just isolate it.
 2018-04-17 09:35:43 +03:00
Weiyi Wang
cb36f9fad2
Merge pull request #3645 from wwylele/shader-manager 
renderer_opengl: refactor shader & program objects and add shader manager for rasterizer
 2018-04-16 16:38:38 +03:00
baka0815
4321ab44ea citra-qt: Don't translate function keys in InitializeHotkeys() 2018-04-16 12:37:13 +02:00
FearlessTobi
fbc05fac19 Show game compatibility within Citra 2018-04-16 00:42:58 +02:00
Merry
d5b1c33587
Merge pull request #3656 from lioncash/relocate 
sm: Relocate the service manager to the System class
 2018-04-15 10:34:14 +01:00
Merry
9e21094dea
Merge pull request #3631 from daniellimws/boss-fmt 
service/boss: Migrate logging macros
 2018-04-15 08:59:42 +01:00
Lioncash
a78920e60b
sm: Relocate the service manager to the System class 
Rather than have it live as a global variable, place it into the System class and make it instance-based.
 2018-04-13 07:15:34 -04:00
Lioncash
5309b51c12 cam: Correct forward declaration type for Core::EventType 
This is actually a struct, not a class.
 2018-04-12 23:15:16 -04:00
Weiyi Wang
bfd1d963ba
Merge pull request #3638 from ds84182/we-need-more-rounds 
Round TEV outputs and the final fragment output in GLSL
 2018-04-12 23:32:27 +03:00
Weiyi Wang
9772513141
Merge pull request #3639 from wwylele/texture-cude-fix 
gl_rasterizer_cache: exit FillTextureCube when address is invalid
 2018-04-12 22:54:14 +03:00
Weiyi Wang
dfe9b4edf8
Merge pull request #3587 from valentinvanelslande/apt-fmt 
Service/APT: Migrate logging macros
 2018-04-12 22:47:44 +03:00
Weiyi Wang
6df2e3ccc9
Merge pull request #3614 from valentinvanelslande/movie-fmt 
movie: migrate logging macros
 2018-04-12 22:46:15 +03:00
Weiyi Wang
ca6f6f172b
Merge pull request #3634 from ccawley2011/citra-room-glad 
citra-room: Use the default OpenGL loader instead of SDL_GL_GetProcAddress
 2018-04-12 22:45:30 +03:00
Weiyi Wang
f10123f546
Merge pull request #3611 from adityaruplaha/fullscreen-fix 
citra-qt: Fix the stuck in fullscreen bug.
 2018-04-12 22:43:04 +03:00
wwylele
8dc75598a4 gl_rasterizer: isolate shader management into its own class 2018-04-11 14:52:37 +03:00
wwylele
36bc92273b gl_shader_gen: accept an option to generate separable shaders 2018-04-11 14:52:37 +03:00
wwylele
bdab18d2d9 gl_resource_manager: add OGLPipeline 2018-04-11 14:52:37 +03:00
wwylele
4f9b9c4b80 gl_state: add pipeline state 2018-04-11 14:41:43 +03:00
wwylele
48869c768f gl_resource_manager: separate OGLShader and OGLProgram 2018-04-11 14:41:43 +03:00
wwylele
d2ee40dc45 gl_shader_util: separate shader object creation and program object creation 2018-04-11 14:41:43 +03:00
wwylele
4256641da4 gl_rasterizer/lighting: implement shadow attenuation 2018-04-10 20:26:55 +03:00
wwylele
b5763cb952 pica/lighting: split FresnelSelector into bitfields 
The FresnelSelector was already working like a bitfield, so just make it actual bitfield to reduce redundant code. Also, it is already confirmed that this field also affects shadow on alpha. Given that the only two source that can affect alpha components are both controlled by this field, this field should be renamed to a general alpha switch
 2018-04-10 20:25:56 +03:00
Valentin Vanelslande
7f61eb0ff6
default_ini: remove space in custom_layout 2018-04-08 21:48:07 -05:00
wwylele
7e7de7d3ab gl_rasterizer_cache: exit FillTextureCube when address is invalid 2018-04-08 12:34:50 +03:00
Dwayne Slater
234161ba62 Make byteround less expensive (thanks hrydgard!) 2018-04-07 18:26:14 -04:00
Dwayne Slater
734279ff22 Round TEV outputs and the final fragment output in GLSL 
Fixes water effect in SM3DL
 2018-04-07 16:43:56 -04:00
adityaruplaha
2a7d0ec4be Fix the stuck in fullscreen bug. 
Don't save the UI/RenderWindow geometry if fullscreen was enabled.
 2018-04-07 12:16:07 +05:30
Cameron Cawley
cef88965d7 citra-room: Use the default OpenGL loader instead of SDL_GL_GetProcAddress 
Fixes #3538
 2018-04-06 20:27:47 +01:00
Daniel Lim Wee Soong
2d45e46558 service/boss: Migrate logging macros 2018-04-06 19:43:09 +08:00
wwylele
39fce60145 [quick-fix]file-util: fmtlib errors on FILE* type parameter. Explicitly cast it to void* 2018-04-06 13:35:37 +03:00
Weiyi Wang
972db17247
Merge pull request #3497 from wwylele/texture-cube-new 
gl_rasterizer: implement TextureCube
 2018-04-06 12:41:40 +03:00
Weiyi Wang
a9544ca015
Merge pull request #3580 from daniellimws/common-fmt 
common: Migrate logging macros
 2018-04-06 12:38:08 +03:00
James Rowe
501717e9db Update fmtlib to fix msvc warnings 
Additionally, when updating fmtlib, there was a change in fmtlib broke
how the old logging macro was overloaded, so this works around that by
just naming the fmtlib macro impl something different
 2018-04-05 22:33:12 -06:00
Weiyi Wang
a2e87075c5
Merge pull request #3489 from B3n30/UDS_send_node_information 
NWM_ UDS:Let connected clients handle the eapol packet
 2018-04-05 16:14:39 +03:00
B3n30
f64f118e3b fix Subvs suggestions 2018-04-05 14:57:35 +02:00
B3n30
2d72b2be8b fix Subvs suggestions 2018-04-05 14:43:21 +02:00
Weiyi Wang
e3d25bc6d0
Merge pull request #3567 from wwylele/pica-glsl 
renderer_opengl: add PICA->GLSL shader decompiler
 2018-04-05 14:39:27 +03:00
Weiyi Wang
acb02d300c
Merge pull request #3518 from wwylele/hashable-struct 
Common/Hash: abstract HashableStruct from GLShader::PicaShaderConfig
 2018-04-05 14:39:12 +03:00
James Rowe
1fecead2ff
Merge pull request #3624 from wwylele/sync-uniform 
gl_rasterizer: move shader uniform sync from SetShader() to ctor
 2018-04-05 00:30:38 -06:00
James Rowe
c57b0767af
Merge pull request #3602 from lioncash/json 
verify_login: Make VerifyLogin exceptionless
 2018-04-04 23:39:28 -06:00
wwylele
0d84c5a0b6 gl_rasterizer: move state syncing from ctor to its own function 2018-04-04 17:23:55 +03:00
N00byKing
11cd6d066a
default_ini.h: Update Comment 2018-04-03 15:07:25 +02:00
wwylele
c2719feda2 gl_rasterizer: move shader uniform sync from SetShader() to ctor 2018-04-03 09:27:23 +03:00
Merry
7d7101706e
Merge pull request #3621 from daniellimws/dyncom-fmt 
arm/dyncom: Migrate logging macros
 2018-04-02 17:09:36 +01:00
Valentin Vanelslande
c9ab184ec7 pica_to_gl: Migrate logging macros (#3608) 2018-04-02 09:31:28 -06:00
wwylele
9ffd400685 gl_shader_decompiler: add missing headers/rename GetXXX to MoveXXX to reflect that they move the data 2018-04-02 17:34:54 +03:00
wwylele
11c2f11872 gl_shader_decompiler: return error on decompilation failure 
Internally these errors are handled by exceptions. Only fallbackable errors (that can be handled by CPU shader emulation) is reported. Completely ill-formed shader is still ASSERTed. Code logic related stuff is DEBUG_ASSERTed
 2018-04-02 17:34:54 +03:00
wwylele
4991b15ee5 gl_shader_decompiler: some small fixes 
- remove unnecessary ";"
- use std::tie for lexicographical ordering
- simplify loop condition
    The offset always has step +1 on each iteration, so it would just hit one of the two boundary anyway
 2018-04-02 17:34:54 +03:00
wwylele
f8a292f920 renderer_opengl: add PICA->GLSL shader decompiler 2018-04-02 17:34:54 +03:00
Daniel Lim Wee Soong
1e4eb7def8 arm/dyncom: Migrate logging macros 2018-04-02 16:01:19 +08:00
James Rowe
384849232b
Merge pull request #3516 from wwylele/shadow-sw 
SwRasterizer: Implement shadow mapping
 2018-03-31 23:29:22 -06:00
Merry
fff7227f86
Merge pull request #3579 from ccawley2011/architecture-defines 
common: Clean up architecture-specific defines
 2018-03-31 10:41:15 +01:00
Merry
587bc06adf
Merge pull request #3596 from lioncash/disk 
disk_archive: Minor miscellaneous cleanup
 2018-03-31 10:39:00 +01:00
Valentin Vanelslande
4fa1628fb6
movie: migrate logging macros 2018-03-31 00:24:21 -06:00
Lioncash
7d331a469f pica_to_gl: Use std::array where applicable 
Removes the need to use the ARRAY_SIZE macro
 2018-03-31 00:58:49 -04:00
Lioncash
0e7ca706dc disk_archive: Make DiskDirectory's constructor explicit 
Prevents implicit conversions/construction.
 2018-03-31 00:54:17 -04:00
Lioncash
07855c48d1 disk_archive: Remove unnecessary const in DiskDirectory's Read() declaration 
This only applies in the definition of the function, not the
declaration.
 2018-03-31 00:54:17 -04:00
Lioncash
ed64d15060 disk_archive: Remove unused total_entries_in_directory member from DiskDirectory 
Also converts initializer list assignments to in-class initializers
where relevant.
 2018-03-31 00:52:47 -04:00
BreadFish64
1d809ce6aa update-icons-signal 2018-03-30 10:20:21 -05:00
Tobias
bb6251f35f video_core: Remove Unreachable for invalid BlendEquation modes (#3595) 
* video_core: Remove Unreachable statement

* Lower log level to ERROR
 2018-03-29 17:53:55 -06:00
Merry
a567a92468
Merge pull request #3593 from daniellimws/loader-fmt 
core/loader: Migrate logging macros
 2018-03-29 14:45:25 +01:00
Adityarup Laha
180a05c301 sdl2_config: Add a parameter description for tilt clamp variable (#3590) 2018-03-29 10:20:26 +01:00
Weiyi Wang
697ff2f6e3
Merge pull request #3603 from lioncash/port 
citra-room: Fix always false case in main() related to port range
 2018-03-29 11:53:53 +03:00
Weiyi Wang
1c4b230346
Merge pull request #3604 from lioncash/ptr 
archive_systemsavedata: Remove pointer cast from GetSystemSaveDataPath()
 2018-03-29 11:52:36 +03:00
Weiyi Wang
82b9387315
Merge pull request #3605 from valentinvanelslande/am-popu64 
Service/AM: Use Pop<u64>() in DeleteUserProgram and DeleteProgram
 2018-03-29 09:47:56 +03:00
Weiyi Wang
690d92a019
Merge pull request #3601 from lioncash/null 
gl_rasterizer: Fix incorrect comparison against src_surface in AccelerateTextureCopy()
 2018-03-29 09:44:10 +03:00
Weiyi Wang
da91fb41db
Merge pull request #3597 from lioncash/lzss 
ncch_container: Get rid of pointer casts in LZSS_GetDecompressedSize() and LZSS_Decompress()
 2018-03-29 09:42:25 +03:00
Weiyi Wang
feb4eca2ff
Merge pull request #3598 from lioncash/boss 
boss: Correct ReceiveProperty()'s response data payload
 2018-03-29 09:38:33 +03:00
Weiyi Wang
115fd1cbf0
Merge pull request #3599 from lioncash/err 
err_f: Add missing break in ThrowFatalError()
 2018-03-29 09:38:19 +03:00
Valentin Vanelslande
528d8a6ccb
CiTrace: Migrate logging macros 2018-03-28 20:48:59 -06:00
Valentin Vanelslande
492fca114d
Service/AM: Use Pop<u64>() in DeleteUserProgram and DeleteProgram 2018-03-28 20:28:18 -06:00
Lioncash
26b1aec3c1 archive_systemsavedata: Remove pointer cast from GetSystemSaveDataPath() 
These kinds of casts invoke undefined behavior due to alignment rules.

Use memcpy instead which always does the right thing.
 2018-03-28 22:17:26 -04:00
Lioncash
8366f6cb5e citra-room: Fix always false case in main() related to port range 
If the variable we're checking is a u16, then there can never be values
outside of the 0-65535 range. This is bad because an arbitrary larger
value can be truncated down into a valid value, making an otherwise
malformed argument well-formed.

Change it to use u32 to allow the check to function properly.
 2018-03-28 21:53:05 -04:00
Lioncash
38b9d1780f verify_login: Make VerifyLogin exceptionless 
This function can be simplified by attempting to find the username
within the JSON object and then only accessing it if it does. There's no
need to blindly access the data itself.

This also eliminates the need to copy the string to a local as well,
since we already have the element itself, we can just compare against
it. For the failure case, it's the same if we were checking that the
provided username string is empty.
 2018-03-28 21:34:21 -04:00
Lioncash
27a3d44b16 gl_rasterizer: Fix incorrect comparison against src_surface in AccelerateTextureCopy() 
This should actually be comparing the validity of the destination
surface.
 2018-03-28 21:13:57 -04:00
Valentin Vanelslande
542b11ccdc
Change line 203 2018-03-28 19:05:54 -06:00
Lioncash
5ec576ff78 err_f: Add missing break in ThrowFatalError() 
Introduced by 691f069743

If we hit a prefetch abort, the DFSR and DFAR contents aren't really going to be
that useful.
 2018-03-28 20:33:25 -04:00
Lioncash
31100c582a boss: Correct ReceiveProperty()'s response data payload 
This was previously overwriting data in the same index.
 2018-03-28 20:26:33 -04:00
Lioncash
3af976e41e ncch_container: Get rid of pointer casts in LZSS_GetDecompressedSize() and LZSS_Decompress() 
These kinds of casts invoke undefined behavior, due to both the aliasing
rule, and from an alignment point-of-view. Use the way that's guaranteed
to always work instead.
 2018-03-28 19:55:49 -04:00
Daniel Lim Wee Soong
fbfc1103fd core/loader: Migrate logging macros 
Replace logging to use NGLOG instead of LOG.
 2018-03-29 00:08:26 +08:00
Valentin Vanelslande
ca6642aa2a
[skip ci] 2018-03-28 08:45:39 -06:00
Daniel Lim Wee Soong
98760336be video_core/shader/shader: Remove include cinttypes 2018-03-28 22:40:16 +08:00
Daniel Lim Wee Soong
730f8a4103 Fix formatting mistakes 2018-03-28 22:28:55 +08:00
Valentin Vanelslande
a53365d69e Fix clang 2018-03-27 18:17:04 -06:00
Valentin Vanelslande
f1e26fad7f
Fix build 2018-03-27 15:25:57 -06:00
Valentin Vanelslande
4a37d91bc6
change line 528 2018-03-27 14:23:31 -06:00
Valentin Vanelslande
e7ac03c941
Service/APT: Migrate logging macros 
Macro of line 528 not changed
 2018-03-27 14:03:00 -06:00
Daniel Lim Wee Soong
20776b37be Fix wrongly converted specifiers 
Sorry that was a lot in one go so some of them had some mistakes
 2018-03-27 23:37:36 +08:00
Daniel Lim Wee Soong
0f4c9c9f47 file_util: Remove long long casting on buf.st_size in NGLOG statement 2018-03-27 23:31:08 +08:00