Commit Graph
100 Commits
Author SHA1 Message Date
wwylele b611b2934f UDS: fix RecvBeaconBroadcastData response header 2018-06-02 00:38:54 +03:00
Weiyi WangandGitHub 08b119153d Merge pull request #3799 from wwylele/sigh
gl_rasterizer: reset texture state context after every draw
2018-06-01 14:24:28 +03:00
wwylele f0ee4c0595 gl_rasterizer: reset texture state context after every draw 2018-06-01 12:05:30 +03:00
Weiyi WangandGitHub 65f5bc73a0 Merge pull request #3789 from degasus/texture_bindings
gl_rasterizer: Don't flip the texture bindings.
2018-05-28 23:14:09 +03:00
wwylele 549abe556b Service/NDM: convert to ServiceFramework 2018-05-28 11:28:13 +03:00
Weiyi WangandGitHub 09982c3386 Merge pull request #3732 from ccawley2011/fix-arm
Fix compilation on ARM
2018-05-26 20:14:55 +03:00
Weiyi WangandGitHub 03209efe99 Merge pull request #3753 from spbennett/json_3.12
Upgrade JSON for Modern C++
2018-05-25 20:39:12 +03:00
Weiyi WangandGitHub cad00ea5fd Merge pull request #3755 from spbennett/xbyak-5.64
Xbyak 5.64
2018-05-25 20:38:52 +03:00
Weiyi WangandGitHub ba4a0525bf Merge pull request #3724 from degasus/scissor
gl_rasterizer: Remove redundant scissor state change.
2018-05-25 20:35:41 +03:00
Weiyi WangandGitHub 1c03ff14c5 Merge pull request #3777 from einstein95/patch-1
Fix build
2018-05-25 13:17:27 +03:00
Weiyi WangandGitHub 45aa95093c Merge pull request #3744 from liushuyu/master
travis: use cmake in official repository
2018-05-19 18:24:20 +03:00
Weiyi WangandGitHub 0c60e96533 Merge pull request #3758 from j-selby/fix-text-formatter
Add missing std::string import in text_formatter
2018-05-19 14:47:30 +03:00
wwylele 92a1252835 gl_shader_gen: rearrange function definition to avoid suprious warnings 2018-05-19 00:36:33 +03:00
wwylele 8b4e832c5f gl_rasterizer_cache: add missing watcher invalidation 2018-05-18 23:58:43 +03:00
wwylele 4377caf1df citra-qt: add tooltips for renderer options 2018-05-18 15:15:07 +03:00
wwylele 129b893509 gl_stream_buffer: update the information about the AMD hack 2018-05-18 14:08:12 +03:00
wwylele dd6252a676 gl_rasterizer: fallback to software shader path if buffer overflow happens on hardware shader path 2018-05-18 13:55:19 +03:00
wwylele 6985b13439 [HACK] AMD workaround 2018-05-14 10:17:36 +03:00
wwylele ede0d15fec video_core/command_processor: attempt accelerate draw in draw trigger 2018-05-14 10:17:36 +03:00
wwylele 9b448a0739 gl_rasterizer: implement AccelerateDrawBatch to emulate PICA shader on hardware 2018-05-14 10:17:36 +03:00
wwylele 06815ec905 video_core: receive hardware shader settings 2018-05-14 10:17:35 +03:00
wwylele f1cc8cfea9 citra,citra_qt: load/save hardware shader settings 2018-05-14 10:17:35 +03:00
wwylele 1d5a26b1d8 citra-qt: add gpu shader emulation related configurations 2018-05-13 10:58:20 +03:00
wwylele b31ed30fb2 settings: add hardware shader related settings 2018-05-13 10:57:55 +03:00
wwylele 97f9cfac70 settings: add hardware shader related settings 2018-05-13 10:44:47 +03:00
wwylele f64a4729f0 travis: fix dependency name for transifex job 2018-05-12 01:18:02 +03:00
wwylele 7f7ee048f3 travis: add missing dependency for transifex push job 2018-05-12 00:22:05 +03:00
Weiyi WangandGitHub 3bd1cd0b2b Merge pull request #3719 from wwylele/regs-pipeline-type
regs_pipeline: use proper unsigned type where applicable
2018-05-09 13:51:36 +03:00
wwylele 68b0a3e19e regs_pipeline: use proper unsigned type where applicable 2018-05-06 15:57:48 +03:00
Weiyi WangandGitHub f85e71c37c Merge pull request #3715 from wwylele/hardware-vertex-vector
gl_rasterizer: Use GLvec* instead of C arrays
2018-05-06 07:19:06 +03:00
Weiyi WangandGitHub 79ac4766b4 Merge pull request #3668 from daniellimws/gdbstub-macros
core/gdbstub: Migrate logging macros
2018-05-05 16:48:52 +03:00
Weiyi WangandGitHub 0da3b75c9e Merge pull request #3700 from wwylele/texcache-watcher
gl_rasterizer_cache: cache texture cube
2018-05-05 16:30:39 +03:00
Weiyi WangandGitHub 9c55a1f113 Merge pull request #3711 from degasus/vertex_streaming
gl_rasterizer: Use buffer_storage for uniform data.
2018-05-05 16:22:07 +03:00
wwylele 08a38370b0 video_core/command_processor: correctly handles 0xFFFF index as a normal index 2018-05-05 04:24:31 +03:00
Weiyi WangandGitHub be5777f3de Merge pull request #3686 from wwylele/glvtx-shader-gen
gl_shader_gen: generate programmable vs/gs and fixed gs
2018-05-01 21:27:48 +03:00
wwylele 1762ad2dcc gl_rasterizer_cache: cache texture cube 2018-05-01 21:26:43 +03:00
Weiyi WangandGitHub 9c65a45358 Merge pull request #3694 from jroweboy/quickfix
Fix duplicated logs on windows
2018-04-28 10:31:25 +03:00
Weiyi WangandGitHub bbf8567b49 Travis: only enable transifex job on main repo
To avoid false positive alarm from citra-nightly and citra-canary repo
2018-04-27 19:52:52 +03:00
Weiyi WangandGitHub b443eea540 Merge pull request #3689 from jroweboy/txfix
Frontend: Add missing translation for network error messages
2018-04-26 11:42:32 +03:00
wwylele 191b29e402 gl_shader_gen: generate programmable vs/gs and fixed gs 2018-04-24 20:39:10 +03:00
wwylele e56128683c gl_shader_decompiler: fallback to CPU shader on GS b15 access 2018-04-23 12:45:56 +03:00
Weiyi WangandGitHub 7d8b7d93fc Merge pull request #3683 from adityaruplaha/multiplayer-ui-wording-fix
multiplayer_ui: Replace "Hide Full Games" with "Hide Full Rooms"
2018-04-22 18:50:11 +03:00
Weiyi WangandGitHub c8d4ca8915 Merge pull request #3073 from jroweboy/multiplayer_pr
Citra-qt: Add multiplayer ui
2018-04-19 21:03:37 +03:00
Weiyi WangandGitHub 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 WangandGitHub 977abd2c7a Merge pull request #3607 from adityaruplaha/sdl2-fullscreen
SDL2: Implement fullscreen
2018-04-19 16:16:37 +03:00
Weiyi WangandGitHub 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
Weiyi WangandGitHub 2d372bae14 Merge pull request #3663 from jroweboy/quick-fix
Use the QT_TRANSLATE_NOOP macro
2018-04-17 20:23:23 +03: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 WangandGitHub 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
Weiyi WangandGitHub 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
Weiyi WangandGitHub 17e14d5615 Merge pull request #3649 from liushuyu/ci-cache
travis: use ccache to speed up build
2018-04-15 14:24:10 +03:00
Weiyi WangandGitHub 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
Weiyi WangandGitHub 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 WangandGitHub 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 WangandGitHub dfe9b4edf8 Merge pull request #3587 from valentinvanelslande/apt-fmt
Service/APT: Migrate logging macros
2018-04-12 22:47:44 +03:00
Weiyi WangandGitHub 6df2e3ccc9 Merge pull request #3614 from valentinvanelslande/movie-fmt
movie: migrate logging macros
2018-04-12 22:46:15 +03:00
Weiyi WangandGitHub 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 WangandGitHub 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
Weiyi WangandGitHub 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
wwylele 7e7de7d3ab gl_rasterizer_cache: exit FillTextureCube when address is invalid 2018-04-08 12:34:50 +03: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 WangandGitHub 972db17247 Merge pull request #3497 from wwylele/texture-cube-new
gl_rasterizer: implement TextureCube
2018-04-06 12:41:40 +03:00
Weiyi WangandGitHub a9544ca015 Merge pull request #3580 from daniellimws/common-fmt
common: Migrate logging macros
2018-04-06 12:38:08 +03:00
Weiyi WangandGitHub 223dfd6cb2 Merge pull request #3629 from jroweboy/update-fmtlib
Update fmtlib to fix msvc warnings
2018-04-06 12:37:27 +03:00
Weiyi WangandGitHub 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
Weiyi WangandGitHub 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 WangandGitHub acb02d300c Merge pull request #3518 from wwylele/hashable-struct
Common/Hash: abstract HashableStruct from GLShader::PicaShaderConfig
2018-04-05 14:39:12 +03:00
wwylele 0d84c5a0b6 gl_rasterizer: move state syncing from ctor to its own function 2018-04-04 17:23:55 +03:00
wwylele c2719feda2 gl_rasterizer: move shader uniform sync from SetShader() to ctor 2018-04-03 09:27:23 +03: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
Weiyi WangandGitHub a7d035d9ee Merge pull request #3609 from wwylele/update-libressl
externals: update libressl (gitignore artefacts)
2018-03-30 15:42:03 +03:00
wwylele fe58b5912a externals: update libressl (gitignore artefacts) 2018-03-30 14:23:52 +03:00
Weiyi WangandGitHub 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 WangandGitHub 1c4b230346 Merge pull request #3604 from lioncash/ptr
archive_systemsavedata: Remove pointer cast from GetSystemSaveDataPath()
2018-03-29 11:52:36 +03:00
Weiyi WangandGitHub 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 WangandGitHub 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 WangandGitHub 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 WangandGitHub feb4eca2ff Merge pull request #3598 from lioncash/boss
boss: Correct ReceiveProperty()'s response data payload
2018-03-29 09:38:33 +03:00
Weiyi WangandGitHub 115fd1cbf0 Merge pull request #3599 from lioncash/err
err_f: Add missing break in ThrowFatalError()
2018-03-29 09:38:19 +03:00
Weiyi WangandGitHub 2624b21500 Merge pull request #3606 from valentinvanelslande/citrace-fmt
CiTrace: Migrate logging macros
2018-03-29 09:34:30 +03:00
Weiyi WangandGitHub 4bdf2e1eb9 Merge pull request #3569 from daniellimws/audio-core-fmt
audio_core: Migrate logging macros
2018-03-27 13:55:24 +03:00
Weiyi WangandGitHub 0607bc36e3 Merge pull request #3574 from daniellimws/citra-qt-fmt
citra_qt: Migrate logging macros
2018-03-27 13:52:31 +03:00
Weiyi WangandGitHub 49c41593d9 Merge pull request #3577 from daniellimws/web-service-fmt
web_service: Migrate logging macros
2018-03-25 13:47:46 +03:00
Weiyi WangandGitHub 0ad63c73bf Merge pull request #3578 from daniellimws/input-common-fmt
input_common: Migrate logging macros
2018-03-25 13:46:54 +03:00
Weiyi WangandGitHub 327ad8bcce Merge pull request #3564 from lefta/build_system_fixes
Build fixes
2018-03-24 13:07:14 +03:00
Weiyi WangandGitHub d03f72eb56 Merge pull request #3535 from ccawley2011/emu_arch_bits
CMake: Set EMU_ARCH_BITS in CMakeLists.txt
2018-03-21 16:15:22 +02:00
Weiyi WangandGitHub 9e4f670ea9 Merge pull request #3484 from wwylele/highlight-fix
pica/lighting: compute highlight clamp after one-/two-sided diffuse pass
2018-03-18 23:41:27 +02:00
Weiyi WangandGitHub 42ed0254db Merge pull request #3528 from BreadFish64/auto-nvidia
use nvidia graphics automatically on laptops with optimus
2018-03-18 23:41:08 +02:00