Commit Graph

126 Commits

Author SHA1 Message Date
zach bethel
b6ef1e7564 Fixed bug with high resolution screenshot capture regions where the material mask would always be displayed.
#jira UE-84488
#rb none
#lockdown cristina.riveron

#ROBOMERGE-SOURCE: CL 10934392 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v626-10872990)

[CL 10934396 by zach bethel in Main branch]
2020-01-09 18:11:07 -05:00
ryan durand
0f0464a30e Updating copyright for Engine Runtime.
#rnx
#rb none


#ROBOMERGE-OWNER: ryan.durand
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10869210 via CL 10869511 via CL 10869900
#ROBOMERGE-BOT: (v613-10869866)

[CL 10870549 by ryan durand in Main branch]
2019-12-26 14:45:42 -05:00
zach bethel
33304619ff Fixed high resolution screenshot mask.
#jira UE-81943
#rb none

#ROBOMERGE-SOURCE: CL 9761148 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v545-9751379)

[CL 9761164 by zach bethel in Main branch]
2019-10-23 15:07:28 -04:00
mihnea balta
fc843b83a0 Fixed vertically flipped image on Android/OpenGL if a postprocess material was set to render after the tonemapper.
#jira UE-80082
#rb rolando.caloca zach.bethel

[CL 9630360 by mihnea balta in 4.24 branch]
2019-10-17 04:24:15 -04:00
mihnea balta
c794b31286 Fixed crash on mobile when using a material with "Enable Stencil Test" set to true.
Updated the code which detects when it's possible to skip custom depth rendering on mobile to take into account the new "Enable Stencil Test" material flag. Also fixed a couple of issues with the OpenGL RHI:
* the post processing material writes directly to the backbuffer on mobile, but it's not possible to use that with a custom depth/stencil buffer on OpenGL. Added a hack in PostProcessMaterial to render to an intermediate buffer when that's the case and copy to the backbuffer at the end.
* glCopyImageSubData() doesn't like copying from a 2D texture to a renderbuffer on mobile, so made it use glBlitFramebuffer() when the bind targets are different (which happens when copying from a render target to the backbuffer)

#jira UE-80082
#rb dmitriy.dyomin rolando.caloca zach.bethel

[CL 9614432 by mihnea balta in 4.24 branch]
2019-10-16 02:54:09 -04:00
zach bethel
1784059db0 Merged fixes for EngineTest.
#rb none
#jira none

[CL 9406761 by zach bethel in Dev-RenderPlat-Staging branch]
2019-10-03 17:43:31 -04:00
Rolando Caloca
547bb81647 DRPS - Fix deprecation warnings
#rb none
#rnx
#fyi Zach.Bethel

[CL 9318386 by Rolando Caloca in Dev-RenderPlat-Staging branch]
2019-10-01 13:43:14 -04:00
Rolando Caloca
f83ae4807a Copying //UE4/Dev-Rendering@9317594 to Dev-RenderPlat-Staging
#rb none
#rnx

[CL 9317904 by Rolando Caloca in Dev-RenderPlat-Staging branch]
2019-10-01 13:03:04 -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
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
dmitriy dyomin
7cfef5140f Fixed: Issues with mobile rendering and SceneDepth material node usage in post-process materials
#jira UE-73347
#rb none

#ROBOMERGE-SOURCE: CL 7448179 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v371-7306989)

[CL 7448180 by dmitriy dyomin in Main branch]
2019-07-19 05:29:57 -04:00
rolando caloca
83c57c2a0f UE4.23 - Deprecate FUniformBufferRHIParamRef, FIndexBufferRHIParamRef, FVertexBufferRHIParamRef, FStructuredBufferRHIParamRef, FTextureRHIParamRef, FTexture2DRHIParamRef, FTexture2DArrayRHIParamRef, FTexture3DRHIParamRef, FTextureCubeRHIParamRef
#rb none
#jira UE-76364

#ROBOMERGE-SOURCE: CL 7046967 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)

[CL 7047009 by rolando caloca in Main branch]
2019-06-17 13:39:07 -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
zabir hoque
180eb51dde Copying over fix from Dev-Rendering:
When applying PPM and we must prime the RT, check if CopyResource() is unavailable due to format conversion. If so use copy pixel shader.

#RB: Brian.Karis, Guillaume.Abadie
#Jira: 178059


#ROBOMERGE-SOURCE: CL 6638136 via CL 6641497
#ROBOMERGE-BOT: (vundefined-6620334)

[CL 6641687 by zabir hoque in Main branch]
2019-05-24 19:15:38 -04:00
allan bentham
68fc0b78bb Fix inverted scope rendering on android GLES.
Do not flip  Y axis on any pass that can be used as input for post process material.
flip Y axis only on final tonemapper or after tonemapper post process material stage.
#rb Dmitriy.Dyomin


#ROBOMERGE-SOURCE: CL 6426212 via CL 6426213 via CL 6426335

[CL 6426338 by allan bentham in Main branch]
2019-05-13 07:54:13 -04:00
zabir hoque
cb1264982a Don't attempt to recycle PP render target if it has already been allocated. This can happen when PPM is the last effect in the PP chain as being output directly to the View->RT
#rb zabir.hoque
#jira UE-71963


#ROBOMERGE-SOURCE: CL 5794810 via CL 5799357

[CL 5799420 by zabir hoque in Main branch]
2019-04-08 18:18:56 -04:00
zabir hoque
6ee9fa14d9 Output correct size value for PP draw event.
#jira: none
#rb: none


#ROBOMERGE-SOURCE: CL 5794794 via CL 5799350

[CL 5799414 by zabir hoque in Main branch]
2019-04-08 18:18:47 -04:00
allan bentham
6db0744dcc Add permutation to mobile's post process materials to avoid viewport to colour buffer calculation when viewsize == buffer size.
Remove assumption from SceneTextureLookup that mobile only deals with viewsize == buffersize case.
Corrected default UV values for SceneTextureLookup.
Corrected material UVs.
#jira UE-71898
#jira UE-69918
#rb ryan.vance
#lockdown cristina.riveron

#ROBOMERGE-OWNER: allan.bentham
#ROBOMERGE-AUTHOR: allan.bentham
#ROBOMERGE-SOURCE: CL 5536485 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5537203 by allan bentham in Main branch]
2019-03-25 15:00:35 -04:00
allan bentham
3a6c24fea7 Backing out fix for UE-69918, needs more work.
#jira UE-71898
#rb none
#lockdown cristina.riveron

#ROBOMERGE-OWNER: allan.bentham
#ROBOMERGE-AUTHOR: allan.bentham
#ROBOMERGE-SOURCE: CL 5533826 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5534343 by allan bentham in Main branch]
2019-03-25 11:14:53 -04:00
zabir hoque
ec42217c88 Guard against nullptr deref based on StaticAnalysis.
#Jira: UE-71545


#ROBOMERGE-SOURCE: CL 5401367 via CL 5404902

[CL 5405145 by zabir hoque in Main branch]
2019-03-14 19:02:35 -04:00
zabir hoque
8d8a2d0957 Correct blending behavior for PPM. Bug was if stencil test was disabled then we did not prime the target output, causing blend modes to not work. Fix allows independent selection of stencil test and blend mode, then correctly primes output if necessary.
#Jira: FORT-157096
[FYI] Chris.Bunner, Marcus.Wassmer


#ROBOMERGE-OWNER: zabir.hoque
#ROBOMERGE-AUTHOR: zabir.hoque
#ROBOMERGE-SOURCE: CL 5391596 via CL 5391601 via CL 5393138 via CL 5394682

[CL 5394838 by zabir hoque in Main branch]
2019-03-13 21:20:37 -04:00
dmitriy dyomin
0fe1e9526d Player outlines fix (iOS, Android)
[REVIEW] dmitriy.dyomin


#ROBOMERGE-OWNER: dmitriy.dyomin
#ROBOMERGE-AUTHOR: dmitriy.dyomin
#ROBOMERGE-SOURCE: CL 5383022 via CL 5383026 via CL 5383028 via CL 5383216 via CL 5383727

[CL 5383742 by dmitriy dyomin in Main branch]
2019-03-13 12:00:50 -04:00
allan bentham
c30a99ee52 Add permutation to mobile's post process materials to avoid viewport to colour buffer calculation when viewsize == buffer size.
Remove assumption from SceneTextureLookup that mobile only deals with viewsize == buffersize case.
#jira UE-69918
#rb Dmitriy.Dyomin

#ROBOMERGE-OWNER: allan.bentham
#ROBOMERGE-AUTHOR: allan.bentham
#ROBOMERGE-SOURCE: CL 5348151 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 5348238 by allan bentham in Main branch]
2019-03-08 05:18:43 -05:00
zabir hoque
5d8bd6bea1 Remove redefinition of log category that is included via PCH to fix build break.
#Jira: none


#ROBOMERGE-SOURCE: CL 5259146 via CL 5259150 via CL 5259312

[CL 5259329 by zabir hoque in Main branch]
2019-03-01 00:27:41 -05:00
zabir hoque
4de055c193 Enable stencil testing for post process materials.
- Write directly to post process input 0 if able.
  - Copy post process input 0 to target if unable.
  - Allow SM4 to make copy DS if necessay.
  - Allow PPM to use blend modes to composite onto output.

#rb: Brian.Karis
#Jira: FORT-150303


#ROBOMERGE-OWNER: zabir.hoque
#ROBOMERGE-AUTHOR: zabir.hoque
#ROBOMERGE-SOURCE: CL 5259065 via CL 5259067 via CL 5259304

[CL 5259305 by zabir hoque in Main branch]
2019-03-01 00:26:27 -05:00