Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 330 vs 331 for /trunk/Source Code/Hardware/Video/Shaders/ShaderManager.cpp

Diff revisions: vs.
  @@ -154,7 +154,7 @@
154 154 rewind(fp);
155 155 assert(count > 0);
156 156
157 - char* content = New char[count+1];
157 + char* content = MemoryManager_NEW char[count + 1];
158 158 count = (I32)(fread(content,sizeof(char),count,fp));
159 159 content[count] = '\0';
160 160 fclose(fp);
  @@ -162,7 +162,7 @@
162 162 // Add the code to the atom cache for future reference
163 163 hashAlg::pair<AtomMap::iterator, bool> result = hashAlg::emplace(_atoms, atomName, stringImpl(content));
164 164 assert(result.second);
165 - MemoryManager::SAFE_DELETE_ARRAY( content );
165 + MemoryManager::DELETE_ARRAY( content );
166 166
167 167 // Return the source code
168 168 return result.first->second;
  @@ -198,7 +198,7 @@
198 198 // Subtract one reference from it.
199 199 if (s->SubRef()) {
200 200 // If the new reference count is 0, delete the shader
201 - MemoryManager::SAFE_DELETE( it->second );
201 + MemoryManager::DELETE( it->second );
202 202 _shaderNameMap.erase(name);
203 203 }
204 204 }
  @@ -235,7 +235,7 @@
235 235 // At this stage, we have a valid Shader object, so load the source code
236 236 if (!shader->load(source)) {
237 237 // If loading the source code failed, delete it
238 - MemoryManager::SAFE_DELETE( shader );
238 + MemoryManager::DELETE( shader );
239 239 } else {
240 240 // If we loaded the source code successfully, either update it (if we recompiled) or register it
241 241 if(recompile) {