Upgrade FXAA #5200
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,8 +12,13 @@ define([ | |
| '../Renderer/Renderbuffer', | ||
| '../Renderer/RenderbufferFormat', | ||
| '../Renderer/RenderState', | ||
| '../Renderer/Sampler', | ||
| '../Renderer/Texture', | ||
| '../Renderer/TextureMagnificationFilter', | ||
| '../Renderer/TextureMinificationFilter', | ||
| '../Renderer/TextureWrap', | ||
| '../Shaders/PostProcessFilters/FXAA', | ||
| '../Shaders/PostProcessFilters/FXAA3_11' | ||
| ], function( | ||
| BoundingRectangle, | ||
| Cartesian2, | ||
|
|
@@ -27,14 +32,19 @@ define([ | |
| Renderbuffer, | ||
| RenderbufferFormat, | ||
| RenderState, | ||
| Sampler, | ||
| Texture, | ||
| TextureMagnificationFilter, | ||
| TextureMinificationFilter, | ||
| TextureWrap, | ||
| FXAAFS, | ||
| FXAA3_11) { | ||
| 'use strict'; | ||
|
|
||
| /** | ||
| * @private | ||
| */ | ||
| function FXAA() { | ||
| this._texture = undefined; | ||
| this._depthStencilTexture = undefined; | ||
| this._depthStencilRenderbuffer = undefined; | ||
|
|
@@ -50,6 +60,11 @@ define([ | |
| owner : this | ||
| }); | ||
| this._clearCommand = clearCommand; | ||
|
|
||
| this._qualityPreset = 39; | ||
| this._qualitySubPix = 0.5; | ||
| this._qualityEdgeThreshold = 0.125; | ||
| this._qualityEdgeThresholdMin = 0.0833; | ||
| } | ||
|
|
||
| function destroyResources(fxaa) { | ||
|
|
@@ -85,7 +100,13 @@ define([ | |
| width : width, | ||
| height : height, | ||
| pixelFormat : PixelFormat.RGBA, | ||
| pixelDatatype : PixelDatatype.UNSIGNED_BYTE, | ||
| sampler : new Sampler({ | ||
| wrapS : TextureWrap.CLAMP_TO_EDGE, | ||
| wrapT : TextureWrap.CLAMP_TO_EDGE, | ||
| minificationFilter : TextureMinificationFilter.LINEAR, | ||
| magnificationFilter : TextureMagnificationFilter.LINEAR | ||
| }) | ||
| }); | ||
|
|
||
| if (context.depthTexture) { | ||
|
|
@@ -119,7 +140,15 @@ define([ | |
| } | ||
|
|
||
| if (!defined(this._command)) { | ||
| var fs = | ||
| '#define FXAA_PC 1\n' + | ||
| '#define FXAA_WEBGL_1 1\n' + | ||
|
There was a problem hiding this comment. Are there WebGL 2 optimizations that we should roadmap in #797? If so, please update that issue. |
||
| '#define FXAA_QUALITY_PRESET ' + this._qualityPreset + '\n' + | ||
| '#define FXAA_GREEN_AS_LUMA 1\n' + | ||
| FXAA3_11 + '\n' + | ||
| FXAAFS; | ||
|
|
||
| this._command = context.createViewportQuadCommand(fs, { | ||
| owner : this | ||
| }); | ||
| } | ||
|
|
@@ -137,13 +166,22 @@ define([ | |
|
|
||
| if (textureChanged) { | ||
| var that = this; | ||
| var rcpFrame = new Cartesian2(1.0 / this._texture.width, 1.0 / this._texture.height); | ||
| this._command.uniformMap = { | ||
| u_texture : function() { | ||
| return that._texture; | ||
| }, | ||
| u_fxaaQualityRcpFrame : function() { | ||
| return rcpFrame; | ||
| }, | ||
| u_fxaaQualitySubpix : function() { | ||
|
There was a problem hiding this comment. These three aren't used, right? There was a problem hiding this comment. No, I forgot those as well. Removed. |
||
| return that._qualitySubPix; | ||
| }, | ||
| u_fxaaQualityEdgeThreshold : function() { | ||
| return that._qualityEdgeThreshold; | ||
| }, | ||
| u_fxaaQualityEdgeThresholdMin : function() { | ||
| return that._qualityEdgeThresholdMin; | ||
| } | ||
| }; | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should these be packed into a
vec4or just constants in the shader?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I made them shader comments. I wasn't sure if we would expose them. I'm leaving
_qualityPresetwhich is a preprocessor constant because we may expose it or change it for mobile. The possible values are 10-15, 20-29 or 39 (Its documented in a shader comment).There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sounds good, but did you forget a commit to remove the three properties below?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yup, thanks.