kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve OpenGL GC

Browse Source
This commit is contained in:
Joshua Granick
2017-03-16 10:06:52 -07:00
parent 4afc34ea57
commit 6ebfa17d5d
3 changed files with 33 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lime/_backend/native/NativeCFFI.hx
View File

@@ -521,8 +521,8 @@ class NativeCFFI {
@:cffi private static function lime_gl_line_width (width:Float32):Void; @:cffi private static function lime_gl_line_width (width:Float32):Void;
@:cffi private static function lime_gl_link_program (program:Int):Void; @:cffi private static function lime_gl_link_program (program:Int):Void;
@:cffi private static function lime_gl_object_deregister (object:Dynamic):Void; @:cffi private static function lime_gl_object_deregister (object:Dynamic):Void;
@:cffi private static function lime_gl_object_from_id (id:Int):Dynamic; @:cffi private static function lime_gl_object_from_id (id:Int, type:Int):Dynamic;
@:cffi private static function lime_gl_object_register (type:Int, id:Int, object:Dynamic):Void; @:cffi private static function lime_gl_object_register (id:Int, type:Int, object:Dynamic):Void;
@:cffi private static function lime_gl_pixel_storei (pname:Int, param:Int):Void; @:cffi private static function lime_gl_pixel_storei (pname:Int, param:Int):Void;
@:cffi private static function lime_gl_polygon_offset (factor:Float32, units:Float32):Void; @:cffi private static function lime_gl_polygon_offset (factor:Float32, units:Float32):Void;
@:cffi private static function lime_gl_read_pixels (x:Int, y:Int, width:Int, height:Int, format:Int, type:Int, pixels:DataPointer):Void; @:cffi private static function lime_gl_read_pixels (x:Int, y:Int, width:Int, height:Int, format:Int, type:Int, pixels:DataPointer):Void;

2
lime/graphics/opengl/GL.hx
View File

@@ -3050,7 +3050,7 @@ class GL {
public static function fromInt (type:GLObjectType, id:Int):GLObject { public static function fromInt (type:GLObjectType, id:Int):GLObject {
#if (lime_cffi && lime_opengl && !macro) #if (lime_cffi && lime_opengl && !macro)
var object = NativeCFFI.lime_gl_object_from_id (id); var object = NativeCFFI.lime_gl_object_from_id (id, type);
if (object != null) { if (object != null) {

45
project/src/graphics/opengl/OpenGLBindings.cpp
View File

@@ -31,7 +31,7 @@ namespace lime {
int OpenGLBindings::defaultFramebuffer = 0; int OpenGLBindings::defaultFramebuffer = 0;
std::map<GLuint, value> glObjects; std::map<GLObjectType, std::map <GLuint, value> > glObjects;
std::map<value, GLuint> glObjectIDs; std::map<value, GLuint> glObjectIDs;
std::map<value, GLObjectType> glObjectTypes; std::map<value, GLObjectType> glObjectTypes;
@@ -46,11 +46,12 @@ namespace lime {
if (glObjectIDs.find (object) != glObjectIDs.end ()) { if (glObjectIDs.find (object) != glObjectIDs.end ()) {
GLuint id = glObjectIDs[object]; GLuint id = glObjectIDs[object];
GLObjectType type = glObjectTypes[object];
gc_gl_id.push_back (id); gc_gl_id.push_back (id);
gc_gl_type.push_back (glObjectTypes[object]); gc_gl_type.push_back (type);
glObjects.erase (id); glObjects[type].erase (id);
glObjectIDs.erase (object); glObjectIDs.erase (object);
glObjectTypes.erase (object); glObjectTypes.erase (object);
@@ -67,6 +68,7 @@ namespace lime {
gc_gl_mutex.Lock (); gc_gl_mutex.Lock ();
int size = gc_gl_id.size (); int size = gc_gl_id.size ();
GLuint id; GLuint id;
GLObjectType type; GLObjectType type;
@@ -1066,26 +1068,25 @@ namespace lime {
if (glObjectIDs.find (object) != glObjectIDs.end ()) { if (glObjectIDs.find (object) != glObjectIDs.end ()) {
int id = glObjectIDs[object]; GLuint id = glObjectIDs[object];
GLObjectType type = glObjectTypes[object];
glObjects[type].erase (id);
glObjectTypes.erase (object); glObjectTypes.erase (object);
glObjectIDs.erase (object); glObjectIDs.erase (object);
if (glObjects[id] == object) {
glObjects.erase (id);
}
} }
} }
value lime_gl_object_from_id (int id) { value lime_gl_object_from_id (int id, int type) {
if (glObjects.find (id) != glObjects.end ()) { GLObjectType _type = (GLObjectType)type;
if (glObjects[_type].find (id) != glObjects[_type].end ()) {
return glObjects[id]; return glObjects[_type][id];
} else { } else {
@@ -1098,9 +1099,23 @@ namespace lime {
void lime_gl_object_register (int id, int type, value object) { void lime_gl_object_register (int id, int type, value object) {
GLObjectType _type = (GLObjectType)type;
//if (glObjects[_type].find (id) != glObjects[_type].end ()) {
//
//value otherObject = glObjects[_type][id];
//if (otherObject == object) return;
//
//glObjectTypes.erase (otherObject);
//glObjectIDs.erase (object);
//
//val_gc (otherObject, 0);
//
//}
glObjectTypes[object] = (GLObjectType)type; glObjectTypes[object] = (GLObjectType)type;
glObjectIDs[object] = id; glObjectIDs[object] = id;
glObjects[id] = object; glObjects[_type][id] = object;
val_gc (object, gc_gl_object); val_gc (object, gc_gl_object);
@@ -1588,7 +1603,7 @@ namespace lime {
DEFINE_PRIME1v (lime_gl_line_width); DEFINE_PRIME1v (lime_gl_line_width);
DEFINE_PRIME1v (lime_gl_link_program); DEFINE_PRIME1v (lime_gl_link_program);
DEFINE_PRIME1v (lime_gl_object_deregister); DEFINE_PRIME1v (lime_gl_object_deregister);
DEFINE_PRIME1 (lime_gl_object_from_id); DEFINE_PRIME2 (lime_gl_object_from_id);
DEFINE_PRIME3v (lime_gl_object_register); DEFINE_PRIME3v (lime_gl_object_register);
DEFINE_PRIME2v (lime_gl_pixel_storei); DEFINE_PRIME2v (lime_gl_pixel_storei);
DEFINE_PRIME2v (lime_gl_polygon_offset); DEFINE_PRIME2v (lime_gl_polygon_offset);