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

Compile fix

Browse Source
This commit is contained in:
Joshua Granick
2016-11-15 19:42:45 -08:00
parent c4cd020f66
commit b72701ec0e
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lime/graphics/GLRenderContext.hx
View File

@@ -21,9 +21,11 @@ import lime.graphics.opengl.GLUniformLocation;
import js.html.CanvasElement; import js.html.CanvasElement;
#end #end
#if (js && html5)
@:native("WebGLRenderingContext") @:native("WebGLRenderingContext")
extern class HTML5GLRenderContext { #end
extern class GLRenderContext {
var ACTIVE_ATTRIBUTES:Int; var ACTIVE_ATTRIBUTES:Int;
@@ -448,19 +450,27 @@ extern class HTML5GLRenderContext {
function stencilOp (fail:Int, zfail:Int, zpass:Int):Void; function stencilOp (fail:Int, zfail:Int, zpass:Int):Void;
function stencilOpSeparate (face:Int, fail:Int, zfail:Int, zpass:Int):Void; function stencilOpSeparate (face:Int, fail:Int, zfail:Int, zpass:Int):Void;
/** Throws DOMException. */ /** Throws DOMException. */
#if (js && html5)
@:overload(function(target:Int, level:Int, internalformat:Int, width:Int, height:Int, border:Int, format:Int, type:Int, pixels:lime.utils.ArrayBufferView):Void {}) @:overload(function(target:Int, level:Int, internalformat:Int, width:Int, height:Int, border:Int, format:Int, type:Int, pixels:lime.utils.ArrayBufferView):Void {})
@:overload(function(target:Int, level:Int, internalformat:Int, format:Int, type:Int, pixels:js.html.ImageData):Void {}) @:overload(function(target:Int, level:Int, internalformat:Int, format:Int, type:Int, pixels:js.html.ImageData):Void {})
@:overload(function(target:Int, level:Int, internalformat:Int, format:Int, type:Int, image:js.html.ImageElement):Void {}) @:overload(function(target:Int, level:Int, internalformat:Int, format:Int, type:Int, image:js.html.ImageElement):Void {})
@:overload(function(target:Int, level:Int, internalformat:Int, format:Int, type:Int, canvas:js.html.CanvasElement):Void {}) @:overload(function(target:Int, level:Int, internalformat:Int, format:Int, type:Int, canvas:js.html.CanvasElement):Void {})
function texImage2D (target:Int, level:Int, internalformat:Int, format:Int, type:Int, video:js.html.VideoElement):Void; function texImage2D (target:Int, level:Int, internalformat:Int, format:Int, type:Int, video:js.html.VideoElement):Void;
#else
function texImage2D (target:Int, level:Int, internalformat:Int, width:Int, height:Int, border:Int, format:Int, type:Int, pixels:lime.utils.ArrayBufferView):Void;
#end
function texParameterf (target:Int, pname:Int, param:Float):Void; function texParameterf (target:Int, pname:Int, param:Float):Void;
function texParameteri (target:Int, pname:Int, param:Int):Void; function texParameteri (target:Int, pname:Int, param:Int):Void;
/** Throws DOMException. */ /** Throws DOMException. */
#if (js && html5)
@:overload(function(target:Int, level:Int, xoffset:Int, yoffset:Int, width:Int, height:Int, format:Int, type:Int, pixels:lime.utils.ArrayBufferView):Void {}) @:overload(function(target:Int, level:Int, xoffset:Int, yoffset:Int, width:Int, height:Int, format:Int, type:Int, pixels:lime.utils.ArrayBufferView):Void {})
@:overload(function(target:Int, level:Int, xoffset:Int, yoffset:Int, format:Int, type:Int, pixels:js.html.ImageData):Void {}) @:overload(function(target:Int, level:Int, xoffset:Int, yoffset:Int, format:Int, type:Int, pixels:js.html.ImageData):Void {})
@:overload(function(target:Int, level:Int, xoffset:Int, yoffset:Int, format:Int, type:Int, image:js.html.ImageElement):Void {}) @:overload(function(target:Int, level:Int, xoffset:Int, yoffset:Int, format:Int, type:Int, image:js.html.ImageElement):Void {})
@:overload(function(target:Int, level:Int, xoffset:Int, yoffset:Int, format:Int, type:Int, canvas:js.html.CanvasElement):Void {}) @:overload(function(target:Int, level:Int, xoffset:Int, yoffset:Int, format:Int, type:Int, canvas:js.html.CanvasElement):Void {})
function texSubImage2D (target:Int, level:Int, xoffset:Int, yoffset:Int, format:Int, type:Int, video:js.html.VideoElement):Void; function texSubImage2D (target:Int, level:Int, xoffset:Int, yoffset:Int, format:Int, type:Int, video:js.html.VideoElement):Void;
#else
function texSubImage2D (target:Int, level:Int, xoffset:Int, yoffset:Int, width:Int, height:Int, format:Int, type:Int, pixels:lime.utils.ArrayBufferView):Void;
#end
function uniform1f (location:GLUniformLocation, x:Float):Void; function uniform1f (location:GLUniformLocation, x:Float):Void;
function uniform1fv (location:GLUniformLocation, v:lime.utils.Float32Array):Void; function uniform1fv (location:GLUniformLocation, v:lime.utils.Float32Array):Void;
function uniform1i (location:GLUniformLocation, x:Int):Void; function uniform1i (location:GLUniformLocation, x:Int):Void;

2
lime/graphics/RenderContext.hx
View File

@@ -10,7 +10,7 @@ import lime.graphics.GLRenderContext;
enum RenderContext { enum RenderContext {
OPENGL (gl:GLRenderContext); OPENGL (gl:#if (!flash || display) GLRenderContext #else Dynamic #end);
CANVAS (context:CanvasRenderContext); CANVAS (context:CanvasRenderContext);
DOM (element:DOMRenderContext); DOM (element:DOMRenderContext);
FLASH (stage:FlashRenderContext); FLASH (stage:FlashRenderContext);