Ticket #1859: ModelCache.patch

Users/lancelot/Desktop/0ad-svn/trunk/source/renderer/ModelRenderer.cpp

@@ -453 +468 @@
             }
 
             SMRMaterialBucketKey key(model->GetMaterial().GetShaderEffect(), defs);
-            std::vector<CModel*>& bucketItems = materialBuckets[key];
-            bucketItems.push_back(model);
+            materialBuckets[key].push_back(model);
         }
     }
-
     std::vector<SMRSortByDistItem> sortByDistItems;
 
     std::vector<CShaderTechniquePtr> sortByDistTechs;
@@ -574 +587 @@
         size_t idxTechStart = 0;
         
         // This vector keeps track of texture changes during rendering. It is kept outside the
-        // loops to avoid excessive reallocations. The token allocation of 64 elements 
+        // loops to avoid excessive reallocations. The token allocation of 16 elements 
         // should be plenty, though it is reallocated below (at a cost) if necessary.
         std::vector<CTexture*> currentTexs;
-        currentTexs.reserve(64);
+        currentTexs.reserve(16);
         
         // texBindings holds the identifier bindings in the shader, which can no longer be defined 
         // statically in the ShaderRenderModifier class. texBindingNames uses interned strings to
         // keep track of when bindings need to be reevaluated.
         std::vector<CShaderProgram::Binding> texBindings;
-        texBindings.reserve(64);
+        texBindings.reserve(16);
         std::vector<CStrIntern> texBindingNames;
-        texBindingNames.reserve(64);
-
+        texBindingNames.reserve(16);
+        
+        // Initialize the arrays with default values.
+        for (int i = 0; i < 16; ++i)
+        {
+            texBindingNames.push_back(CStrIntern());
+            currentTexs.push_back(NULL);
+            texBindings.push_back(CShaderProgram::Binding());
+        }
+        
         while (idxTechStart < techBuckets.size())
         {
             CShaderTechniquePtr currentTech = techBuckets[idxTechStart].tech;
@@ -611 +632 @@
 
                 m->vertexRenderer->BeginPass(streamflags);
                 
-                // When the shader technique changes, textures need to be
-                // rebound, so ensure there are no remnants from the last pass.
-                // (the vector size is set to 0, but memory is not freed)
-                currentTexs.clear();
-                texBindings.clear();
-                texBindingNames.clear();
+                // reinitialize the values since we're using a new shader that has not be bound yet.
+                for (size_t i = 0; i < currentTexs.capacity(); ++i)
+                {
+                    texBindingNames[i] = CStrIntern();
+                    currentTexs[i] = NULL;
+                    texBindings[i] = CShaderProgram::Binding();
+                }
                 
                 CModelDef* currentModeldef = NULL;
                 CShaderUniforms currentStaticUniforms;
@@ -625 +647 @@
                 {
                     CModel** models = techBuckets[idx].models;
                     size_t numModels = techBuckets[idx].numModels;
+
                     for (size_t i = 0; i < numModels; ++i)
                     {
                         CModel* model = models[i];
@@ -637 +660 @@
                         
                         // make sure the vectors are the right virtual sizes, and also
                         // reallocate if there are more samplers than expected.
-                        if (currentTexs.size() != samplersNum)
+                        if (currentTexs.capacity() < samplersNum)
                         {
                             currentTexs.resize(samplersNum, NULL);
                             texBindings.resize(samplersNum, CShaderProgram::Binding());
                             texBindingNames.resize(samplersNum, CStrIntern());
-                            
-                            // ensure they are definitely empty
-                            std::fill(texBindings.begin(), texBindings.end(), CShaderProgram::Binding());
-                            std::fill(currentTexs.begin(), currentTexs.end(), (CTexture*)NULL);
-                            std::fill(texBindingNames.begin(), texBindingNames.end(), CStrIntern());
                         }
                         
                         // bind the samplers to the shader
@@ -657 +675 @@
                             CShaderProgram::Binding bind = texBindings[s];
                             // check that the handles are current
                             // and reevaluate them if necessary
-                            if (texBindingNames[s] == samp.Name && bind.Active())
+                            if (!(texBindingNames[s] == samp.Name))
                             {
-                                bind = texBindings[s];
-                            }
-                            else
-                            {
                                 bind = shader->GetTextureBinding(samp.Name.c_str());        
                                 texBindings[s] = bind;
                                 texBindingNames[s] = samp.Name;