Do not check the texture's filtering mode in Texture*::updateTexture, instead…

Do not check the texture's filtering mode in Texture*::updateTexture, instead check the texture's dirty flags. With sampler objects, it becomes difficult to rely on the texture filtering mode state to determine if mipmapping is going to be enabled in the texture, as sampler object may or may not override the texture internal state. TRAC #23453 Signed-off-by: Nicolas Capens Signed-off-by: Shannon Woods Authored-by: Jamie Madill

Do not check the texture's filtering mode in Texture*::updateTexture, instead…
eb3665c2 · Jamie Madill · Shannon Woods · e29d1672 · eb3665c2
Commit eb3665c2 authored Jul 19, 2013 by Jamie Madill Committed by Shannon Woods Jul 19, 2013
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 12 deletions

Texture.cpp src/libGLESv2/Texture.cpp +4 -12

No files found.
--- a/src/libGLESv2/Texture.cpp
+++ b/src/libGLESv2/Texture.cpp
@@ -807,9 +807,7 @@ void Texture2D::createTexture()
 void Texture2D::updateTexture()
 {
-    bool mipmapping = (isMipmapFiltered() && isMipmapComplete());
+    int levels = (isMipmapComplete() ? levelCount() : 1);
-    int levels = (mipmapping ? levelCount() : 1);
    for (int level = 0; level < levels; level++)
    {
@@ -1262,12 +1260,10 @@ void TextureCubeMap::createTexture()
 void TextureCubeMap::updateTexture()
 {
-    bool mipmapping = isMipmapFiltered() && isMipmapCubeComplete();
+    int levels = (isMipmapCubeComplete() ? levelCount() : 1);
    for (int face = 0; face < 6; face++)
    {
-        int levels = (mipmapping ? levelCount() : 1);
        for (int level = 0; level < levels; level++)
        {
            rx::Image *image = mImageArray[face][level];
@@ -1911,9 +1907,7 @@ void Texture3D::createTexture()
 void Texture3D::updateTexture()
 {
-    bool mipmapping = (isMipmapFiltered() && isMipmapComplete());
+    int levels = (isMipmapComplete() ? levelCount() : 1);
-    int levels = (mipmapping ? levelCount() : 1);
    for (int level = 0; level < levels; level++)
    {
@@ -2410,9 +2404,7 @@ void Texture2DArray::createTexture()
 void Texture2DArray::updateTexture()
 {
-    bool mipmapping = (isMipmapFiltered() && isMipmapComplete());
+    int levels = (isMipmapComplete() ? levelCount() : 1);
-    int levels = (mipmapping ? levelCount() : 1);
    for (int level = 0; level < levels; level++)
    {
        for (int layer = 0; layer < mLayerCounts[level]; layer++)