Revert "Merge pull request #5667 from secondlife/geenz/texture-channel-cherrypick"

This reverts commit 7f110d9fb54d050e0b25ea65294a53d2595fc89b, reversing
changes made to 5f91a3faf3ef0b9d0a6c3424fff119992dc0822a.

3 files changed, 0 insertions, 90 deletions

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 1ac4583dd3..d411eeb148 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -11860,22 +11860,6 @@
       <key>Value</key>
       <real>20.0</real>
     </map>
-    <key>TextureChannelPriority</key>
-    <map>
-      <key>Comment</key>
-      <string>Per-channel texture streaming aggressiveness. X=normals, Y=diffuse, Z=specular/metallic, W=emissive. 1.0=baseline, higher=more aggressive downrez.</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Vector4</string>
-      <key>Value</key>
-      <array>
-        <real>5</real>
-        <real>7.5</real>
-        <real>20</real>
-        <real>7.5</real>
-      </array>
-    </map>
     <key>TextureCameraBoost</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llfloatersettingsdebug.cpp b/indra/newview/llfloatersettingsdebug.cpp
index 92b3c92165..01108b5cfa 100644
--- a/indra/newview/llfloatersettingsdebug.cpp
+++ b/indra/newview/llfloatersettingsdebug.cpp
@@ -106,7 +106,6 @@ void LLFloaterSettingsDebug::onCommitSettings()
 
     LLVector3 vector;
     LLVector3d vectord;
-    LLVector4 vector4;
     LLQuaternion quat;
     LLRect rect;
     LLColor4 col4;
@@ -143,13 +142,6 @@ void LLFloaterSettingsDebug::onCommitSettings()
         vectord.mdV[VZ] = mValSpinner3->getValue().asReal();
         controlp->set(vectord.getValue());
         break;
-      case TYPE_VEC4:
-        vector4.mV[VX] = (F32)mValSpinner1->getValue().asReal();
-        vector4.mV[VY] = (F32)mValSpinner2->getValue().asReal();
-        vector4.mV[VZ] = (F32)mValSpinner3->getValue().asReal();
-        vector4.mV[VW] = (F32)mValSpinner4->getValue().asReal();
-        controlp->set(vector4.getValue());
-        break;
       case TYPE_QUAT:
         quat.mQ[VX] = mValSpinner1->getValueF32();
         quat.mQ[VY] = mValSpinner2->getValueF32();
@@ -360,40 +352,6 @@ void LLFloaterSettingsDebug::updateControl(LLControlVariable* controlp)
             }
             break;
           }
-          case TYPE_VEC4:
-          {
-              LLVector4 v;
-              v.setValue(sd);
-              mValSpinner1->setVisible(true);
-              mValSpinner1->setLabel(std::string("X"));
-              mValSpinner2->setVisible(true);
-              mValSpinner2->setLabel(std::string("Y"));
-              mValSpinner3->setVisible(true);
-              mValSpinner3->setLabel(std::string("Z"));
-              mValSpinner4->setVisible(true);
-              mValSpinner4->setLabel(std::string("W"));
-              if (!mValSpinner1->hasFocus())
-              {
-                  mValSpinner1->setPrecision(3);
-                  mValSpinner1->setValue(v[VX]);
-              }
-              if (!mValSpinner2->hasFocus())
-              {
-                  mValSpinner2->setPrecision(3);
-                  mValSpinner2->setValue(v[VY]);
-              }
-              if (!mValSpinner3->hasFocus())
-              {
-                  mValSpinner3->setPrecision(3);
-                  mValSpinner3->setValue(v[VZ]);
-              }
-              if (!mValSpinner4->hasFocus())
-              {
-                  mValSpinner4->setPrecision(3);
-                  mValSpinner4->setValue(v[VW]);
-              }
-              break;
-          }
           case TYPE_QUAT:
           {
               LLQuaternion q;
diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp
index 7dd32074cf..e4fd947892 100644
--- a/indra/newview/llviewertexturelist.cpp
+++ b/indra/newview/llviewertexturelist.cpp
@@ -1014,38 +1014,6 @@ void LLViewerTextureList::updateImageDecodePriority(LLViewerFetchedTexture* imag
         }
 
         imagep->addTextureStats(max_vsize);
-
-        // Derive stream priority channel from face lists.
-        // Map render texture channels to priority channels:
-        //   0 = normal, 1 = diffuse, 2 = specular, 3 = emissive
-        {
-            static const S32 render_to_priority[] = {
-                1,  // DIFFUSE_MAP (0)
-                0,  // NORMAL_MAP / ALTERNATE_DIFFUSE_MAP (1)
-                2,  // SPECULAR_MAP (2)
-                1,  // BASECOLOR_MAP (3)
-                2,  // METALLIC_ROUGHNESS_MAP (4)
-                0,  // GLTF_NORMAL_MAP (5)
-                3,  // EMISSIVE_MAP (6)
-            };
-
-            S32 priority_channel = 1; // default to diffuse
-            for (U32 i = 0; i < LLRender::NUM_TEXTURE_CHANNELS; ++i)
-            {
-                if (imagep->getNumFaces(i) > 0)
-                {
-                    priority_channel = llmin(priority_channel, render_to_priority[i]);
-                }
-            }
-
-            static LLCachedControl<LLVector4> channel_priority(gSavedSettings, "TextureChannelPriority",
-                LLVector4(10.0f, 20.0f, 40.0f, 20.0f));
-            F32 factor = llmax(channel_priority().mV[priority_channel], 0.1f);
-            if (factor != 1.0f)
-            {
-                imagep->mMaxVirtualSize /= factor;
-            }
-        }
     }
 
 #if 0