D3D9: do not spam unsupported HLSL targets & correct VTF format check

OGRECave · Feb 15, 2020 · c1910c4 · c1910c4
1 parent 17304da
commit c1910c4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/RenderSystems/Direct3D9/src/OgreD3D9HLSLProgram.cpp b/RenderSystems/Direct3D9/src/OgreD3D9HLSLProgram.cpp
@@ -649,24 +649,20 @@ namespace Ogre {
     //-----------------------------------------------------------------------
     void D3D9HLSLProgram::setTarget(const String& target)
     {
-        mTarget = "";
         std::vector<String> profiles = StringUtil::split(target, " ");
 
+        // find first supported format
         for(unsigned int i = 0 ; i < profiles.size() ; i++)
         {
             String & currentProfile = profiles[i];
             if(GpuProgramManager::getSingleton().isSyntaxSupported(currentProfile))
             {
                 mTarget = currentProfile;
-                break;
+                return;
             }
         }
 
-        if(mTarget == "")
-        {
-            LogManager::getSingleton().logMessage(
-                "Invalid target for D3D9 shader '" + mName + "' - '" + target + "'");
-        }
+        mTarget = profiles.front();
     }
 
     //-----------------------------------------------------------------------

diff --git a/RenderSystems/Direct3D9/src/OgreD3D9RenderSystem.cpp b/RenderSystems/Direct3D9/src/OgreD3D9RenderSystem.cpp
@@ -1496,9 +1496,7 @@ namespace Ogre
         for (uint ipf = static_cast<uint>(PF_L8); ipf < static_cast<uint>(PF_COUNT); ++ipf)
         {
             PixelFormat pf = (PixelFormat)ipf;
-
-            D3DFORMAT fmt = 
-                D3D9Mappings::_getPF(D3D9Mappings::_getClosestSupportedPF(pf));
+            D3DFORMAT fmt = D3D9Mappings::_getPF(pf);
 
             if (SUCCEEDED(mD3D->CheckDeviceFormat(
                 mActiveD3DDriver->getAdapterNumber(), D3DDEVTYPE_HAL, bbSurfDesc.Format,