Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Shader cleanup during viewport dispose #2

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Shader cleanup during viewport dispose #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/aerys/minko/render/Viewport.as
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ package aerys.minko.render

import aerys.minko.ns.minko_render;
import aerys.minko.render.resource.Context3DResource;
import aerys.minko.render.shader.Shader;
import aerys.minko.type.KeyboardManager;
import aerys.minko.type.MouseManager;
import aerys.minko.type.Signal;
Expand Down Expand Up @@ -314,6 +315,8 @@ package aerys.minko.render
_context3d = null;
}

Shader.dispose();

return ;
}

Expand Down
10 changes: 8 additions & 2 deletions src/aerys/minko/render/shader/Shader.as
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,11 @@ package aerys.minko.render.shader
private var _enabled : Boolean;
private var _defaultSettings : ShaderSettings;

private var _instances : Vector.<ShaderInstance>;
private static var _instances : Vector.<ShaderInstance>;
private var _numActiveInstances : uint;
private var _numRenderedInstances : uint;
private var _settings : Vector.<ShaderSettings>;
private var _programs : Vector.<Program3DResource>;
private static var _programs : Vector.<Program3DResource>;

private var _begin : Signal;
private var _end : Signal;
Expand Down Expand Up @@ -394,5 +394,11 @@ package aerys.minko.render.shader
_end.execute(this, context, backBuffer);
}
}

public static function dispose():void
{
_instances.length=0;
_programs.length=0;
}
}
}