From b72701ec0e7c6c64fd3be2e460f8417d7f3b29cc Mon Sep 17 00:00:00 2001 From: Joshua Granick Date: Tue, 15 Nov 2016 19:42:45 -0800 Subject: [PATCH] Compile fix --- lime/graphics/GLRenderContext.hx | 14 ++++++++++++-- lime/graphics/RenderContext.hx | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/lime/graphics/GLRenderContext.hx b/lime/graphics/GLRenderContext.hx index a5041fecb..e4b040694 100644 --- a/lime/graphics/GLRenderContext.hx +++ b/lime/graphics/GLRenderContext.hx @@ -21,9 +21,11 @@ import lime.graphics.opengl.GLUniformLocation; import js.html.CanvasElement; #end - +#if (js && html5) @:native("WebGLRenderingContext") -extern class HTML5GLRenderContext { +#end + +extern class GLRenderContext { var ACTIVE_ATTRIBUTES:Int; @@ -448,19 +450,27 @@ extern class HTML5GLRenderContext { function stencilOp (fail:Int, zfail:Int, zpass:Int):Void; function stencilOpSeparate (face:Int, fail:Int, zfail:Int, zpass:Int):Void; /** 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, 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, canvas:js.html.CanvasElement):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 texParameteri (target:Int, pname:Int, param:Int):Void; /** 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, 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, canvas:js.html.CanvasElement):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 uniform1fv (location:GLUniformLocation, v:lime.utils.Float32Array):Void; function uniform1i (location:GLUniformLocation, x:Int):Void; diff --git a/lime/graphics/RenderContext.hx b/lime/graphics/RenderContext.hx index 7a9359e17..ad544b632 100644 --- a/lime/graphics/RenderContext.hx +++ b/lime/graphics/RenderContext.hx @@ -10,7 +10,7 @@ import lime.graphics.GLRenderContext; enum RenderContext { - OPENGL (gl:GLRenderContext); + OPENGL (gl:#if (!flash || display) GLRenderContext #else Dynamic #end); CANVAS (context:CanvasRenderContext); DOM (element:DOMRenderContext); FLASH (stage:FlashRenderContext);