Subversion Repository Public Repository

Divide-Framework

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

Diff Revisions 831 vs 832 for /trunk/Source Code/Platform/Video/Shaders/ShaderProgram.cpp

Diff revisions: vs.
  @@ -154,8 +154,9 @@
154 154 assert(!location.empty());
155 155
156 156 // Open the atom file and add the code to the atom cache for future reference
157 - std::pair<AtomMap::iterator, bool> result =
158 - hashAlg::emplace(_atoms, atomNameHash, ReadTextFile(location + "/" + atomName));
157 + stringImpl output;
158 + readFile(location + "/" + atomName, output, FileType::TEXT);
159 + std::pair<AtomMap::iterator, bool> result = hashAlg::emplace(_atoms, atomNameHash, output);
159 160
160 161 assert(result.second);
161 162
  @@ -175,9 +176,9 @@
175 176 } else {
176 177 variant.append(".release");
177 178 }
178 - ReadTextFile(variant, sourceCodeOut);
179 + readFile(variant, sourceCodeOut, FileType::TEXT);
179 180 } else {
180 - ReadTextFile(filePath, sourceCodeOut);
181 + readFile(filePath, sourceCodeOut, FileType::TEXT);
181 182 }
182 183 }
183 184
  @@ -192,7 +193,7 @@
192 193 variant.append(".release");
193 194 }
194 195
195 - WriteTextFile(variant, sourceCode);
196 + writeFile(variant, sourceCode, FileType::TEXT);
196 197 }
197 198
198 199 void ShaderProgram::onStartup(ResourceCache& parentCache) {