Merge pull request #15135 from SamGondelman/text81

Case 21628: Fix text rendering on AMD/Mac

interface/src/Application.cpp

@@ -246,6 +246,8 @@
 
 #include "AboutUtil.h"
 
+#include <DisableDeferred.h>
+
 #if defined(Q_OS_WIN)
 #include <VersionHelpers.h>
 
@@ -289,13 +291,6 @@ static const QString DISABLE_WATCHDOG_FLAG{ "HIFI_DISABLE_WATCHDOG" };
 static bool DISABLE_WATCHDOG = nsightActive() || QProcessEnvironment::systemEnvironment().contains(DISABLE_WATCHDOG_FLAG);
 #endif
 
-#if defined(USE_GLES)
-static bool DISABLE_DEFERRED = true;
-#else
-static const QString RENDER_FORWARD{ "HIFI_RENDER_FORWARD" };
-static bool DISABLE_DEFERRED = QProcessEnvironment::systemEnvironment().contains(RENDER_FORWARD);
-#endif
-
 #if !defined(Q_OS_ANDROID)
 static const uint32_t MAX_CONCURRENT_RESOURCE_DOWNLOADS = 16;
 #else

libraries/entities-renderer/src/RenderablePolyLineEntityItem.cpp

@@ -19,6 +19,8 @@
 #include <PerfStat.h>
 #include <shaders/Shaders.h>
 
+#include <DisableDeferred.h>
+
 #include "paintStroke_Shared.slh"
 
 using namespace render;
@@ -29,13 +31,6 @@ gpu::PipelinePointer PolyLineEntityRenderer::_glowPipeline = nullptr;
 
 static const QUrl DEFAULT_POLYLINE_TEXTURE = PathUtils::resourcesUrl("images/paintStroke.png");
 
-#if defined(USE_GLES)
-static bool DISABLE_DEFERRED = true;
-#else
-static const QString RENDER_FORWARD{ "HIFI_RENDER_FORWARD" };
-static bool DISABLE_DEFERRED = QProcessEnvironment::systemEnvironment().contains(RENDER_FORWARD);
-#endif
-
 PolyLineEntityRenderer::PolyLineEntityRenderer(const EntityItemPointer& entity) : Parent(entity) {
     _texture = DependencyManager::get<TextureCache>()->getTexture(DEFAULT_POLYLINE_TEXTURE);
 

libraries/entities-renderer/src/RenderableShapeEntityItem.cpp

@@ -19,6 +19,8 @@
 
 #include "RenderPipelines.h"
 
+#include <DisableDeferred.h>
+
 //#define SHAPE_ENTITY_USE_FADE_EFFECT
 #ifdef SHAPE_ENTITY_USE_FADE_EFFECT
 #include <FadeEffect.h>
@@ -30,13 +32,6 @@ using namespace render::entities;
 // is a half unit sphere.  However, the geometry cache renders a UNIT sphere, so we need to scale down.
 static const float SPHERE_ENTITY_SCALE = 0.5f;
 
-#if defined(USE_GLES)
-static bool DISABLE_DEFERRED = true;
-#else
-static const QString RENDER_FORWARD{ "HIFI_RENDER_FORWARD" };
-static bool DISABLE_DEFERRED = QProcessEnvironment::systemEnvironment().contains(RENDER_FORWARD);
-#endif
-
 static_assert(shader::render_utils::program::simple != 0, "Validate simple program exists");
 static_assert(shader::render_utils::program::simple_transparent != 0, "Validate simple transparent program exists");
 

libraries/entities-renderer/src/RenderableTextEntityItem.cpp

@@ -19,6 +19,8 @@
 
 #include "GLMHelpers.h"
 
+#include <DisableDeferred.h>
+
 using namespace render;
 using namespace render::entities;
 
@@ -160,6 +162,7 @@ void TextEntityRenderer::doRender(RenderArgs* args) {
     glm::vec4 backgroundColor;
     Transform modelTransform;
     glm::vec3 dimensions;
+    bool forwardRendered;
     withReadLock([&] {
         modelTransform = _renderTransform;
         dimensions = _dimensions;
@@ -169,6 +172,7 @@ void TextEntityRenderer::doRender(RenderArgs* args) {
         textColor = EntityRenderer::calculatePulseColor(textColor, _pulseProperties, _created);
         backgroundColor = glm::vec4(_backgroundColor, fadeRatio * _backgroundAlpha);
         backgroundColor = EntityRenderer::calculatePulseColor(backgroundColor, _pulseProperties, _created);
+        forwardRendered = _renderLayer != RenderLayer::WORLD || DISABLE_DEFERRED;
     });
 
     // Render background
@@ -188,7 +192,7 @@ void TextEntityRenderer::doRender(RenderArgs* args) {
     if (backgroundColor.a > 0.0f) {
         batch.setModelTransform(transformToTopLeft);
         auto geometryCache = DependencyManager::get<GeometryCache>();
-        geometryCache->bindSimpleProgram(batch, false, backgroundColor.a < 1.0f, false, false, false);
+        geometryCache->bindSimpleProgram(batch, false, backgroundColor.a < 1.0f, false, false, false, true, forwardRendered);
         geometryCache->renderQuad(batch, minCorner, maxCorner, backgroundColor, _geometryID);
     }
 
@@ -199,7 +203,7 @@ void TextEntityRenderer::doRender(RenderArgs* args) {
         batch.setModelTransform(transformToTopLeft);
 
         glm::vec2 bounds = glm::vec2(dimensions.x - (_leftMargin + _rightMargin), dimensions.y - (_topMargin + _bottomMargin));
-        _textRenderer->draw(batch, _leftMargin / scale, -_topMargin / scale, _text, textColor, bounds / scale);
+        _textRenderer->draw(batch, _leftMargin / scale, -_topMargin / scale, _text, textColor, bounds / scale, forwardRendered);
     }
 }
 

libraries/render-utils/src/GeometryCache.cpp

@@ -35,10 +35,10 @@
 #include "StencilMaskPass.h"
 #include "FadeEffect.h"
 
-
-
 #include "DeferredLightingEffect.h"
 
+#include <DisableDeferred.h>
+
 namespace gr {
     using graphics::slot::texture::Texture;
     using graphics::slot::buffer::Buffer;
@@ -49,13 +49,6 @@ namespace ru {
     using render_utils::slot::buffer::Buffer;
 }
 
-#if defined(USE_GLES)
-static bool DISABLE_DEFERRED = true;
-#else
-static const QString RENDER_FORWARD{ "HIFI_RENDER_FORWARD" };
-static bool DISABLE_DEFERRED = QProcessEnvironment::systemEnvironment().contains(RENDER_FORWARD);
-#endif
-
 //#define WANT_DEBUG
 
 // @note: Originally size entity::NUM_SHAPES

libraries/render-utils/src/TextRenderer3D.cpp

@@ -67,11 +67,11 @@ float TextRenderer3D::getFontSize() const {
 }
 
 void TextRenderer3D::draw(gpu::Batch& batch, float x, float y, const QString& str, const glm::vec4& color,
-                         const glm::vec2& bounds) {
+                         const glm::vec2& bounds, bool forwardRendered) {
     // The font does all the OpenGL work
     if (_font) {
         _color = color;
-        _font->drawString(batch, _drawInfo, str, _color, _effectType, { x, y }, bounds);
+        _font->drawString(batch, _drawInfo, str, _color, _effectType, { x, y }, bounds, forwardRendered);
     }
 }
 

libraries/render-utils/src/TextRenderer3D.h

@@ -39,7 +39,7 @@ public:
     float getFontSize() const; // Pixel size
     
     void draw(gpu::Batch& batch, float x, float y, const QString& str, const glm::vec4& color = glm::vec4(1.0f),
-              const glm::vec2& bounds = glm::vec2(-1.0f));
+              const glm::vec2& bounds = glm::vec2(-1.0f), bool forwardRendered = false);
 
 private:
     TextRenderer3D(const char* family, float pointSize, int weight = -1, bool italic = false,

libraries/render-utils/src/sdf_text3D.slv

@@ -19,6 +19,7 @@
 // the interpolated normal
 layout(location=RENDER_UTILS_ATTR_NORMAL_WS) out vec3 _normalWS;
 layout(location=RENDER_UTILS_ATTR_TEXCOORD01) out vec4 _texCoord01;
+layout(location=RENDER_UTILS_ATTR_POSITION_ES) out vec4 _positionES;
 
 void main() {
     _texCoord01.xy = inTexCoord0.xy;
@@ -26,7 +27,7 @@ void main() {
     // standard transform
     TransformCamera cam = getTransformCamera();
     TransformObject obj = getTransformObject();
-    <$transformModelToClipPos(cam, obj, inPosition, gl_Position)$>
+    <$transformModelToEyeAndClipPos(cam, obj, inPosition, _positionES, gl_Position)$>
     const vec3 normal = vec3(0, 0, 1);
     <$transformModelToWorldDir(cam, obj, normal, _normalWS)$>
 }

libraries/render-utils/src/sdf_text3D_transparent.slf

@@ -10,7 +10,14 @@
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 
-<@include DeferredBufferWrite.slh@>
+<@include DefaultMaterials.slh@>
+
+<@include ForwardGlobalLight.slh@>
+<$declareEvalGlobalLightingAlphaBlended()$>
+
+<@include gpu/Transform.slh@>
+<$declareStandardCameraTransform()$>
+
 <@include render-utils/ShaderConstants.h@>
 
 LAYOUT(binding=0) uniform sampler2D Font;
@@ -24,12 +31,14 @@ LAYOUT(binding=0) uniform textParamsBuffer {
     TextParams params;
 };
 
-// the interpolated normal
+layout(location=RENDER_UTILS_ATTR_POSITION_ES) in vec4 _positionES;
 layout(location=RENDER_UTILS_ATTR_NORMAL_WS) in vec3 _normalWS;
 layout(location=RENDER_UTILS_ATTR_TEXCOORD01) in vec4 _texCoord01;
 #define _texCoord0 _texCoord01.xy
 #define _texCoord1 _texCoord01.zw
 
+layout(location=0) out vec4 _fragColor0;
+
 #define TAA_TEXTURE_LOD_BIAS    -3.0
 
 const float interiorCutoff = 0.8;
@@ -57,9 +66,24 @@ void main() {
     a += evalSDF(_texCoord0 + dxTexCoord + dyTexCoord);
     a *= 0.25;
 
-    packDeferredFragmentTranslucent(
+    float alpha = a * params.color.a;
+    if (alpha <= 0.0) {
+        discard;
+    }
+
+    TransformCamera cam = getTransformCamera();
+    vec3 fragPosition = _positionES.xyz;
+
+    _fragColor0 = vec4(evalGlobalLightingAlphaBlendedWithHaze(
+        cam._viewInverse,
+        1.0,
+        DEFAULT_OCCLUSION,
+        fragPosition,
         normalize(_normalWS),
-        a * params.color.a,
         params.color.rgb,
-        DEFAULT_ROUGHNESS);
+        DEFAULT_FRESNEL,
+        DEFAULT_METALLIC,
+        DEFAULT_EMISSIVE,
+        DEFAULT_ROUGHNESS, alpha),
+        alpha);
 }

libraries/render-utils/src/text/Font.cpp

@@ -343,7 +343,7 @@ void Font::buildVertices(Font::DrawInfo& drawInfo, const QString& str, const glm
 }
 
 void Font::drawString(gpu::Batch& batch, Font::DrawInfo& drawInfo, const QString& str, const glm::vec4& color,
-                      EffectType effectType, const glm::vec2& origin, const glm::vec2& bounds) {
+                      EffectType effectType, const glm::vec2& origin, const glm::vec2& bounds, bool forwardRendered) {
     if (str == "") {
         return;
     }
@@ -370,7 +370,7 @@ void Font::drawString(gpu::Batch& batch, Font::DrawInfo& drawInfo, const QString
     }
     // need the gamma corrected color here
 
-    batch.setPipeline((color.a < 1.0f) ? _transparentPipeline : _pipeline);
+    batch.setPipeline(forwardRendered || (color.a < 1.0f) ? _transparentPipeline : _pipeline);
     batch.setInputFormat(_format);
     batch.setInputBuffer(0, drawInfo.verticesBuffer, 0, _format->getChannels().at(0)._stride);
     batch.setResourceTexture(render_utils::slot::texture::TextFont, _texture);

libraries/render-utils/src/text/Font.h

@@ -46,7 +46,7 @@ public:
     // Render string to batch
     void drawString(gpu::Batch& batch, DrawInfo& drawInfo, const QString& str,
         const glm::vec4& color, EffectType effectType, 
-        const glm::vec2& origin, const glm::vec2& bound);
+        const glm::vec2& origin, const glm::vec2& bound, bool forwardRendered);
 
     static Pointer load(const QString& family);
 

libraries/shared/src/DisableDeferred.h

@@ -0,0 +1,24 @@
+//
+//  Created by Sam Gondelman on 3/7/19.
+//  Copyright 2019 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+
+#ifndef hifi_DisableDeferred_h
+#define hifi_DisableDeferred_h
+
+#include <QString>
+#include <QProcess>
+
+#if defined(USE_GLES)
+static bool DISABLE_DEFERRED = true;
+#else
+static const QString RENDER_FORWARD{ "HIFI_RENDER_FORWARD" };
+static bool DISABLE_DEFERRED = QProcessEnvironment::systemEnvironment().contains(RENDER_FORWARD);
+#endif
+
+
+#endif // hifi_DisableDeferred_h
+