examples: Fix FXAA not working in OpenGL
This commit is contained in:
parent
4b86d67517
commit
06e2dea1fa
|
|
@ -96,7 +96,7 @@ uniform float _300_EdgeThresholdMin<
|
||||||
> = 8.33;
|
> = 8.33;
|
||||||
|
|
||||||
// ======================================== //
|
// ======================================== //
|
||||||
// Functionality
|
// FXAA Functionality
|
||||||
// ======================================== //
|
// ======================================== //
|
||||||
// This is a bit of a mess, but it is necessary to get things to work. We're
|
// This is a bit of a mess, but it is necessary to get things to work. We're
|
||||||
// dealing with multiple unusual restrictions here, all of which are from
|
// dealing with multiple unusual restrictions here, all of which are from
|
||||||
|
|
@ -131,32 +131,56 @@ uniform float _300_EdgeThresholdMin<
|
||||||
|
|
||||||
// Actual Functionality starts here.
|
// Actual Functionality starts here.
|
||||||
FxaaUInt quality_stages() {
|
FxaaUInt quality_stages() {
|
||||||
FxaaUInt stages = FxaaUInt(_000_QualityPreset) % 10;
|
FxaaUInt stages = FxaaUInt(_000_QualityPreset) % 10u;
|
||||||
return (3 + stages);
|
return 3u + stages;
|
||||||
}
|
}
|
||||||
|
|
||||||
FxaaFloat quality_value(in FxaaUInt stage) {
|
FxaaFloat quality_value(in FxaaUInt stage) {
|
||||||
const FxaaFloat preset_00[12] = { 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0};
|
#ifdef GS_DEVICE_OPENGL
|
||||||
|
const FxaaFloat preset_00[12u] = FxaaFloat[12u]( 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
|
||||||
// 1.x
|
// 1.x
|
||||||
const FxaaFloat preset_10[12] = { 1.5, 3.0, 12.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0};
|
const FxaaFloat preset_10[12u] = FxaaFloat[12u]( 1.5f, 3.0f, 12.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
|
||||||
const FxaaFloat preset_11[12] = { 1.0, 1.5, 3.0, 12.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0};
|
const FxaaFloat preset_11[12u] = FxaaFloat[12u]( 1.0f, 1.5f, 3.0f, 12.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
|
||||||
const FxaaFloat preset_12[12] = { 1.0, 1.5, 2.0, 4.0, 12.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0};
|
const FxaaFloat preset_12[12u] = FxaaFloat[12u]( 1.0f, 1.5f, 2.0f, 4.0f, 12.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
|
||||||
const FxaaFloat preset_13[12] = { 1.0, 1.5, 2.0, 2.0, 4.0, 12.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0};
|
const FxaaFloat preset_13[12u] = FxaaFloat[12u]( 1.0f, 1.5f, 2.0f, 2.0f, 4.0f, 12.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
|
||||||
const FxaaFloat preset_14[12] = { 1.0, 1.5, 2.0, 2.0, 2.0, 4.0, 12.0, 0.0, 0.0, 0.0, 0.0, 0.0};
|
const FxaaFloat preset_14[12u] = FxaaFloat[12u]( 1.0f, 1.5f, 2.0f, 2.0f, 2.0f, 4.0f, 12.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
|
||||||
const FxaaFloat preset_15[12] = { 1.0, 1.5, 2.0, 2.0, 2.0, 2.0, 4.0, 12.0, 0.0, 0.0, 0.0, 0.0};
|
const FxaaFloat preset_15[12u] = FxaaFloat[12u]( 1.0f, 1.5f, 2.0f, 2.0f, 2.0f, 2.0f, 4.0f, 12.0f, 0.0f, 0.0f, 0.0f, 0.0f);
|
||||||
// 2.x
|
// 2.x
|
||||||
const FxaaFloat preset_20[12] = { 1.5, 2.0, 8.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0};
|
const FxaaFloat preset_20[12u] = FxaaFloat[12u]( 1.5f, 2.0f, 8.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
|
||||||
const FxaaFloat preset_21[12] = { 1.0, 1.5, 2.0, 8.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0};
|
const FxaaFloat preset_21[12u] = FxaaFloat[12u]( 1.0f, 1.5f, 2.0f, 8.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
|
||||||
const FxaaFloat preset_22[12] = { 1.0, 1.5, 2.0, 2.0, 8.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0};
|
const FxaaFloat preset_22[12u] = FxaaFloat[12u]( 1.0f, 1.5f, 2.0f, 2.0f, 8.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
|
||||||
const FxaaFloat preset_23[12] = { 1.0, 1.5, 2.0, 2.0, 2.0, 8.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0};
|
const FxaaFloat preset_23[12u] = FxaaFloat[12u]( 1.0f, 1.5f, 2.0f, 2.0f, 2.0f, 8.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
|
||||||
const FxaaFloat preset_24[12] = { 1.0, 1.5, 2.0, 2.0, 2.0, 3.0, 8.0, 0.0, 0.0, 0.0, 0.0, 0.0};
|
const FxaaFloat preset_24[12u] = FxaaFloat[12u]( 1.0f, 1.5f, 2.0f, 2.0f, 2.0f, 3.0f, 8.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
|
||||||
const FxaaFloat preset_25[12] = { 1.0, 1.5, 2.0, 2.0, 2.0, 2.0, 4.0, 8.0, 0.0, 0.0, 0.0, 0.0};
|
const FxaaFloat preset_25[12u] = FxaaFloat[12u]( 1.0f, 1.5f, 2.0f, 2.0f, 2.0f, 2.0f, 4.0f, 8.0f, 0.0f, 0.0f, 0.0f, 0.0f);
|
||||||
const FxaaFloat preset_26[12] = { 1.0, 1.5, 2.0, 2.0, 2.0, 2.0, 2.0, 4.0, 8.0, 0.0, 0.0, 0.0};
|
const FxaaFloat preset_26[12u] = FxaaFloat[12u]( 1.0f, 1.5f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 4.0f, 8.0f, 0.0f, 0.0f, 0.0f);
|
||||||
const FxaaFloat preset_27[12] = { 1.0, 1.5, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 4.0, 8.0, 0.0, 0.0};
|
const FxaaFloat preset_27[12u] = FxaaFloat[12u]( 1.0f, 1.5f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 4.0f, 8.0f, 0.0f, 0.0f);
|
||||||
const FxaaFloat preset_28[12] = { 1.0, 1.5, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 4.0, 8.0, 0.0};
|
const FxaaFloat preset_28[12u] = FxaaFloat[12u]( 1.0f, 1.5f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 4.0f, 8.0f, 0.0f);
|
||||||
const FxaaFloat preset_29[12] = { 1.0, 1.5, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 4.0, 8.0};
|
const FxaaFloat preset_29[12u] = FxaaFloat[12u]( 1.0f, 1.5f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 4.0f, 8.0f);
|
||||||
// 3.x
|
// 3.x
|
||||||
const FxaaFloat preset_39[12] = { 1.0, 1.0, 1.0, 1.0, 1.0, 1.5, 2.0, 2.0, 2.0, 2.0, 4.0, 8.0};
|
const FxaaFloat preset_39[12u] = FxaaFloat[12u]( 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.5f, 2.0f, 2.0f, 2.0f, 2.0f, 4.0f, 8.0f);
|
||||||
|
#else
|
||||||
|
const FxaaFloat preset_00[12u] = { 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f};
|
||||||
|
// 1.x
|
||||||
|
const FxaaFloat preset_10[12u] = { 1.5f, 3.0f, 12.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f};
|
||||||
|
const FxaaFloat preset_11[12u] = { 1.0f, 1.5f, 3.0f, 12.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f};
|
||||||
|
const FxaaFloat preset_12[12u] = { 1.0f, 1.5f, 2.0f, 4.0f, 12.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f};
|
||||||
|
const FxaaFloat preset_13[12u] = { 1.0f, 1.5f, 2.0f, 2.0f, 4.0f, 12.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f};
|
||||||
|
const FxaaFloat preset_14[12u] = { 1.0f, 1.5f, 2.0f, 2.0f, 2.0f, 4.0f, 12.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f};
|
||||||
|
const FxaaFloat preset_15[12u] = { 1.0f, 1.5f, 2.0f, 2.0f, 2.0f, 2.0f, 4.0f, 12.0f, 0.0f, 0.0f, 0.0f, 0.0f};
|
||||||
|
// 2.x
|
||||||
|
const FxaaFloat preset_20[12u] = { 1.5f, 2.0f, 8.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f};
|
||||||
|
const FxaaFloat preset_21[12u] = { 1.0f, 1.5f, 2.0f, 8.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f};
|
||||||
|
const FxaaFloat preset_22[12u] = { 1.0f, 1.5f, 2.0f, 2.0f, 8.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f};
|
||||||
|
const FxaaFloat preset_23[12u] = { 1.0f, 1.5f, 2.0f, 2.0f, 2.0f, 8.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f};
|
||||||
|
const FxaaFloat preset_24[12u] = { 1.0f, 1.5f, 2.0f, 2.0f, 2.0f, 3.0f, 8.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f};
|
||||||
|
const FxaaFloat preset_25[12u] = { 1.0f, 1.5f, 2.0f, 2.0f, 2.0f, 2.0f, 4.0f, 8.0f, 0.0f, 0.0f, 0.0f, 0.0f};
|
||||||
|
const FxaaFloat preset_26[12u] = { 1.0f, 1.5f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 4.0f, 8.0f, 0.0f, 0.0f, 0.0f};
|
||||||
|
const FxaaFloat preset_27[12u] = { 1.0f, 1.5f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 4.0f, 8.0f, 0.0f, 0.0f};
|
||||||
|
const FxaaFloat preset_28[12u] = { 1.0f, 1.5f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 4.0f, 8.0f, 0.0f};
|
||||||
|
const FxaaFloat preset_29[12u] = { 1.0f, 1.5f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 2.0f, 4.0f, 8.0f};
|
||||||
|
// 3.x
|
||||||
|
const FxaaFloat preset_39[12u] = { 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.5f, 2.0f, 2.0f, 2.0f, 2.0f, 4.0f, 8.0f};
|
||||||
|
#endif
|
||||||
|
|
||||||
switch (_000_QualityPreset) {
|
switch (_000_QualityPreset) {
|
||||||
case 10: return preset_10[stage];
|
case 10: return preset_10[stage];
|
||||||
|
|
@ -417,31 +441,31 @@ FxaaFloat4 FxaaPixelShader(
|
||||||
FxaaFloat lumaEndP = 0;
|
FxaaFloat lumaEndP = 0;
|
||||||
FxaaBool doneNP = false;
|
FxaaBool doneNP = false;
|
||||||
|
|
||||||
FxaaStep(tex, doneN, posN, lumaEndN, doneP, posP, lumaEndP, doneNP, offNP, lumaNN, gradientScaled, quality_value(0));
|
FxaaStep(tex, doneN, posN, lumaEndN, doneP, posP, lumaEndP, doneNP, offNP, lumaNN, gradientScaled, quality_value(0u));
|
||||||
if ((stages >= 1) && doneNP) {
|
if ((stages >= 1u) && doneNP) {
|
||||||
FxaaStep(tex, doneN, posN, lumaEndN, doneP, posP, lumaEndP, doneNP, offNP, lumaNN, gradientScaled, quality_value(1));
|
FxaaStep(tex, doneN, posN, lumaEndN, doneP, posP, lumaEndP, doneNP, offNP, lumaNN, gradientScaled, quality_value(1u));
|
||||||
if ((stages >= 2) && doneNP) {
|
if ((stages >= 2u) && doneNP) {
|
||||||
FxaaStep(tex, doneN, posN, lumaEndN, doneP, posP, lumaEndP, doneNP, offNP, lumaNN, gradientScaled, quality_value(2));
|
FxaaStep(tex, doneN, posN, lumaEndN, doneP, posP, lumaEndP, doneNP, offNP, lumaNN, gradientScaled, quality_value(2u));
|
||||||
if ((stages >= 3) && doneNP) {
|
if ((stages >= 3u) && doneNP) {
|
||||||
FxaaStep(tex, doneN, posN, lumaEndN, doneP, posP, lumaEndP, doneNP, offNP, lumaNN, gradientScaled, quality_value(3));
|
FxaaStep(tex, doneN, posN, lumaEndN, doneP, posP, lumaEndP, doneNP, offNP, lumaNN, gradientScaled, quality_value(3u));
|
||||||
if ((stages >= 4) && doneNP) {
|
if ((stages >= 4u) && doneNP) {
|
||||||
FxaaStep(tex, doneN, posN, lumaEndN, doneP, posP, lumaEndP, doneNP, offNP, lumaNN, gradientScaled, quality_value(4));
|
FxaaStep(tex, doneN, posN, lumaEndN, doneP, posP, lumaEndP, doneNP, offNP, lumaNN, gradientScaled, quality_value(4u));
|
||||||
if ((stages >= 5) && doneNP) {
|
if ((stages >= 5u) && doneNP) {
|
||||||
FxaaStep(tex, doneN, posN, lumaEndN, doneP, posP, lumaEndP, doneNP, offNP, lumaNN, gradientScaled, quality_value(5));
|
FxaaStep(tex, doneN, posN, lumaEndN, doneP, posP, lumaEndP, doneNP, offNP, lumaNN, gradientScaled, quality_value(5u));
|
||||||
if ((stages >= 6) && doneNP) {
|
if ((stages >= 6u) && doneNP) {
|
||||||
FxaaStep(tex, doneN, posN, lumaEndN, doneP, posP, lumaEndP, doneNP, offNP, lumaNN, gradientScaled, quality_value(6));
|
FxaaStep(tex, doneN, posN, lumaEndN, doneP, posP, lumaEndP, doneNP, offNP, lumaNN, gradientScaled, quality_value(6u));
|
||||||
if ((stages >= 7) && doneNP) {
|
if ((stages >= 7u) && doneNP) {
|
||||||
FxaaStep(tex, doneN, posN, lumaEndN, doneP, posP, lumaEndP, doneNP, offNP, lumaNN, gradientScaled, quality_value(7));
|
FxaaStep(tex, doneN, posN, lumaEndN, doneP, posP, lumaEndP, doneNP, offNP, lumaNN, gradientScaled, quality_value(7u));
|
||||||
if ((stages >= 8) && doneNP) {
|
if ((stages >= 8u) && doneNP) {
|
||||||
FxaaStep(tex, doneN, posN, lumaEndN, doneP, posP, lumaEndP, doneNP, offNP, lumaNN, gradientScaled, quality_value(8));
|
FxaaStep(tex, doneN, posN, lumaEndN, doneP, posP, lumaEndP, doneNP, offNP, lumaNN, gradientScaled, quality_value(8u));
|
||||||
if ((stages >= 9) && doneNP) {
|
if ((stages >= 9u) && doneNP) {
|
||||||
FxaaStep(tex, doneN, posN, lumaEndN, doneP, posP, lumaEndP, doneNP, offNP, lumaNN, gradientScaled, quality_value(9));
|
FxaaStep(tex, doneN, posN, lumaEndN, doneP, posP, lumaEndP, doneNP, offNP, lumaNN, gradientScaled, quality_value(9u));
|
||||||
if ((stages >= 10) && doneNP) {
|
if ((stages >= 10u) && doneNP) {
|
||||||
FxaaStep(tex, doneN, posN, lumaEndN, doneP, posP, lumaEndP, doneNP, offNP, lumaNN, gradientScaled, quality_value(0));
|
FxaaStep(tex, doneN, posN, lumaEndN, doneP, posP, lumaEndP, doneNP, offNP, lumaNN, gradientScaled, quality_value(10u));
|
||||||
if ((stages >= 11) && doneNP) {
|
if ((stages >= 11u) && doneNP) {
|
||||||
FxaaStep(tex, doneN, posN, lumaEndN, doneP, posP, lumaEndP, doneNP, offNP, lumaNN, gradientScaled, quality_value(11));
|
FxaaStep(tex, doneN, posN, lumaEndN, doneP, posP, lumaEndP, doneNP, offNP, lumaNN, gradientScaled, quality_value(11u));
|
||||||
// Present in FXAA 3.11, but not actually defined anywhere.
|
// Present in FXAA 3.11, but not actually defined anywhere.
|
||||||
// if ((stages >= 12) && doneNP) {
|
// if ((stages >= 12u) && doneNP) {
|
||||||
// FxaaStep(tex, doneN, posN, lumaEndN, doneP, posP, lumaEndP, doneNP, offNP, lumaNN, gradientScaled, quality_value(12));
|
// FxaaStep(tex, doneN, posN, lumaEndN, doneP, posP, lumaEndP, doneNP, offNP, lumaNN, gradientScaled, quality_value(12));
|
||||||
// }
|
// }
|
||||||
}
|
}
|
||||||
|
|
@ -495,7 +519,7 @@ FxaaFloat4 FxaaPixelShader(
|
||||||
|
|
||||||
FxaaFloat4 ProcessPixelShader(VertexInformation vtx) : TARGET {
|
FxaaFloat4 ProcessPixelShader(VertexInformation vtx) : TARGET {
|
||||||
return FxaaPixelShader(
|
return FxaaPixelShader(
|
||||||
vtx.texcoord0.xy,
|
vtx.texcoord0.xy + (ViewSize.zw * .5),
|
||||||
InputA,
|
InputA,
|
||||||
ViewSize.zw,
|
ViewSize.zw,
|
||||||
_100_SubpixelAliasingRemoval,
|
_100_SubpixelAliasingRemoval,
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue