Commit Graph

189 Commits

Author SHA1 Message Date
Peter Sauerbrei
105a0d4a73 fix for assert when bringing up the iOS project settings
UE-22000

[CL 2728941 by Peter Sauerbrei in Main branch]
2015-10-14 17:29:16 -04:00
Peter Sauerbrei
90d9a81fdf Merging missed file from 4.10
[CL 2714834 by Peter Sauerbrei in Main branch]
2015-10-02 14:24:49 -04:00
Peter Sauerbrei
80b99fb67f Merging mobile provision selection from 4.10
[CL 2714831 by Peter Sauerbrei in Main branch]
2015-10-02 14:24:38 -04:00
Allan Bentham
25c10bf77d UEMOB-36
Add material shader quality settings.
Enables quality overrides for android and ios (ES2 flavours)

#codereview jack.porter

[CL 2705914 by Allan Bentham in Main branch]
2015-09-25 04:55:45 -04:00
Jack Porter
ea84e81529 Rename shader platform SP_OPENGL_ES2 to SP_OPENGL_ES2_ANDROID
[CL 2705741 by Jack Porter in Main branch]
2015-09-24 23:37:30 -04:00
Peter Sauerbrei
1c13d7d910 Addition of mobile provision selection
no error messaging as of yet when selecting something which then expires

[CL 2697295 by Peter Sauerbrei in Main branch]
2015-09-18 13:42:25 -04:00
Mark Satterthwaite
8dedbc3a9c Merging MetalRHI & MetalShaderFormat changes from ZebraBranch, plus the code to enable or disable Mac support.
[CL 2697221 by Mark Satterthwaite in Main branch]
2015-09-18 12:45:20 -04:00
Nick Darnell
065a160032 Tweaking some stuff in the iOS project settings for localization and filtering support.
#codereview Peter.Sauerbrei

[CL 2694185 by Nick Darnell in Main branch]
2015-09-16 17:01:36 -04:00
Richard Hinckley
6ceaa5aba7 Cleaning out programmer-only comments that were harvested by Doxygen.
#platformnotify Josh.Adams

[CL 2690143 by Richard Hinckley in Main branch]
2015-09-14 09:25:39 -04:00
Peter Sauerbrei
99693ee306 re-enable offline shader compiling for Metal on Mac
[CL 2686754 by Peter Sauerbrei in Main branch]
2015-09-10 14:42:26 -04:00
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
Peter Sauerbrei
0ad0789bfb UE-17831 - fixed issue with non-existent dSYM files being added to the receipt
Also fixed name issue with the ini file
#ios
#codereview ben.marsh

[CL 2643624 by Peter Sauerbrei in Main branch]
2015-08-04 13:08:35 -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
630f75b6fe UE4 - Fix Metal matrix constructor
#codereview Michael.Trepka, Mark.Satterthwaite

[CL 2626231 by Rolando Caloca in Main branch]
2015-07-20 14:26:26 -04:00
Rolando Caloca
9ca4c975c4 UE4 - hlslcc - Fix Metal promotion
#codereview Dmitry.Rekman

[CL 2613871 by Rolando Caloca in Main branch]
2015-07-08 14:29:53 -04:00
Rolando Caloca
5524040911 UE4 - Fix Metal
[CL 2609490 by Rolando Caloca in Main branch]
2015-07-02 14:43:11 -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
Marc Audy
f82bafc086 Remove extra ,
[CL 2600499 by Marc Audy in Main branch]
2015-06-25 10:08:37 -04:00
Marc Audy
009a3f0c47 Buildwathcher - Fix initialization order
#codereview Roloando.Caloca

[CL 2600476 by Marc Audy in Main branch]
2015-06-25 09:56:54 -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