Subversion Repository Public Repository

Divide-Framework

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

Diff Revisions 895 vs 907 for /trunk/Source Code/Platform/Video/GFXDeviceObjects.cpp

Diff revisions: vs.
  @@ -166,19 +166,19 @@
166 166 const stringImpl& name,
167 167 const stringImpl& resourceName,
168 168 const stringImpl& resourceLocation,
169 - TextureType type,
170 169 bool isFlipped,
171 - bool asyncLoad) const {
170 + bool asyncLoad,
171 + const TextureDescriptor& texDescriptor) const {
172 172 // Texture is a resource! Do not use object arena!
173 173 Texture* temp = nullptr;
174 174 switch (_API_ID) {
175 175 case RenderAPI::OpenGL:
176 176 case RenderAPI::OpenGLES: {
177 177 /// Create and return a new texture. The callee is responsible for it's deletion!
178 - temp = MemoryManager_NEW glTexture(refThis(this), descriptorHash, name, resourceName, resourceLocation, type, isFlipped, asyncLoad);
178 + temp = MemoryManager_NEW glTexture(refThis(this), descriptorHash, name, resourceName, resourceLocation, isFlipped, asyncLoad, texDescriptor);
179 179 } break;
180 180 case RenderAPI::Direct3D: {
181 - temp = MemoryManager_NEW d3dTexture(refThis(this), descriptorHash, name, resourceName, resourceLocation, type, isFlipped, asyncLoad);
181 + temp = MemoryManager_NEW d3dTexture(refThis(this), descriptorHash, name, resourceName, resourceLocation, isFlipped, asyncLoad, texDescriptor);
182 182 } break;
183 183 default: {
184 184 DIVIDE_UNEXPECTED_CALL(Locale::get(_ID("ERROR_GFX_DEVICE_API")));