Temporarily turned off mipmap filter mode

Until mip-map generation is implemented, mipmap filtering should
not be set.

Change-Id: I95f7e2f648c4aecf71cb35b682f4ef5e3fd36e13
Signed-off-by: David Steele <david.steele@samsung.com>

diff --git a/automated-tests/src/dali-graphics/utc-Dali-GraphicsSampler.cpp b/automated-tests/src/dali-graphics/utc-Dali-GraphicsSampler.cpp
index 8f1994e..217fbd6 100644 (file)
--- a/automated-tests/src/dali-graphics/utc-Dali-GraphicsSampler.cpp
+++ b/automated-tests/src/dali-graphics/utc-Dali-GraphicsSampler.cpp
@@ -131,7 +131,10 @@ int UtcDaliGraphicsSamplerAllSet(void)
   auto params = glParamTrace.FindLastMatch("TexParameteri", minFilter);
   DALI_TEST_CHECK(params != nullptr);
   auto iter = params->find("param");
-  DALI_TEST_CHECK(*iter == GL_LINEAR_MIPMAP_NEAREST);
+
+  //@todo Change back when mip-map generation is implemented
+  //DALI_TEST_CHECK(*iter == GL_LINEAR_MIPMAP_NEAREST);
+  DALI_TEST_CHECK(*iter == GL_LINEAR);
 
   TraceCallStack::NamedParams magFilter;
   magFilter["pname"] << std::hex << GL_TEXTURE_MAG_FILTER;
@@ -161,5 +164,12 @@ int UtcDaliGraphicsSamplerAllSet(void)
   app.SendNotification();
   app.Render(16); // The above actor will get rendered and drawn once.
 
+  params = glParamTrace.FindLastMatch("TexParameteri", minFilter);
+  DALI_TEST_CHECK(params != nullptr);
+  iter = params->find("param");
+  //@todo Change back when mip-map generation is implemented
+  //DALI_TEST_CHECK(*iter == GL_NEAREST_MIPMAP_LINEAR);
+  DALI_TEST_CHECK(*iter == GL_NEAREST);
+
   END_TEST;
 }

diff --git a/dali/internal/graphics/gles-impl/gles-graphics-texture.cpp b/dali/internal/graphics/gles-impl/gles-graphics-texture.cpp
index 442583f..54fab1e 100644 (file)
--- a/dali/internal/graphics/gles-impl/gles-graphics-texture.cpp
+++ b/dali/internal/graphics/gles-impl/gles-graphics-texture.cpp
@@ -197,7 +197,10 @@ void Texture::Bind(const TextureBinding& binding) const
     auto*       sampler           = static_cast<const GLES::Sampler*>(binding.sampler);
     const auto& samplerCreateInfo = sampler->GetCreateInfo();
 
-    gl->TexParameteri(mGlTarget, GL_TEXTURE_MIN_FILTER, GLSamplerFilterAndMipMapMode(samplerCreateInfo.minFilter, samplerCreateInfo.mipMapMode).glFilter);
+    auto mipMapMode = samplerCreateInfo.mipMapMode;
+    mipMapMode      = Graphics::SamplerMipmapMode::NONE; // @todo Remove when mip-map generation is supported
+
+    gl->TexParameteri(mGlTarget, GL_TEXTURE_MIN_FILTER, GLSamplerFilterAndMipMapMode(samplerCreateInfo.minFilter, mipMapMode).glFilter);
     gl->TexParameteri(mGlTarget, GL_TEXTURE_MAG_FILTER, GLSamplerFilter(samplerCreateInfo.magFilter).glFilter);
     gl->TexParameteri(mGlTarget, GL_TEXTURE_WRAP_S, GLAddressMode(samplerCreateInfo.addressModeU).texParameter);
     gl->TexParameteri(mGlTarget, GL_TEXTURE_WRAP_T, GLAddressMode(samplerCreateInfo.addressModeV).texParameter);

diff --git a/dali/internal/graphics/gles-impl/gles-graphics-types.h b/dali/internal/graphics/gles-impl/gles-graphics-types.h
index 46946c8..4246adf 100644 (file)
--- a/dali/internal/graphics/gles-impl/gles-graphics-types.h
+++ b/dali/internal/graphics/gles-impl/gles-graphics-types.h
@@ -1073,7 +1073,7 @@ struct GLSamplerFilterAndMipMapMode
           }
           case Graphics::SamplerMipmapMode::LINEAR:
           {
-            glFilter = GL_NEAREST_MIPMAP_NEAREST;
+            glFilter = GL_NEAREST_MIPMAP_LINEAR;
             break;
           }
         }
@@ -1096,10 +1096,11 @@ struct GLSamplerFilterAndMipMapMode
           }
           case Graphics::SamplerMipmapMode::LINEAR:
           {
-            glFilter = GL_LINEAR_MIPMAP_NEAREST;
+            glFilter = GL_LINEAR_MIPMAP_LINEAR;
             break;
           }
         }
+        break;
       }
     }
   }