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

HL string fix

Browse Source
This commit is contained in:
Joshua Granick
2019-03-12 17:05:19 -07:00
parent 299ed974c7
commit 84694f104c
1 changed files with 36 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/lime/_internal/backend/native/NativeOpenGLRenderContext.hx
View File

@@ -1391,7 +1391,18 @@ class NativeOpenGLRenderContext
#if (lime_cffi && (lime_opengl || lime_opengles) && !macro) #if (lime_cffi && (lime_opengl || lime_opengles) && !macro)
#if hl #if hl
var object:{size:Int, type:Int, name:hl.Bytes} = {size: 0, type: 0, name: null}; var object:{size:Int, type:Int, name:hl.Bytes} = {size: 0, type: 0, name: null};
return NativeCFFI.lime_gl_get_active_attrib(__getObjectID(program), index, object); if (NativeCFFI.lime_gl_get_active_attrib(__getObjectID(program), index, object) != null)
{
return {
size: object.size,
type: object.type,
name: object.name != null ? @:privateAccess String.fromUTF8(object.name) : null
};
}
else
{
return null;
}
#else #else
return NativeCFFI.lime_gl_get_active_attrib(__getObjectID(program), index); return NativeCFFI.lime_gl_get_active_attrib(__getObjectID(program), index);
#end #end
@@ -1405,7 +1416,18 @@ class NativeOpenGLRenderContext
#if (lime_cffi && (lime_opengl || lime_opengles) && !macro) #if (lime_cffi && (lime_opengl || lime_opengles) && !macro)
#if hl #if hl
var object:{size:Int, type:Int, name:hl.Bytes} = {size: 0, type: 0, name: null}; var object:{size:Int, type:Int, name:hl.Bytes} = {size: 0, type: 0, name: null};
return NativeCFFI.lime_gl_get_active_uniform(__getObjectID(program), index, object); if (NativeCFFI.lime_gl_get_active_uniform(__getObjectID(program), index, object) != null)
{
return {
size: object.size,
type: object.type,
name: object.name != null ? @:privateAccess String.fromUTF8(object.name) : null
};
}
else
{
return null;
}
#else #else
return NativeCFFI.lime_gl_get_active_uniform(__getObjectID(program), index); return NativeCFFI.lime_gl_get_active_uniform(__getObjectID(program), index);
#end #end
@@ -2184,8 +2206,18 @@ class NativeOpenGLRenderContext
#if (lime_cffi && (lime_opengl || lime_opengles) && !macro) #if (lime_cffi && (lime_opengl || lime_opengles) && !macro)
#if hl #if hl
var object:{size:Int, type:Int, name:hl.Bytes} = {size: 0, type: 0, name: null}; var object:{size:Int, type:Int, name:hl.Bytes} = {size: 0, type: 0, name: null};
var result:Dynamic = NativeCFFI.lime_gl_get_transform_feedback_varying(__getObjectID(program), index, object); if (NativeCFFI.lime_gl_get_transform_feedback_varying(__getObjectID(program), index, object) != null)
return result; {
return {
size: object.size,
type: object.type,
name: object.name != null ? @:privateAccess String.fromUTF8(object.name) : null
};
}
else
{
return null;
}
#else #else
var result:Dynamic = NativeCFFI.lime_gl_get_transform_feedback_varying(__getObjectID(program), index); var result:Dynamic = NativeCFFI.lime_gl_get_transform_feedback_varying(__getObjectID(program), index);
return result; return result;