Commit Graph

61 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
JeanMichel Dignard
99b55fb883 Merged main @ cl 10981486
#rb none
#rnx

[CL 10985598 by JeanMichel Dignard in Dev-Tools-Staging branch]
2020-01-14 14:45:07 -05:00
julien stjean
6e4b0a168d Hot fix for a crash where we ended up creating more mip map level then we should had.
This issue was happening after using LeaveExistingMips for the MipGenSettings and setting a maximun texture size.
Added a validation when getting that data from the ddc as it could be invalid.

#jira UE-85228
#rb JeanMichel.Dignard, Mihnea.Balta
#lockdown nick.penwarden

#ROBOMERGE-SOURCE: CL 10950746 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v632-10940481)

[CL 10950747 by julien stjean in Main branch]
2020-01-13 07:12:12 -05:00
JeanMichel Dignard
70d074639f Merging //UE4/Dev-Main @ 10886849 to Dev-Tools-Staging (//UE4/Dev-Tools-Staging)
#rb none
#rnx

[CL 10906274 by JeanMichel Dignard in Dev-Tools-Staging branch]
2020-01-08 13:26:18 -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
luke thatcher
65b1959a67 Remove PlatformRequiresOptTextureData and rework how those fields are serialized to prevent crashes when loading cooked data in the editor.
- An additional bit in the FTexturePlatformData next to the Cubemap bit is used to indicate whether the structure contains non-default OptData. Contents of the OptData field is only serialized when that bit is set.
 - Platforms which do no make use of OptData will automatically not have that data in their cooked byte stream, as the values will remain default. Platform that do set those values will have the data included and the bit set.

#rb Paul.Chipchase
#jira UE-84435
#lockdown nick.penwarden

#ROBOMERGE-OWNER: jeanmichel.dignard
#ROBOMERGE-AUTHOR: luke.thatcher
#ROBOMERGE-SOURCE: CL 10334591 in //UE4/Release-4.24/... via CL 10334594
#ROBOMERGE-BOT: TOOLS (Main -> Dev-Tools-Staging) (v594-10333955)

[CL 10410198 by luke thatcher in Dev-Tools-Staging branch]
2019-11-25 07:11:39 -05:00
JeanLuc Corenthin
276d3af9b8 Copy up //UE4/Dev-Enterprise/... to //UE4/Dev-Tools-Staging/...
#rb none

[CL 10371791 by JeanLuc Corenthin in Dev-Tools-Staging branch]
2019-11-22 10:05:55 -05:00
luke thatcher
13bbcdb73a Remove PlatformRequiresOptTextureData and rework how those fields are serialized to prevent crashes when loading cooked data in the editor.
- An additional bit in the FTexturePlatformData next to the Cubemap bit is used to indicate whether the structure contains non-default OptData. Contents of the OptData field is only serialized when that bit is set.
 - Platforms which do no make use of OptData will automatically not have that data in their cooked byte stream, as the values will remain default. Platform that do set those values will have the data included and the bit set.

#rb Paul.Chipchase
#jira UE-84435
#lockdown nick.penwarden

#ROBOMERGE-SOURCE: CL 10334591 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v594-10333955)

[CL 10334594 by luke thatcher in Main branch]
2019-11-21 08:53:37 -05:00
rolando caloca
33e6e98b5c Add more info to failed composite texture
#rb trivial
#rnx


#ROBOMERGE-SOURCE: CL 10017753 via CL 10017763 via CL 10020182 via CL 10020254
#ROBOMERGE-BOT: (v562-10004402)

[CL 10020374 by rolando caloca in Main branch]
2019-11-05 14:56:48 -05:00
luke thatcher
da93476a62 Make the serialization of the ExtData and NumMipsInTail members of FTexturePlatformData optional, based on whether the target platform actually requires them. This is to prevent changes to cooked asset data causing large patch sizes on platforms that otherwise would not use the new members.
Platforms that do need the additional members should override FPlatformProperties::RequiresOptTextureData() to return true.

#rb Rolando.Caloca, Uriel.Doyon
#jira none

#ROBOMERGE-SOURCE: CL 9835488 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v546-9757112)

[CL 9835503 by luke thatcher in Main branch]
2019-10-25 07:23:05 -04:00
jeanmichel dignard
3ed35eb908 PR #6292: Engine changes for USD plugin (Contributed by niexuchina)
#jira UE-82046

#rb none

#ROBOMERGE-SOURCE: CL 9702186 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v539-9700858)

[CL 9702189 by jeanmichel dignard in Main branch]
2019-10-18 17:21:11 -04:00
Rolando Caloca
1a30325d6f Copying //UE4/Dev-RenderPlat-Staging@9551419 to //UE4/Main
#rb none
#rnx

[CL 9551447 by Rolando Caloca in Main branch]
2019-10-11 15:33:31 -04:00
jeremy moore
560d7ebf39 Add YCoCg compression with per block scaling to the texture compression module
Runtime virtual texture uses streaming virtual texture to fill pages at distance
We recently moved to YCoCg encoding in the compressed base color texture to address visual quality issues
The runtime virtual texture used a per block scaling, but the offline generated streaming texture didn't
The offline texture looks much worse without the block scaling so that we see color artifacts in the distance before this change
[CODEREVIEW] Sebastien.Lussier


#ROBOMERGE-SOURCE: CL 9325494 via CL 9325668 via CL 9326152 via CL 9326166 via CL 9326179
#ROBOMERGE-BOT: (v455-9298202)

[CL 9326194 by jeremy moore in Main branch]
2019-10-02 00:04:28 -04:00
Ben Marsh
bbe9fecb2f Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
#rb none
#rnx

[CL 9053338 by Ben Marsh in Main branch]
2019-09-24 16:13:51 -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
Ben Marsh
e58cbf4cc6 Fix checks on bBuildDeveloperTools that are actually meant on checks for the editor. It should be possible to set bBuildDeveloperTools for runtime games.
#rb none

[CL 8386650 by Ben Marsh in Dev-Build branch]
2019-08-30 16:10:54 -04:00
simon tourangeau
311a249228 GenerateMipChain() and AdjustImageColors() are made public and changed to ITextureCompressorModule::GenerateMipChain() and ITextureCompressorModule::AdjustImageColors(). This allows us to export the specific MipMap levels and the textures with adjustments to PNG.
Fix SRGB of 16bit cubemap

Import the existing texture asset without Dialog box
New parameter to SuppressImportOverwriteDialog which can suppress the dialog box that, when importing over an existing texture, force to overwrite its settings.

#jira UE-78899

PR #6123: Texture changes for NVIDIA USD plugin.

#rb jeanmichel.dignard
#lockdown nick.penwarden

#ROBOMERGE-SOURCE: CL 8127249 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v401-8057353)

[CL 8127258 by simon tourangeau in Main branch]
2019-08-20 13:24:46 -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
Marcus Wassmer
6995e20184 Merging //UE4/Dev-Main@4848702 to Dev-Rendering (//UE4/Dev-Rendering)
#rb none
#lockdown rolando.caloca

[CL 4854488 by Marcus Wassmer in Dev-Rendering branch]
2019-01-30 20:34:55 -05:00
Chris Gagnon
a48e767b94 Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 4835066 by Chris Gagnon in Dev-Editor branch]
2019-01-29 16:15:19 -05:00
Brandon Schaefer
e3ac01dbbf Fix crash when taking a ref of a lambda function (Thanks Christina Tempelaarl!)
#jira UE-69040
#rb Arciel.Rekman, Christina.Tempelaarl
#lockdown matt.kuhlenschmidt

[CL 4815152 by Brandon Schaefer in Dev-Editor branch]
2019-01-25 15:16:23 -05:00
Rolando Caloca
732810a13b DR - Copying //UE4/Dev-Main@4785067 to //UE4-DevRendering
#rb none
#rnx
#lockdown Marcus.Wassmer

[CL 4790611 by Rolando Caloca in Dev-Rendering branch]
2019-01-23 17:01:56 -05:00
Chris Gagnon
1dd3e0189f Merging //UE4/Dev-Main to Dev-Editor (//UE4/Dev-Editor)
#rb none

[CL 4730305 by Chris Gagnon in Dev-Editor branch]
2019-01-15 18:47:22 -05:00
Marcus Wassmer
fee98d3ca5 Merging //UE4/Dev-Main@4729937 to Dev-Rendering (//UE4/Dev-Rendering)
#rb none

[CL 4730169 by Marcus Wassmer in Dev-Rendering branch]
2019-01-15 18:30:06 -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