Commit Graph

38 Commits

Author SHA1 Message Date
Mark Satterthwaite
977542aeaa Merging general rendering & shader changes necessary to support desktop Metal.
reviewedby michael.trepka, rolando.caloca, lee.clark

[CL 2670859 by Mark Satterthwaite in Main branch]
2015-08-27 10:11:22 -04:00
Rolando Caloca
42b256cb79 UE4 - Fix env var; added COMPILER_HLSLCC to shaders
[CL 2658309 by Rolando Caloca in Main branch]
2015-08-17 16:09:30 -04:00
Rolando Caloca
0b5c4df5dc UE4 - hlslcc - Fixes for command lines; always pack uniforms; fix uninitialized variables
#codereview Dmitry.Rekman

[CL 2639009 by Rolando Caloca in Main branch]
2015-07-30 13:31:13 -04:00
Rolando Caloca
daef6ebed2 UE4 - hlslcc - Common header reader
[CL 2609224 by Rolando Caloca in Main branch]
2015-07-02 11:52:03 -04:00
Michael Trepka
d05a24a99c Fixed problems with compiling Metal shaders on pre-10.11 versions of OS X
#codereview Mark.Satterthwaite, Rolando.Caloca

[CL 2600915 by Michael Trepka in Main branch]
2015-06-25 13:58:55 -04:00
Max Preussner
1bc32c167e Metal: Fixed sprintf warning (for real this time)
#CodeReview: rolando.caloca

[CL 2599905 by Max Preussner in Main branch]
2015-06-24 21:05:09 -04:00
Max Preussner
4bb621efc3 Back out revision 31 from //depot/UE4/Engine/Source/Developer/iOS/MetalShaderFormat/Private/MetalShaderCompiler.cpp
[CL 2599883 by Max Preussner in Main branch]
2015-06-24 20:47:57 -04:00
Max Preussner
7c223a2c8b Metal: Fixed sprintf warning
#CodeReview: rolando.caloca

[CL 2599851 by Max Preussner in Main branch]
2015-06-24 19:43:37 -04:00
Rolando Caloca
215d4c8c16 UE4 - Metal integration from Zebra
- Shader changes/fix-ups, support for MRT & SM5 on the shader code gen backend
#codereview Mark.Satterthwaite, Michael.Trepka, Josh.Adams, Peter.Sauerbrei

[CL 2599662 by Rolando Caloca in Main branch]
2015-06-24 17:40:55 -04:00
Rolando Caloca
8b34bd48af UE4 - Fix Precision output for ES platforms
#codereview Dmitry.Rekman, Michael.Trepka, Chris.Babcock

[CL 2592355 by Rolando Caloca in Main branch]
2015-06-18 14:24:11 -04:00
Rolando Caloca
dc2ade0796 UE4 - hlslcc - Metal - Fix texture sampled with different samplers
[CL 2514987 by Rolando Caloca in Main branch]
2015-04-16 17:03:26 -04:00
Allan Bentham
64090df1f4 Ensure correct assignment of emulated (ES2) uniform buffer indices for UB's generated within BuildResourceTableMapping(). Typically arises when only sampler related parameters are encountered.
Fixes UE-9804 and probably more.

#codereview nick.penwarden, Rolando.Caloca

[CL 2482912 by Allan Bentham in Main branch]
2015-03-18 08:03:21 -04:00
Rolando Caloca
6868525794 UE4 - hlslcc - Cleanup parser state & change hlslcc entry point to be a class in prep for moving to the Engine (missing Linux libraries)
odereview Dmitry.Rekman

[CL 2471354 by Rolando Caloca in Main branch]
2015-03-06 13:09:36 -05:00
Saul Abreu
79a26091bf Fixed behavior on FString::ParseIntoArray (muliple delimiters overload) functionality to support optionally culling empty strings. Greatly simplified implementation logic. Output parameter now properly named and taken by reference.
#codereview Steve.Robb, Robert.Manuszewski

[CL 2466824 by Saul Abreu in Main branch]
2015-03-02 15:51:37 -05:00
Ben Marsh
149375b14b Update copyright notices to 2015.
[CL 2379638 by Ben Marsh in Main branch]
2014-12-07 19:09:38 -05:00
Josh Adams
d26ff98a24 - Moved ES31_PROFILE and SM4_PROFILE defines from Metal shader compiler into Common.usf (they should be removed from there as well, and not depend on them when METAL_*PROFILE is set)
#codereview rolando.caloca

[CL 2367583 by Josh Adams in Main branch]
2014-11-21 11:41:17 -05:00
Rolando Caloca
c874cc119a UE4 - hlslcc - Metal - NumThreads for compute shaders
[CL 2356214 by Rolando Caloca in Main branch]
2014-11-11 15:42:39 -05:00
Josh Adams
6937587675 - Added METAL_MRT shader format (part one of a multi-checkin for MetalMRT support), but it's not usable yet.
#codereview rolando.caloca,nick.penwarden

[CL 2324118 by Josh Adams in Main branch]
2014-10-09 11:27:07 -04:00
Rolando Caloca
1e13c6f58a UE4 - hlslcc - Rollback //depot/UE4/Engine/Source/ThirdParty/hlslcc to changelist 2316264
[CL 2319202 by Rolando Caloca in Main branch]
2014-10-03 20:02:42 -04:00
Rolando Caloca
88ff3983ea UE4 - Revert CCT
[CL 2313607 by Rolando Caloca in Main branch]
2014-09-29 18:57:21 -04:00
Rolando Caloca
941da65c63 hlslcc - Move hlslcc interface out of each shader format and into ShaderCompilerCommon module
- Delete hlslcc exe files (not needed anymore)

[CL 2312870 by Rolando Caloca in Main branch]
2014-09-29 10:10:28 -04:00
Rolando Caloca
e3fd63ec34 UE4 - Move glsl backend out of ThirdParty into ShaderFormatOpenGL
[CL 2310098 by Rolando Caloca in Main branch]
2014-09-25 14:27:21 -04:00
Rolando Caloca
95e0ed4435 UE4 - CCT now writes out source
[CL 2309773 by Rolando Caloca in Main branch]
2014-09-25 10:31:22 -04:00
Rolando Caloca
8f39508dd0 UE4 - hlslcc - Metal backend from ThirdParty to Engine module
[CL 2309668 by Rolando Caloca in Main branch]
2014-09-25 09:16:01 -04:00
Rolando Caloca
6c3d524f22 UE4 - Compile fix
[CL 2308431 by Rolando Caloca in Main branch]
2014-09-24 12:05:37 -04:00