Commit Graph

115 Commits

Author SHA1 Message Date
Rolando Caloca
bbb9564388 Copying //UE4/Dev-RenderPlat-Staging@11110326 to //UE4/Main
#rb none
#rnx

[CL 11110369 by Rolando Caloca in Main branch]
2020-01-24 18:07:01 -05:00
dmitriy dyomin
8e10c43b5c Fixed: SingleLayerWater material does not show ES3.1 platform stats
#ROBOMERGE-SOURCE: CL 10900806 via CL 10900959 via CL 10901001
#ROBOMERGE-BOT: (v626-10872990)

[CL 10901041 by dmitriy dyomin in Main branch]
2020-01-07 23:40:02 -05:00
ryan durand
471d972e62 Updating copyright for Engine Developer.
#rnx
#rb none


#ROBOMERGE-SOURCE: CL 10869240 via CL 10869516 via CL 10869902
#ROBOMERGE-BOT: (v613-10869866)

[CL 10870584 by ryan durand in Main branch]
2019-12-26 15:32:37 -05:00
Lukas Hermanns
82cd916c43 Integrated SPIRV-Cross fix of expression unpacking (see /github.com/KhronosGroup/SPIRV-Cross/issues/1172), and rebuild ShaderConductor for Mac and Win64.
#rb none
#jira UE-80725
#fyi Will.Damon, Matt.Collins
#rnx

[CL 9548063 by Lukas Hermanns in Main branch]
2019-10-11 10:44:55 -04:00
steve robb
14cab21e0c Deprecating ARRAY_COUNT and changing it to UE_ARRAY_COUNT.
Replicated from CL# 7924370.

#rb none


#ROBOMERGE-OWNER: steve.robb
#ROBOMERGE-AUTHOR: steve.robb
#ROBOMERGE-SOURCE: CL 9279060 via CL 9279063
#ROBOMERGE-BOT: (v443-9013191)

[CL 9279836 by steve robb in Main branch]
2019-09-28 08:19:35 -04:00
Lukas Hermanns
33e0ea2faf Merging CL 8910636 (Updated SPIRV-Cross) from //UE4/Dev-Rendering to Main (//UE4/Main)
#rb none
#rnx

[CL 8934359 by Lukas Hermanns in Main branch]
2019-09-20 15:41:33 -04:00
Marcus Wassmer
6517c68ef5 Copying //UE4/Dev-RenderPlat-Staging@8684824 to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 8684840 by Marcus Wassmer in Main branch]
2019-09-14 09:45:25 -04:00
Lukas Hermanns
3896fd9622 Fixed HLSLcc implicit type conversion of test_expression in switch-statement.
#rb Will.Damon, Rolando.Caloca
#rnx


#ROBOMERGE-OWNER: Lukas.Hermanns
#ROBOMERGE-AUTHOR: lukas.hermanns
#ROBOMERGE-SOURCE: CL 8576719 via CL 8616297
#ROBOMERGE-BOT: (v409-8614070)

[CL 8627810 by Lukas Hermanns in Main branch]
2019-09-10 17:38:37 -04:00
Rolando Caloca
aa0d2303d6 Copying //UE4/Dev-Rendering to Dev-Main (//UE4/Dev-Main) @ 6944469
#rb none
#rnx

[CL 6944849 by Rolando Caloca in Main branch]
2019-06-11 18:27:07 -04:00
Chris Gagnon
930e33cb48 Copying //UE4/Dev-Editor to Dev-Main (//UE4/Dev-Main) for 4.23 From CL 6837861
#rb none

[CL 6838042 by Chris Gagnon in Main branch]
2019-06-04 15:42:48 -04:00
dmitriy dyomin
a057ce7394 Support auto-instancing on mobile ES3.1 feature level (Metal, OpenGL ES3.1, Vulkan)
Disabled by default, can be enabled with r.Mobile.SupportGPUScene=1
#jira UE-71355
#rb rolando.caloca, zach.bethel
[FYI] rolando.caloca, zach.bethel


#ROBOMERGE-SOURCE: CL 6617026 via CL 6617089
#ROBOMERGE-BOT: (v358-6608238)

[CL 6617118 by dmitriy dyomin in Main branch]
2019-05-23 00:36:32 -04:00
allan bentham
f493ceffe4 Renable HLSLCC_GroupFlattenedUniformBuffers for android GLES shaders.
#rb none
[FYI] Rolando.Caloca, Dmitriy.Dyomin


#ROBOMERGE-SOURCE: CL 5493548 via CL 5493549 via CL 5494682

[CL 5494718 by allan bentham in Main branch]
2019-03-21 14:30:39 -04:00
rolando caloca
586a7835b8 UE4.22 - Fix glsl dumped shader file paths
- Include cmd line for directcompile
[FYI] Dmitriy.Dyomin
#rnx
#jira
#rb none

#ROBOMERGE-SOURCE: CL 5228304 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5228309 by rolando caloca in Main branch]
2019-02-27 14:27:10 -05:00
Chris Gagnon
80918bea22 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 5110714 by Chris Gagnon in Dev-Editor branch]
2019-02-21 13:05:30 -05:00
Rolando Caloca
1e8145dc6d DR - Workaround GL generating bad packed uniforms when OpenGL.EmulatedUBs = 1
#rb none
#rnx
#lockdown Marcus.Wassmer

[CL 4824387 by Rolando Caloca in Dev-Rendering branch]
2019-01-28 14:57:30 -05:00
Yuriy ODonnell
d488ee7677 EShaderFrequency no longer depends on whether RHI_RAYTRACING is enabled. All frequencies are always defined. Some of the usage of SF_NumFrequencies is replaced with SF_NumStandardFrequencies to avoid memory and run-time overhead.
#lockdown rolando.caloca
#rb rolando.caloca
#jira UE-67956

[CL 4822693 by Yuriy ODonnell in Dev-Rendering branch]
2019-01-28 09:49:53 -05:00
Marcus Wassmer
a8d6cc952b Merging //UE4/Dev-Main@4700769 to Dev-Rendering (//UE4/Dev-Rendering)
#rb none

[CL 4729861 by Marcus Wassmer in Dev-Rendering branch]
2019-01-15 18:04:38 -05:00
Chris Gagnon
1a3bf5caf1 Merging The Engine directory from //UE4/Dev-Main to //UE4/Dev-Editor upto CL 4698813
#rb none

[CL 4720826 by Chris Gagnon in Dev-Editor branch]
2019-01-14 16:55:55 -05:00
Marcus Wassmer
cbfcbbb93b Merging //UE4/Dev-Main@4662404 to Dev-Rendering (//UE4/Dev-Rendering)
#rb none
Should be just copyright updates

[CL 4680440 by Marcus Wassmer in Dev-Rendering branch]
2019-01-03 19:16:26 -05:00
Chris Gagnon
8fc25ea18e Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 4676797 by Chris Gagnon in Dev-Editor branch]
2019-01-02 14:54:39 -05:00
Marcus Wassmer
4cc088f35c Copying //UE4/Dev-Rendering-HLR@4669539 to Dev-Rendering (//UE4/Dev-Rendering)
#rb none
#lockdown rolando.caloca

[CL 4669551 by Marcus Wassmer in Dev-Rendering branch]
2018-12-18 21:41:17 -05:00
Rolando Caloca
016944b119 DR - hlslcc - Retain sizes for global uniforms (ie float3 doesn't get promoted to float4)
#rb none
#rnx

[CL 4662704 by Rolando Caloca in Dev-Rendering branch]
2018-12-14 14:51:12 -05:00
Marcus Wassmer
b5d7db3689 Copying //UE4/Dev-Rendering-HLR@4650617 to Dev-Rendering (//UE4/Dev-Rendering)
#rb none

[CL 4651635 by Marcus Wassmer in Dev-Rendering branch]
2018-12-11 22:25:04 -05:00
Marc Audy
af90b7bcd4 Copying //UE4/Fortnite-Staging to Dev-Main (//UE4/Dev-Main) @ 4395008
#rb
#rnx
#lockdown Nick.Penwarden

[CL 4395058 by Marc Audy in Main branch]
2018-09-25 10:11:35 -04:00
Jack Porter
5434a02fed Merging //UE4/Dev-Main to Dev-Mobile (//UE4/Dev-Mobile)
#rb None
#jira 0

[CL 4213959 by Jack Porter in Dev-Mobile branch]
2018-07-16 11:43:36 -04:00