Subversion Repository Public Repository

Divide-Framework

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

Diff Revisions 908 vs 909 for /trunk/Source Code/Platform/Video/OpenGL/Shaders/glShaderProgram.cpp

Diff revisions: vs.
  @@ -40,7 +40,7 @@
40 40 const stringImpl& resourceLocation,
41 41 bool asyncLoad)
42 42 : ShaderProgram(context, descriptorHash, name, resourceName, resourceLocation, asyncLoad),
43 - glObject(glObjectType::TYPE_SHADER_PROGRAM),
43 + glObject(glObjectType::TYPE_SHADER_PROGRAM, context),
44 44 _loadedFromBinary(false),
45 45 _validated(false),
46 46 _shaderProgramIDTemp(0),
  @@ -229,9 +229,9 @@
229 229 /// This should be called in the loading thread, but some issues are still
230 230 /// present, and it's not recommended (yet)
231 231 void glShaderProgram::threadedLoad(DELEGATE_CBK<void, CachedResource_wptr> onLoadCallback, bool skipRegister) {
232 - if (_asyncLoad) {
233 - GL_API::createOrValidateContextForCurrentThread();
234 - }
232 + if (_asyncLoad) {
233 + GL_API::createOrValidateContextForCurrentThread(_context);
234 + }
235 235
236 236 // Loading from binary gives us a linked program ready for usage.
237 237 if (!_loadedFromBinary) {