mctaylors/suyu
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity
4713 commits 22 branches 2 tags 310 MiB
Commit graph

3913 commits

Author SHA1 Message Date
wwylele
7cd6cc0fd9 file_util: lower logging level for harmless cases 2017-03-08 17:42:10 +02:00
wwylele
6551a72ec8 loader/ncch: less verbose log for loading game list. only log program ID when booting 2017-03-08 17:37:24 +02:00
wwylele
4b931bb913 loader: lower file name logging level 2017-03-08 17:25:09 +02:00
wwylele
b5faa68120 qt/config_input: don't connect for null button 2017-03-02 13:29:28 +02:00
wwylele
5a692ddaec citra: update default ini with new input system 2017-03-01 23:30:57 +02:00
wwylele
e02c4b7195 Input: remove unused stuff & clean up 
1. removed zl, zr and c-stick from HID::PadState. They are handled by IR, not HID
2. removed button handling in EmuWindow
3. removed key_map
4. cleanup #include
 2017-03-01 23:30:57 +02:00
wwylele
e7a602fe16 Qt: rework input configuration for new input system 2017-03-01 23:30:57 +02:00
wwylele
51b1c1f211 InputCommon: add SDL joystick support 2017-03-01 23:30:57 +02:00
wwylele
a6bd7917cb InputCommon: add AnalogFromButton 2017-03-01 23:30:57 +02:00
wwylele
38e800f70d InputCommon: add Keyboard 2017-03-01 23:30:57 +02:00
wwylele
70420272ca HID: use AnalogDevice 2017-03-01 23:30:57 +02:00
wwylele
1d1329af23 HID: use ButtonDevice 2017-03-01 23:30:57 +02:00
wwylele
3974895e08 Input: add device and factory template 2017-03-01 23:30:57 +02:00
wwylele
8a8c0f348b Common: add ParamPackage 2017-03-01 23:30:57 +02:00
wwylele
85ba60d5ec Timer: restore missing signaled=true from #2421 2017-02-27 22:49:46 +02:00
bunnei
5e334af369 Merge pull request #2594 from wwylele/ir-separate 
IR: separate functions of each port to their own files
 2017-02-27 14:25:50 -05:00
B3n30
dcf115778a Fix log entry in timer::signal (#2600) 2017-02-27 11:04:03 -05:00
Mat M
0cb52ee74a Doxygen: Amend minor issues (#2593) 
Corrects a few issues with regards to Doxygen documentation, for example:

- Incorrect parameter referencing.
- Missing @param tags.
- Typos in @param tags.

and a few minor other issues.
 2017-02-26 17:58:51 -08:00
Yuri Kunde Schlesner
b250ce21b9 Merge pull request #2587 from yuriks/status-bar 
Replace built-in Profiler with indicators in status bar
 2017-02-26 17:51:15 -08:00
Yuri Kunde Schlesner
174464a87f PerfStats: Re-order and document members better 2017-02-26 17:22:04 -08:00
Yuri Kunde Schlesner
1469b3212b Qt: Tweak status bar styling 2017-02-26 17:22:04 -08:00
Yuri Kunde Schlesner
915d69ac4c Qt: Increase status bar update interval to 2 seconds 2017-02-26 17:22:04 -08:00
Yuri Kunde Schlesner
fb1979d7e2 Core: Re-write frame limiter 
Now based on std::chrono, and also works in terms of emulated time
instead of frames, so we can in the future frame-limit even when the
display is disabled, etc.

The frame limiter can also be enabled along with v-sync now, which
should be useful for those with displays running at more than 60 Hz.
 2017-02-26 17:22:04 -08:00
Yuri Kunde Schlesner
b285c2a4ed Core: Make PerfStats internally locked 
More ergonomic to use and will be required for upcoming changes.
 2017-02-26 17:22:03 -08:00
Yuri Kunde Schlesner
f273959205 Qt: Add tooltips to status bar displays 2017-02-26 17:22:03 -08:00
Yuri Kunde Schlesner
008c709dbf Qt: Don't show fractional figures in the status bar 
They're not very important and this makes the display changes less
often, making it less distracting.
 2017-02-26 17:22:03 -08:00
Yuri Kunde Schlesner
3b4e400333 Remove built-in (non-Microprofile) profiler 2017-02-26 17:22:03 -08:00
Yuri Kunde Schlesner
92c8bd4b1f PerfStats: Add method to get the instantaneous time ratio 2017-02-26 17:22:03 -08:00
Yuri Kunde Schlesner
c75ae6c585 Add performance statistics to status bar 2017-02-26 17:22:03 -08:00
Yuri Kunde Schlesner
21f4f49c7a SynchronizedWrapper: Add Lock convenience method 2017-02-26 17:22:02 -08:00
Yuri Kunde Schlesner
1b28b26682 Qt: Add (empty) status bar 2017-02-26 17:22:02 -08:00
Yuri Kunde Schlesner
441f8b5a4b Core: Remove unnecessary include in thread.h 2017-02-26 17:22:01 -08:00
wwylele
2d6113de09 IR: separate functions of each port to their own files 2017-02-26 11:11:35 +02:00
bunnei
892888ed9e Merge pull request #2569 from wwylele/wrap-unwrap 
APT: implemented Wrap and Unwrap
 2017-02-25 00:12:33 -05:00
Yuri Kunde Schlesner
fb5301cf6e Merge pull request #2421 from Subv/timers 
Timers: Immediately signal the timer if it was started with an initial value of 0
 2017-02-24 20:48:31 -08:00
James Rowe
26823cd38b Use QFileSystemWatcher to reload the game list when a change is detected. (#2555) 
* Added a refresh game directory option to the file menu

* Make the game list watcher recursive and have it start watching from the initial load

* Rework game list watcher to be thread safe

* Fix code style issues
 2017-02-23 16:29:00 -05:00
bunnei
4dee08b343 Merge pull request #2441 from jroweboy/titlebar 
Gui: Change title bar to include build name
 2017-02-23 16:24:48 -05:00
SonofUgly
e0a4450bbd Add custom layout settings. 2017-02-23 10:49:56 -08:00
James Rowe
b090422991 Gui: Change title bar to include build name 
Nightly builds now have "Citra Nightly" in the titlebar
Bleeding edge builds now have "Citra Bleeding Edge" in the titlebar
 2017-02-23 00:42:55 -07:00
Anthony
a7360f2642 [UI] Modify recursive scanning label (#2589) 2017-02-22 21:45:03 -08:00
Subv
0be77c3ae4 Timers: Return an error when calling SetTimer with negative timeouts. 2017-02-21 20:51:56 -05:00
Subv
029a11030e Timers: Immediately signal the timer if it was started with an initial value of 0. 2017-02-21 20:51:54 -05:00
wwylele
d5b0e275e3 APT: implement Wrap and Unwrap 2017-02-21 23:57:31 +02:00
wwylele
ea1ea0224c HW: add AES engine & implement AES-CCM 2017-02-21 23:57:31 +02:00
bunnei
bb448ae66f Merge pull request #2585 from MerryMage/sxtb16-sxtab16 
dyncom: Correct SXTAB16 and SXTB16
 2017-02-19 22:45:46 -05:00
Yuri Kunde Schlesner
7628f3a6fc Merge pull request #2580 from yuriks/qt-cleanup2 
Qt cleanups 2
 2017-02-19 12:13:52 -08:00
MerryMage
b125388152 dyncom: Correct SXTAB16 and SXTB16 2017-02-18 20:04:54 +00:00
Jannik Vogel
e594e63bb5 OpenGL: Check if uniform block exists before updating it (#2581) 2017-02-18 11:46:26 -08:00
Yuri Kunde Schlesner
80762583c2 Qt: Move some connections from .ui file to code 2017-02-18 02:30:29 -08:00
Yuri Kunde Schlesner
5b96915c69 Qt: Reorganize connection of menu events 2017-02-18 02:26:57 -08:00
Yuri Kunde Schlesner
4cb1f36896 Qt: Re-organize setup of debugging widgets 2017-02-18 02:16:24 -08:00
Yuri Kunde Schlesner
e823c908ea Qt: Fix action name to match conventions 2017-02-18 01:11:57 -08:00
Yuri Kunde Schlesner
cef18c94e2 Qt: Make IsSingleFileDropEvent static 2017-02-17 21:44:00 -08:00
Yuri Kunde Schlesner
c81a2aabbf Qt: Allow any file extension in Open dialog 2017-02-17 21:44:00 -08:00
Yuri Kunde Schlesner
c7c0219f8a Qt: Remove orpahned function declaration 2017-02-17 21:44:00 -08:00
Yuri Kunde Schlesner
5f00fe905c Qt: Remove unnecessary std::string usage 2017-02-17 21:44:00 -08:00
Weiyi Wang
c7c1f56ce6 HID: move enable_accelerometer/gyroscope_count initialization into Init() (#2574) 
Fixes #2556
 2017-02-16 22:04:27 -08:00
noah the goodra
6bcd5ce047 added drag n drop feature 2017-02-16 14:43:18 -06:00
Mat M
5472528202 Merge pull request #2571 from wwylele/missing-file 
core: add missing errors.h in CMakeLists.txt
 2017-02-15 11:19:06 -05:00
wwylele
e4da1a54cf core: add missing errors.h in CMakeLists.txt 2017-02-15 15:49:07 +02:00
Weiyi Wang
e085e6a768 video_core: remove #pragma once in cpp file (#2570) 2017-02-15 00:16:50 -08:00
Weiyi Wang
fae1efaad4 Merge pull request #2566 from yuriks/file-extension-suffix 
Qt/GameList: Use suffix() to parse the file extension
 2017-02-14 09:04:59 +02:00
Yuri Kunde Schlesner
070daf4126 HLE/IPC: Fix uninitialized variables in helpers (#2568) 
Fixes #2567
 2017-02-13 21:41:59 -08:00
Yuri Kunde Schlesner
f75e964d49 Qt/GameList: Use suffix() to parse the file extension 
completeSuffix returns everything after the first period, which means
that a file such as `foo.bar.3ds` would not get recognized.
 2017-02-13 19:03:59 -08:00
noah the goodra
091dd226d6 applied the change suggested by @wwylele 2017-02-13 18:34:02 -06:00
noah the goodra
ded09dc727 NWM changed to NIM 2017-02-13 18:34:01 -06:00
noah the goodra
ad49cec194 turned clang format back on 2017-02-13 18:34:01 -06:00
noah the goodra
1a84bce0f4 added http service enum to the log.h file 2017-02-13 18:34:01 -06:00
Yuri Kunde Schlesner
1bf449d752 Merge pull request #2562 from yuriks/pica-refactor3 
Re-organize software rasterizer code
 2017-02-13 12:04:17 -08:00
Weiyi Wang
dbc94efdb5 Core: add cryptopp library (#2412) 2017-02-13 12:03:55 -08:00
Yuri Kunde Schlesner
d60767d393 Merge pull request #2561 from wwylele/fs-rom 
file_sys: change RomFS archive to Self NCCH archive
 2017-02-13 09:18:23 -08:00
wwylele
20544977da loader: use self NCCH archive 2017-02-13 13:57:38 +02:00
wwylele
a0df747325 file_sys: add Self NCCH archive 2017-02-13 13:57:38 +02:00
Yuri Kunde Schlesner
426fda1d52 SWRasterizer: Move more framebuffer functions to file 2017-02-12 18:13:04 -08:00
Yuri Kunde Schlesner
1683cb0ec9 SWRasterizer: Move texturing functions to their own file 2017-02-12 18:12:37 -08:00
Yuri Kunde Schlesner
f9026e8a7a SWRasterizer: Convert large no-capture lambdas to standalone functions 2017-02-12 18:11:05 -08:00
Yuri Kunde Schlesner
e1ad7d69b9 SWRasterizer: Move framebuffer operation functions to their own file 2017-02-12 18:11:03 -08:00
Yuri Kunde Schlesner
e24717bca0 VideoCore: Move software rasterizer files to sub-directory 2017-02-12 18:08:11 -08:00
Yuri Kunde Schlesner
e10b11a5d0 video_core/shader: Document sanitized MUL operation 2017-02-12 13:29:14 -08:00
Yuri Kunde Schlesner
443bb3d522 Merge pull request #2550 from yuriks/pica-refactor2 
Small VideoCore cleanups
 2017-02-12 12:33:26 -08:00
Kloen Lansfiel
30ff675f02 citra-qt: Don't attempt to scan files with unsupported extensions (#2402) 2017-02-12 12:28:56 -08:00
Yuri Kunde Schlesner
da6a40e3d1 core: Free AppLoader on shutdown to release file (#2558) 
Fixes #2455
 2017-02-11 03:29:46 -08:00
Weiyi Wang
0dd007e9ba hid: remove the touch field from PadState (#2557) 2017-02-11 01:11:42 -08:00
Yuri Kunde Schlesner
e2fa1ca5e1 video_core: Fix benign out-of-bounds indexing of array (#2553) 
The resulting pointer wasn't written to unless the index was verified as
valid, but that's still UB and triggered debug checks in MSVC.

Reported by garrettboast on IRC
 2017-02-10 20:51:09 -08:00
Yuri Kunde Schlesner
553e672777 VideoCore: Split u64 Pica reg unions into 2 separate u32 unions 
This eliminates UB when aliasing it with the array of u32 regs, and
is compatible with non-LE architectures.
 2017-02-09 00:04:25 -08:00
Yuri Kunde Schlesner
bfb1531352 VideoCore: Force enum sizes to u32 in LightingRegs 
All enums that are used with BitField must have their type forced to u32
to ensure correctness.
 2017-02-09 00:04:24 -08:00
Yuri Kunde Schlesner
af65e1c0a0 OpenGL: Remove unused duplicate of IsPassThroughTevStage 
This copy was left behind when the shader generation code was moved to a
separate file.
 2017-02-09 00:04:24 -08:00
Yuri Kunde Schlesner
60fc0b086f VideoCore: Split regs.h inclusions 2017-02-09 00:04:24 -08:00
Yuri Kunde Schlesner
f241bb72f5 Pica/Regs: Use binary search to look up reg names 
This gets rid of the static unordered_map. Also changes the return type
const char*, avoiding unnecessary allocations (the result was only used
by calling .c_str() on it.)
 2017-02-09 00:04:24 -08:00
Yuri Kunde Schlesner
602f57da38 VideoCore: Use union to index into Regs struct 
Also remove some unused members.
 2017-02-08 22:13:25 -08:00
Yuri Kunde Schlesner
2889372e47 Merge pull request #2482 from yuriks/pica-refactor 
Split up monolithic Regs struct
 2017-02-08 22:07:34 -08:00
Lectem
f146a6d45a Use std::array<u8,2> instead of u8[2] to fix MSVC build 2017-02-05 14:55:51 +01:00
Weiyi Wang
a1393dc70c Merge pull request #2027 from Lectem/ipcrefactor 
IPC helper
 2017-02-05 10:22:13 +02:00
Lectem
2ee472b9c7 fix wwylele's comment and use typename in templates 2017-02-05 00:29:07 +01:00
Yuri Kunde Schlesner
5759d94b5c VideoCore: Move Regs to its own file 2017-02-04 13:59:12 -08:00
Yuri Kunde Schlesner
f7c7f422c6 VideoCore: Split shader regs from Regs struct 2017-02-04 13:59:11 -08:00
Yuri Kunde Schlesner
8fca90b5d5 VideoCore: Split geometry pipeline regs from Regs struct 2017-02-04 13:59:11 -08:00
Yuri Kunde Schlesner
f443c7e5b0 VideoCore: Split lighting regs from Regs struct 2017-02-04 13:59:11 -08:00
Yuri Kunde Schlesner
23713d5dee VideoCore: Split framebuffer regs from Regs struct 2017-02-04 13:59:11 -08:00
Yuri Kunde Schlesner
9017093f58 VideoCore: Split texturing regs from Regs struct 2017-02-04 13:59:09 -08:00
Yuri Kunde Schlesner
000e78144c VideoCore: Split rasterizer regs from Regs struct 2017-02-04 13:08:47 -08:00
Yuri Kunde Schlesner
97e06b0a0d Merge pull request #2476 from yuriks/shader-refactor3 
Oh No! More shader changes!
 2017-02-04 13:02:48 -08:00
Yuri Kunde Schlesner
c74787a11c Pica/Texture: Move part of ETC1 decoding to new file and cleanups 2017-02-04 12:33:28 -08:00
Yuri Kunde Schlesner
09a750e866 Pica/Texture: Simplify/cleanup texture tile addressing 2017-02-04 12:33:25 -08:00
Yuri Kunde Schlesner
a1c9ac7845 VideoCore: Move LookupTexture out of debug_utils.h 2017-02-04 12:31:40 -08:00
Yuri Kunde Schlesner
9590c932ec Merge pull request #2496 from mailwl/cfg-mem 
Core: update Kernel Config Memory to latest version (11.2)
 2017-02-03 21:17:48 -08:00
Yuri Kunde Schlesner
ba7cdce46d Merge pull request #2520 from wwylele/shader-stack-boundary 
ShaderJIT: add 16 dummy bytes at the bottom of the stack
 2017-02-03 18:56:42 -08:00
Yuri Kunde Schlesner
a630fa287e Merge pull request #2518 from MerryMage/coproc 
arm_dynarmic: Coprocessor support
 2017-02-03 18:22:28 -08:00
bunnei
632562f5cf Merge pull request #2509 from jfmherokiller/settingscastpatch 
removed the possibly uneeded cast on values.gdbstub_port
 2017-02-03 14:57:44 -05:00
bunnei
c330dcd3fd Merge pull request #2507 from jfmherokiller/keyidchange 
removal of the -1 case in the configure_input switch
 2017-02-03 14:56:55 -05:00
MerryMage
e2815408fd arm_dynarmic: Update memory interface 2017-02-03 17:32:51 +00:00
MerryMage
2b36d4c9d7 arm_dynarmic: CP15 support 2017-02-03 17:32:47 +00:00
wwylele
6dc1d6e568 ShaderJIT: add 16 dummy bytes at the bottom of the stack 2017-02-03 14:53:38 +02:00
mailwl
a53714acd3 GSP_GPU::StoreDataCache stubbed (#2428) 2017-02-02 23:07:44 -08:00
noah the goodra
a0874d9b64 removed the possibly uneeded cast on values.gdbstub_port 
as far as i could tell this cast is unneeded because [GDBStub::SetServerPort](https://github.com/citra-emu/citra/blob/master/src/core/gdbstub/gdbstub.cpp#L897) takes a u16 and [values.gdbstub_port](https://github.com/citra-emu/citra/blob/master/src/core/settings.h#L116) is already a u16
 2017-01-31 11:44:23 -06:00
noah the goodra
6c41d87a9d removal of the -1 case in the configure_input switch 
this case is unneeded because no enumeration value can possibly correspond to it
 2017-01-31 09:55:56 -06:00
mailwl
d0bf7df5ba HLE/Applets: Stub Mint (eShop) Applet (#2463) 
This allows Phoenix Wright - Dual Destinies to boot.
 2017-01-31 01:16:58 -08:00
Weiyi Wang
0b9c59ff22 Common/x64: remove legacy emitter and abi (#2504) 
These are not used any more since we moved shader JIT to xbyak.
 2017-01-31 01:06:42 -08:00
Merry
f7e96dc068 shader_jit_x64_compiler: esi and edi should be persistent (#2500) 2017-01-31 00:38:31 -08:00
noah the goodra
a2d0e2d807 file_util: Fixed implicit type conversion warning (#2503) 2017-01-30 20:08:00 -08:00
mailwl
0b0c5672c8 Core: update Kernel Config Memory to latest version (11.2) 2017-01-30 11:29:00 +03:00
Jake Merdich
ff28080091 Support looping HLE audio (#2422) 
* Support looping HLE audio
* DSP: Fix dirty bit clears, handle nonmonotonically incrementing IDs
* DSP: Add start offset support
 2017-01-29 23:52:25 -08:00
Yuri Kunde Schlesner
1410aa1824 Merge pull request #2368 from wwylele/camera-2 
CAM: build the service framework with a dummy implementation
 2017-01-29 22:16:39 -08:00
Yuri Kunde Schlesner
a925473995 Merge pull request #2429 from wwylele/auto-language-fix 
CFG: move language override to the boot process
 2017-01-29 22:14:35 -08:00
Yuri Kunde Schlesner
37a4ea046d VideoCore: Make PrimitiveAssembler const-correct 2017-01-29 21:31:38 -08:00
Yuri Kunde Schlesner
dcdffabfe6 VideoCore: Extract swrast-specific data from OutputVertex 2017-01-29 21:31:38 -08:00
Yuri Kunde Schlesner
8ed9f9d49f VideoCore/Shader: Clean up OutputVertex::FromAttributeBuffer 
This also fixes a long-standing but neverthless harmless memory
corruption bug, whech the padding of the OutputVertex struct would get
corrupted by unused attributes.
 2017-01-29 21:31:38 -08:00
Yuri Kunde Schlesner
d36ec905b1 Common: Optimize BitSet iterator 2017-01-29 21:31:38 -08:00
Yuri Kunde Schlesner
92bf5c88e6 VideoCore: Split shader output writing from semantic loading 2017-01-29 21:31:37 -08:00
Yuri Kunde Schlesner
335df895b9 VideoCore: Consistently use shader configuration to load attributes 2017-01-29 21:31:37 -08:00
Yuri Kunde Schlesner
fccb28d2e9 VideoCore: Use correct register for immediate mode attribute count 2017-01-29 21:31:36 -08:00
Yuri Kunde Schlesner
ab6954e942 VideoCore: Rename some types to more accurate names 2017-01-29 21:31:36 -08:00
Yuri Kunde Schlesner
bbc7844021 VideoCore: Change misleading register names 
A few registers had names such as "count" or "number" when they actually
contained the maximum (that is, count - 1). This can easily lead to hard
to notice off by one errors.
 2017-01-29 21:31:36 -08:00
Kloen
eee37b857b video_core: gl_rasterizer_cache.cpp removed unused type alias 2017-01-30 05:18:28 +01:00
Kloen
6a3a3964b0 video_core: gl_rasterizer.cpp removed unused type alias 2017-01-30 05:16:48 +01:00
Yuri Kunde Schlesner
5bb6753f2e Merge pull request #2494 from Kloen/killing-warnings-2-final-mix 
core: inline CPU, 132 warnings fixed on GCC
 2017-01-29 15:40:50 -08:00
Yuri Kunde Schlesner
f111cd66ce Merge pull request #2492 from Kloen/killing-warnings-HD1.5ReMIX 
Fix OSX build warnings about unhandled enumeration values.
 2017-01-29 15:38:49 -08:00
Yuri Kunde Schlesner
1016e31fc7 Merge pull request #2493 from Kloen/killing-warnings-final-mix 
video_core: silence unused-local-typedef boost related warnings on GCC
 2017-01-29 15:35:59 -08:00
Kloen
b3a0b1489b core: inline CPU, 132 warnings fixed on GCC 2017-01-30 00:12:07 +01:00
Kloen
28da285031 citra: add missing control paths for ResultStatus on rom load. Fix warning about unhandled enumeration values on OSX 2017-01-29 22:02:01 +01:00
Kloen
2ca3beb9d3 core: fix err_f.cpp warning about unhandled enumeration value on OSX 2017-01-29 22:01:19 +01:00
Kloen
f352a741d3 core: fix savedata_archive.cpp warnings about unhandled enumeration values on OSX 2017-01-29 21:50:25 +01:00
Kloen
c4f9cd3559 core: fix archive_sdmc.cpp warnings about unhandled enumeration value on OSX 2017-01-29 21:49:36 +01:00
Kloen
f14a53abd0 core: fix archive_extsavedata.cpp warning on OSX 2017-01-29 21:48:40 +01:00
Kloen
4652d70572 video_core: silence unused-local-typedef boost related warning on GCC 2017-01-29 21:24:24 +01:00
Kloen
ff7d68d743 core: emu_window.cpp, fix conversion warnings from float to s16 on MSVC 2017-01-29 16:39:31 +01:00
Kloen
818b1730a9 common: add <cstddef> to hash.h 2017-01-28 15:30:18 +01:00
Kloen
2fa0971ceb 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
noah the goodra
3545b144f1 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
bf14f4be22 Merge pull request #2346 from yuriks/shader-refactor2 
More shader refactoring
 2017-01-27 14:29:10 -03:00