Commit graph

6193 commits

Author SHA1 Message Date
Weiyi Wang 2d372bae14
Merge pull request #3663 from jroweboy/quick-fix
Use the QT_TRANSLATE_NOOP macro
2018-04-17 20:23:23 +03:00
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
Mat M c250cbd5b3
Merge pull request #3660 from baka0815/translation
Don't translate function keys in Qt GUI
2018-04-16 08:12:29 -04:00
baka0815 4321ab44ea citra-qt: Don't translate function keys in InitializeHotkeys() 2018-04-16 12:37:13 +02:00
Weiyi Wang a2ab91fa31
Merge pull request #3463 from FearlessTobi/game-list-compat
citra-qt: Show Game Compatibility within Citra
2018-04-16 01:45:16 +03:00
FearlessTobi fbc05fac19 Show game compatibility within Citra 2018-04-16 00:42:58 +02:00
Weiyi Wang 17e14d5615
Merge pull request #3649 from liushuyu/ci-cache
travis: use ccache to speed up build
2018-04-15 14:24:10 +03: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
liushuyu 0d3983bc66
travis: use mkdir -p to avoid || true 2018-04-13 20:30:04 -06:00
liushuyu 2193e9b742
travis: use cmake flags and whitespace cleanup 2018-04-13 19:10:37 -06:00
liushuyu 16981d6be4 travis: use cache 2018-04-13 19:10:20 -06: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
Weiyi Wang 7f408eefa3
Merge pull request #3655 from lioncash/fwd-decl
cam: Correct forward declaration type for Core::EventType
2018-04-13 10:19:28 +03: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
N00byKing f29f4ccdc9 gsp_gpu, shared_page: Change 3D LED State on SetLedForceOff 2018-04-12 16:44:29 +02: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
Merry 8b858f1bf7
Merge pull request #3647 from liushuyu/master
travis: fix Transifex upload
2018-04-11 10:43:29 +01:00
liushuyu d190fd989d
travis: suggestions from @jroweboy 2018-04-10 17:49:42 -06:00
liushuyu 9921286f3b
travis: fix Transifex upload 2018-04-10 15:35:47 -06:00
Weiyi Wang 575099fcfa
Merge pull request #3618 from wwylele/shadow-new-1
gl_rasterizer/lighting: implement shadow attenuation
2018-04-10 22:06:23 +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
Mat M bdf7b46fbb
Merge pull request #3641 from valentinvanelslande/default_ini
default_ini: remove space in custom_layout
2018-04-09 02:00:20 -04: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
Weiyi Wang 223dfd6cb2
Merge pull request #3629 from jroweboy/update-fmtlib
Update fmtlib to fix msvc warnings
2018-04-06 12:37:27 +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