Don't expose OES_texture_float_linear without OES_texture_float.

Due to our extra logic that only exposes OES_texture_float if the format is renderable, it's possible that the OES_texture_float_linear can be exposed without OES_texture_float. Make sure that can't happen. BUG=angleproject:1145 Change-Id: I9b1262a39872abf4654d4e4751706679e24926f3 Reviewed-on: https://chromium-review.googlesource.com/322690Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Corentin Wallez <cwallez@chromium.org> Tested-by: Geoff Lang <geofflang@chromium.org>

Don't expose OES_texture_float_linear without OES_texture_float.
0e7fe675 · Geoff Lang · 7cfcdf06 · 0e7fe675
Commit 0e7fe675 authored Jan 20, 2016 by Geoff Lang
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

Caps.cpp src/libANGLE/Caps.cpp +4 -2

No files found.
--- a/src/libANGLE/Caps.cpp
+++ b/src/libANGLE/Caps.cpp
@@ -319,7 +319,8 @@ static bool DetermineHalfFloatTextureFilteringSupport(const TextureCapsMap &text
    requiredFormats.push_back(GL_RGB16F);
    requiredFormats.push_back(GL_RGBA16F);
-    return GetFormatSupport(textureCaps, requiredFormats, true, true, false);
+    return DetermineHalfFloatTextureSupport(textureCaps) &&
+           GetFormatSupport(textureCaps, requiredFormats, true, true, false);
 }
 // Checks for GL_OES_texture_float support
@@ -339,7 +340,8 @@ static bool DetermineFloatTextureFilteringSupport(const TextureCapsMap &textureC
    requiredFormats.push_back(GL_RGB32F);
    requiredFormats.push_back(GL_RGBA32F);
-    return GetFormatSupport(textureCaps, requiredFormats, true, true, false);
+    return DetermineFloatTextureSupport(textureCaps) &&
+           GetFormatSupport(textureCaps, requiredFormats, true, true, false);
 }
 // Checks for GL_EXT_texture_rg support