From 257f966bd31be8cd682ecf52f05d8788f3fcc12e Mon Sep 17 00:00:00 2001 From: Yun Hsiao Wu Date: Mon, 1 Jul 2019 09:31:37 +0800 Subject: [PATCH] fix pass & GL constants Changelog: * (#4762) * fix material props when using pass switches * don't rely on WebGLRenderingContext static constants * skybox precision --- cocos/3d/assets/material.ts | 7 +- cocos/3d/assets/skeleton.ts | 5 +- cocos/3d/builtin/effects.ts | 26 +- cocos/3d/framework/avatar-model-component.ts | 6 +- .../batched-skinning-model-component.ts | 8 +- .../renderer/particle-system-renderer.ts | 6 +- cocos/3d/framework/renderable-component.ts | 2 +- .../3d/framework/skinning-model-component.ts | 2 +- cocos/3d/ui/components/ui-model-component.ts | 4 +- cocos/gfx/webgl/webgl-command-buffer.ts | 6 +- cocos/gfx/webgl/webgl-commands.ts | 740 +++++++------- cocos/gfx/webgl/webgl-device.ts | 30 +- cocos/gfx/webgl/webgl-gpu-objects.ts | 12 +- cocos/gfx/webgl/webgl-input-assembler.ts | 6 +- cocos/gfx/webgl/webgl-pipeline-state.ts | 28 +- cocos/gfx/webgl/webgl-sampler.ts | 28 +- cocos/gfx/webgl2/webgl2-commands.ts | 924 +++++++++--------- cocos/gfx/webgl2/webgl2-device.ts | 38 +- cocos/gfx/webgl2/webgl2-input-assembler.ts | 6 +- cocos/gfx/webgl2/webgl2-pipeline-state.ts | 28 +- cocos/renderer/models/skinning-model.ts | 2 +- 21 files changed, 960 insertions(+), 954 deletions(-) diff --git a/cocos/3d/assets/material.ts b/cocos/3d/assets/material.ts index de98179feb..abd653135d 100644 --- a/cocos/3d/assets/material.ts +++ b/cocos/3d/assets/material.ts @@ -80,7 +80,7 @@ interface IMaterialInfo { export class Material extends Asset { /** * @zh - * 获取材质资源的实例,您应当不会需要手动调用这个函数。 + * 获取材质资源的实例,应当不会需要手动调用这个函数。 */ public static getInstantiatedMaterial (mat: Material, rndCom: RenderableComponent, inEditor: boolean) { if (mat._owner === rndCom) { @@ -365,10 +365,11 @@ export class Material extends Asset { states: this._states, }); // handle property values - this._props.length = this._passes.length; + const totalPasses = this._effectAsset.techniques[this._techIdx].passes.length; + this._props.length = totalPasses; if (keepProps) { this._passes.forEach((pass, i) => { - let props = this._props[i]; + let props = this._props[pass.idxInTech]; if (!props) { props = this._props[i] = {}; } for (const p of Object.keys(props)) { const val = props[p]; diff --git a/cocos/3d/assets/skeleton.ts b/cocos/3d/assets/skeleton.ts index 59851a7163..1bb060e619 100644 --- a/cocos/3d/assets/skeleton.ts +++ b/cocos/3d/assets/skeleton.ts @@ -45,9 +45,9 @@ export class Skeleton extends Asset { private _joints: string[] = []; @property([Mat4]) - private _bindposes: Mat4[] | null = null; + private _bindposes: Mat4[] = []; - private _bindTRS: IBindTRS[] | null = null; + private _bindTRS: IBindTRS[] = []; /** * 所有关节的绑定姿势矩阵。该数组的长度始终与 `this.joints` 的长度相同。 @@ -58,7 +58,6 @@ export class Skeleton extends Asset { set bindposes (value) { this._bindposes = value; - if (!value) { this._bindTRS = null; return; } this._bindTRS = value.map((m) => { const position = new Vec3(); const rotation = new Quat(); diff --git a/cocos/3d/builtin/effects.ts b/cocos/3d/builtin/effects.ts index c171c722aa..a6ab54b595 100644 --- a/cocos/3d/builtin/effects.ts +++ b/cocos/3d/builtin/effects.ts @@ -140,13 +140,13 @@ export default [ "shaders": [ { "name": "builtin-skybox|sky-vs:vert|sky-fs:frag", - "hash": 4014289351, + "hash": 1349172928, "glsl3": { - "vert": `\nprecision mediump float;\nuniform CCGlobal {\n vec4 cc_time;\n vec4 cc_screenSize;\n vec4 cc_screenScale;\n vec4 cc_nativeSize;\n mat4 cc_matView;\n mat4 cc_matViewInv;\n mat4 cc_matProj;\n mat4 cc_matProjInv;\n mat4 cc_matViewProj;\n mat4 cc_matViewProjInv;\n vec4 cc_cameraPos;\n vec4 cc_exposure;\n vec4 cc_mainLitDir;\n vec4 cc_mainLitColor;\n vec4 cc_ambientSky;\n vec4 cc_ambientGround;\n};\nin vec3 a_position;\nvoid CCDecode (out vec3 position) {\n position = a_position;\n}\n#if CC_USE_SKINNING\nstruct StandardAttributes {\n vec3 position;\n vec3 normal;\n vec3 tangent;\n};\nin vec4 a_weights;\nin vec4 a_joints;\n#if CC_USE_SKINNING == 1\n uniform CCSkinning {\n vec4 cc_jointsData[30 * 3];\n };\n#else\n uniform CCSkinningTexture {\n vec4 cc_jointsTextureSizeInv;\n };\n uniform sampler2D cc_jointsTexture;\n#endif\n#if CC_USE_SKINNING == 2\n float decode32(highp vec4 rgba) {\n rgba = rgba * 255.0;\n float Sign = 1.0 - step(128.0, rgba[3]) * 2.0;\n float Exponent = 2.0 * mod(rgba[3], 128.0) + step(128.0, rgba[2]) - 127.0;\n float Mantissa = mod(rgba[2], 128.0) * 65536.0 + rgba[1] * 256.0 + rgba[0] + 8388608.0;\n return Sign * exp2(Exponent - 23.0) * Mantissa;\n }\n#endif\n#if CC_USE_SKINNING == 1\n vec3 getJointDQ(float i, out vec4 Qr, out vec4 Qt) {\n int idx = 3 * int(i);\n Qr = cc_jointsData[idx];\n Qt = cc_jointsData[idx + 1];\n return cc_jointsData[idx + 2].xyz;\n }\n#elif CC_USE_SKINNING == 2\n vec3 getJointDQ(float i, out vec4 Qr, out vec4 Qt) {\n float y = (i + 0.5) * cc_jointsTextureSizeInv.y;\n Qr = vec4(\n decode32(texture(cc_jointsTexture, vec2((0.5 / 12.0), y))),\n decode32(texture(cc_jointsTexture, vec2((1.5 / 12.0), y))),\n decode32(texture(cc_jointsTexture, vec2((2.5 / 12.0), y))),\n decode32(texture(cc_jointsTexture, vec2((3.5 / 12.0), y)))\n );\n Qt = vec4(\n decode32(texture(cc_jointsTexture, vec2((4.5 / 12.0), y))),\n decode32(texture(cc_jointsTexture, vec2((5.5 / 12.0), y))),\n decode32(texture(cc_jointsTexture, vec2((6.5 / 12.0), y))),\n decode32(texture(cc_jointsTexture, vec2((7.5 / 12.0), y)))\n );\n return vec3(\n decode32(texture(cc_jointsTexture, vec2((8.5 / 12.0), y))),\n decode32(texture(cc_jointsTexture, vec2((9.5 / 12.0), y))),\n decode32(texture(cc_jointsTexture, vec2((10.5 / 12.0), y)))\n );\n }\n#elif CC_USE_SKINNING == 3\n vec3 getJointDQ(float i, out vec4 Qr, out vec4 Qt) {\n float y = (i + 0.5) * cc_jointsTextureSizeInv.y;\n Qr = texture(cc_jointsTexture, vec2((0.5 / 3.0), y));\n Qt = texture(cc_jointsTexture, vec2((1.5 / 3.0), y));\n return texture(cc_jointsTexture, vec2((2.5 / 3.0), y)).xyz;\n }\n#endif\nvoid skinRTS(out vec4 R, out vec3 T, out vec3 S) {\n vec4 r, t, Qt = vec4(0.0);\n R = vec4(0.0); S = vec3(0.0);\n for (int i = 0; i < 4; i++) {\n float w = a_weights[i];\n S += getJointDQ(a_joints[i], r, t) * w;\n R += r * w; Qt += t * w;\n }\n float invNorm = 1.0 / length(R); R *= invNorm; Qt *= invNorm;\n T = 2.0 * (R.w * Qt.xyz - Qt.w * R.xyz + cross(R.xyz, Qt.xyz));\n}\nvec3 VectorTransformQuat(vec3 v, vec4 Q) {\n return v + 2.0 * cross(Q.xyz, cross(Q.xyz, v) + Q.w * v);\n}\nvoid CCSkin(inout vec3 position) {\n vec4 R; vec3 T, S;\n skinRTS(R, T, S);\n position = VectorTransformQuat(position * S, R) + T;\n}\nvoid CCSkin(inout StandardAttributes attr) {\n vec4 R; vec3 T, S;\n skinRTS(R, T, S);\n attr.position = VectorTransformQuat(attr.position * S, R) + T;\n attr.normal = VectorTransformQuat(attr.normal, R);\n attr.tangent = VectorTransformQuat(attr.tangent, R);\n}\n#endif\nvoid CCVertInput (out highp vec3 position) {\n CCDecode(position);\n #if CC_USE_SKINNING\n CCSkin(position);\n #endif\n}\nout vec3 viewDir;\nvec4 vert () {\n CCVertInput(viewDir);\n mat4 matViewRotOnly = mat4(mat3(cc_matView));\n vec4 clipPos = cc_matProj * matViewRotOnly * vec4(viewDir, 1.0);\n vec4 pos = clipPos;\n pos.z = clipPos.w * 0.99999;\n return pos;\n}\nvoid main() { gl_Position = vert(); }\n`, + "vert": `\nprecision mediump float;\nuniform CCGlobal {\n vec4 cc_time;\n vec4 cc_screenSize;\n vec4 cc_screenScale;\n vec4 cc_nativeSize;\n mat4 cc_matView;\n mat4 cc_matViewInv;\n mat4 cc_matProj;\n mat4 cc_matProjInv;\n mat4 cc_matViewProj;\n mat4 cc_matViewProjInv;\n vec4 cc_cameraPos;\n vec4 cc_exposure;\n vec4 cc_mainLitDir;\n vec4 cc_mainLitColor;\n vec4 cc_ambientSky;\n vec4 cc_ambientGround;\n};\nin vec3 a_position;\nvoid CCDecode (out vec3 position) {\n position = a_position;\n}\n#if CC_USE_SKINNING\nstruct StandardAttributes {\n vec3 position;\n vec3 normal;\n vec3 tangent;\n};\nin vec4 a_weights;\nin vec4 a_joints;\n#if CC_USE_SKINNING == 1\n uniform CCSkinning {\n vec4 cc_jointsData[30 * 3];\n };\n#else\n uniform CCSkinningTexture {\n vec4 cc_jointsTextureSizeInv;\n };\n uniform sampler2D cc_jointsTexture;\n#endif\n#if CC_USE_SKINNING == 2\n float decode32(highp vec4 rgba) {\n rgba = rgba * 255.0;\n float Sign = 1.0 - step(128.0, rgba[3]) * 2.0;\n float Exponent = 2.0 * mod(rgba[3], 128.0) + step(128.0, rgba[2]) - 127.0;\n float Mantissa = mod(rgba[2], 128.0) * 65536.0 + rgba[1] * 256.0 + rgba[0] + 8388608.0;\n return Sign * exp2(Exponent - 23.0) * Mantissa;\n }\n#endif\n#if CC_USE_SKINNING == 1\n vec3 getJointDQ(float i, out vec4 Qr, out vec4 Qt) {\n int idx = 3 * int(i);\n Qr = cc_jointsData[idx];\n Qt = cc_jointsData[idx + 1];\n return cc_jointsData[idx + 2].xyz;\n }\n#elif CC_USE_SKINNING == 2\n vec3 getJointDQ(float i, out vec4 Qr, out vec4 Qt) {\n float y = (i + 0.5) * cc_jointsTextureSizeInv.y;\n Qr = vec4(\n decode32(texture(cc_jointsTexture, vec2((0.5 / 12.0), y))),\n decode32(texture(cc_jointsTexture, vec2((1.5 / 12.0), y))),\n decode32(texture(cc_jointsTexture, vec2((2.5 / 12.0), y))),\n decode32(texture(cc_jointsTexture, vec2((3.5 / 12.0), y)))\n );\n Qt = vec4(\n decode32(texture(cc_jointsTexture, vec2((4.5 / 12.0), y))),\n decode32(texture(cc_jointsTexture, vec2((5.5 / 12.0), y))),\n decode32(texture(cc_jointsTexture, vec2((6.5 / 12.0), y))),\n decode32(texture(cc_jointsTexture, vec2((7.5 / 12.0), y)))\n );\n return vec3(\n decode32(texture(cc_jointsTexture, vec2((8.5 / 12.0), y))),\n decode32(texture(cc_jointsTexture, vec2((9.5 / 12.0), y))),\n decode32(texture(cc_jointsTexture, vec2((10.5 / 12.0), y)))\n );\n }\n#elif CC_USE_SKINNING == 3\n vec3 getJointDQ(float i, out vec4 Qr, out vec4 Qt) {\n float y = (i + 0.5) * cc_jointsTextureSizeInv.y;\n Qr = texture(cc_jointsTexture, vec2((0.5 / 3.0), y));\n Qt = texture(cc_jointsTexture, vec2((1.5 / 3.0), y));\n return texture(cc_jointsTexture, vec2((2.5 / 3.0), y)).xyz;\n }\n#endif\nvoid skinRTS(out vec4 R, out vec3 T, out vec3 S) {\n vec4 r, t, Qt = vec4(0.0);\n R = vec4(0.0); S = vec3(0.0);\n for (int i = 0; i < 4; i++) {\n float w = a_weights[i];\n S += getJointDQ(a_joints[i], r, t) * w;\n R += r * w; Qt += t * w;\n }\n float invNorm = 1.0 / length(R); R *= invNorm; Qt *= invNorm;\n T = 2.0 * (R.w * Qt.xyz - Qt.w * R.xyz + cross(R.xyz, Qt.xyz));\n}\nvec3 VectorTransformQuat(vec3 v, vec4 Q) {\n return v + 2.0 * cross(Q.xyz, cross(Q.xyz, v) + Q.w * v);\n}\nvoid CCSkin(inout vec3 position) {\n vec4 R; vec3 T, S;\n skinRTS(R, T, S);\n position = VectorTransformQuat(position * S, R) + T;\n}\nvoid CCSkin(inout StandardAttributes attr) {\n vec4 R; vec3 T, S;\n skinRTS(R, T, S);\n attr.position = VectorTransformQuat(attr.position * S, R) + T;\n attr.normal = VectorTransformQuat(attr.normal, R);\n attr.tangent = VectorTransformQuat(attr.tangent, R);\n}\n#endif\nvoid CCVertInput (out highp vec3 position) {\n CCDecode(position);\n #if CC_USE_SKINNING\n CCSkin(position);\n #endif\n}\nout vec3 viewDir;\nvec4 vert () {\n CCVertInput(viewDir);\n mat4 matViewRotOnly = mat4(mat3(cc_matView));\n highp vec4 pos = cc_matProj * matViewRotOnly * vec4(viewDir, 1.0);\n pos.z = pos.w * 0.99999;\n return pos;\n}\nvoid main() { gl_Position = vert(); }\n`, "frag": `\nprecision mediump float;\nuniform samplerCube cc_environment;\nvec3 unpackNormal(vec4 nmap) {\n return nmap.xyz * 2.0 - 1.0;\n}\nvec3 unpackRGBE(vec4 rgbe) {\n return rgbe.rgb * pow(2.0, rgbe.a * 255.0 - 128.0);\n}\nvec3 SRGBToLinear(vec3 gamma)\n{\n return pow(gamma, vec3(2.2));\n}\nvec3 LinearToSRGB(vec3 linear)\n{\n return pow(linear, vec3(0.454545));\n}\nuniform CCGlobal {\n vec4 cc_time;\n vec4 cc_screenSize;\n vec4 cc_screenScale;\n vec4 cc_nativeSize;\n mat4 cc_matView;\n mat4 cc_matViewInv;\n mat4 cc_matProj;\n mat4 cc_matProjInv;\n mat4 cc_matViewProj;\n mat4 cc_matViewProjInv;\n vec4 cc_cameraPos;\n vec4 cc_exposure;\n vec4 cc_mainLitDir;\n vec4 cc_mainLitColor;\n vec4 cc_ambientSky;\n vec4 cc_ambientGround;\n};\nvec4 CCFragOutput(vec4 color) {\n #if CC_USE_HDR\n color.rgb = mix(color.rgb, SRGBToLinear(color.rgb) * cc_exposure.w, vec3(cc_exposure.z));\n #endif\n return color;\n}\nin vec3 viewDir;\nvec4 frag () {\n #if USE_RGBE_CUBEMAP\n vec3 c = unpackRGBE(texture(cc_environment, viewDir));\n c = LinearToSRGB(c / (1.0 + c));\n vec4 o = vec4(c, 1.0);\n #else\n vec4 o = texture(cc_environment, viewDir);\n #endif\n return CCFragOutput(o);\n}\nout vec4 cc_FragColor;\nvoid main() { cc_FragColor = frag(); }\n` }, "glsl1": { - "vert": `\nprecision mediump float;\nuniform mat4 cc_matView;\nuniform mat4 cc_matProj;\nattribute vec3 a_position;\nvoid CCDecode (out vec3 position) {\n position = a_position;\n}\n#if CC_USE_SKINNING\nstruct StandardAttributes {\n vec3 position;\n vec3 normal;\n vec3 tangent;\n};\nattribute vec4 a_weights;\nattribute vec4 a_joints;\n#if CC_USE_SKINNING == 1\n uniform vec4 cc_jointsData[90];\n#else\n uniform vec4 cc_jointsTextureSizeInv;\n uniform sampler2D cc_jointsTexture;\n#endif\n#if CC_USE_SKINNING == 2\n float decode32(highp vec4 rgba) {\n rgba = rgba * 255.0;\n float Sign = 1.0 - step(128.0, rgba[3]) * 2.0;\n float Exponent = 2.0 * mod(rgba[3], 128.0) + step(128.0, rgba[2]) - 127.0;\n float Mantissa = mod(rgba[2], 128.0) * 65536.0 + rgba[1] * 256.0 + rgba[0] + 8388608.0;\n return Sign * exp2(Exponent - 23.0) * Mantissa;\n }\n#endif\n#if CC_USE_SKINNING == 1\n vec3 getJointDQ(float i, out vec4 Qr, out vec4 Qt) {\n int idx = 3 * int(i);\n Qr = cc_jointsData[idx];\n Qt = cc_jointsData[idx + 1];\n return cc_jointsData[idx + 2].xyz;\n }\n#elif CC_USE_SKINNING == 2\n vec3 getJointDQ(float i, out vec4 Qr, out vec4 Qt) {\n float y = (i + 0.5) * cc_jointsTextureSizeInv.y;\n Qr = vec4(\n decode32(texture2D(cc_jointsTexture, vec2((0.5 / 12.0), y))),\n decode32(texture2D(cc_jointsTexture, vec2((1.5 / 12.0), y))),\n decode32(texture2D(cc_jointsTexture, vec2((2.5 / 12.0), y))),\n decode32(texture2D(cc_jointsTexture, vec2((3.5 / 12.0), y)))\n );\n Qt = vec4(\n decode32(texture2D(cc_jointsTexture, vec2((4.5 / 12.0), y))),\n decode32(texture2D(cc_jointsTexture, vec2((5.5 / 12.0), y))),\n decode32(texture2D(cc_jointsTexture, vec2((6.5 / 12.0), y))),\n decode32(texture2D(cc_jointsTexture, vec2((7.5 / 12.0), y)))\n );\n return vec3(\n decode32(texture2D(cc_jointsTexture, vec2((8.5 / 12.0), y))),\n decode32(texture2D(cc_jointsTexture, vec2((9.5 / 12.0), y))),\n decode32(texture2D(cc_jointsTexture, vec2((10.5 / 12.0), y)))\n );\n }\n#elif CC_USE_SKINNING == 3\n vec3 getJointDQ(float i, out vec4 Qr, out vec4 Qt) {\n float y = (i + 0.5) * cc_jointsTextureSizeInv.y;\n Qr = texture2D(cc_jointsTexture, vec2((0.5 / 3.0), y));\n Qt = texture2D(cc_jointsTexture, vec2((1.5 / 3.0), y));\n return texture2D(cc_jointsTexture, vec2((2.5 / 3.0), y)).xyz;\n }\n#endif\nvoid skinRTS(out vec4 R, out vec3 T, out vec3 S) {\n vec4 r, t, Qt = vec4(0.0);\n R = vec4(0.0); S = vec3(0.0);\n for (int i = 0; i < 4; i++) {\n float w = a_weights[i];\n S += getJointDQ(a_joints[i], r, t) * w;\n R += r * w; Qt += t * w;\n }\n float invNorm = 1.0 / length(R); R *= invNorm; Qt *= invNorm;\n T = 2.0 * (R.w * Qt.xyz - Qt.w * R.xyz + cross(R.xyz, Qt.xyz));\n}\nvec3 VectorTransformQuat(vec3 v, vec4 Q) {\n return v + 2.0 * cross(Q.xyz, cross(Q.xyz, v) + Q.w * v);\n}\nvoid CCSkin(inout vec3 position) {\n vec4 R; vec3 T, S;\n skinRTS(R, T, S);\n position = VectorTransformQuat(position * S, R) + T;\n}\nvoid CCSkin(inout StandardAttributes attr) {\n vec4 R; vec3 T, S;\n skinRTS(R, T, S);\n attr.position = VectorTransformQuat(attr.position * S, R) + T;\n attr.normal = VectorTransformQuat(attr.normal, R);\n attr.tangent = VectorTransformQuat(attr.tangent, R);\n}\n#endif\nvoid CCVertInput (out highp vec3 position) {\n CCDecode(position);\n #if CC_USE_SKINNING\n CCSkin(position);\n #endif\n}\nvarying vec3 viewDir;\nvec4 vert () {\n CCVertInput(viewDir);\n mat4 matViewRotOnly = mat4(mat3(cc_matView));\n vec4 clipPos = cc_matProj * matViewRotOnly * vec4(viewDir, 1.0);\n vec4 pos = clipPos;\n pos.z = clipPos.w * 0.99999;\n return pos;\n}\nvoid main() { gl_Position = vert(); }\n`, + "vert": `\nprecision mediump float;\nuniform mat4 cc_matView;\nuniform mat4 cc_matProj;\nattribute vec3 a_position;\nvoid CCDecode (out vec3 position) {\n position = a_position;\n}\n#if CC_USE_SKINNING\nstruct StandardAttributes {\n vec3 position;\n vec3 normal;\n vec3 tangent;\n};\nattribute vec4 a_weights;\nattribute vec4 a_joints;\n#if CC_USE_SKINNING == 1\n uniform vec4 cc_jointsData[90];\n#else\n uniform vec4 cc_jointsTextureSizeInv;\n uniform sampler2D cc_jointsTexture;\n#endif\n#if CC_USE_SKINNING == 2\n float decode32(highp vec4 rgba) {\n rgba = rgba * 255.0;\n float Sign = 1.0 - step(128.0, rgba[3]) * 2.0;\n float Exponent = 2.0 * mod(rgba[3], 128.0) + step(128.0, rgba[2]) - 127.0;\n float Mantissa = mod(rgba[2], 128.0) * 65536.0 + rgba[1] * 256.0 + rgba[0] + 8388608.0;\n return Sign * exp2(Exponent - 23.0) * Mantissa;\n }\n#endif\n#if CC_USE_SKINNING == 1\n vec3 getJointDQ(float i, out vec4 Qr, out vec4 Qt) {\n int idx = 3 * int(i);\n Qr = cc_jointsData[idx];\n Qt = cc_jointsData[idx + 1];\n return cc_jointsData[idx + 2].xyz;\n }\n#elif CC_USE_SKINNING == 2\n vec3 getJointDQ(float i, out vec4 Qr, out vec4 Qt) {\n float y = (i + 0.5) * cc_jointsTextureSizeInv.y;\n Qr = vec4(\n decode32(texture2D(cc_jointsTexture, vec2((0.5 / 12.0), y))),\n decode32(texture2D(cc_jointsTexture, vec2((1.5 / 12.0), y))),\n decode32(texture2D(cc_jointsTexture, vec2((2.5 / 12.0), y))),\n decode32(texture2D(cc_jointsTexture, vec2((3.5 / 12.0), y)))\n );\n Qt = vec4(\n decode32(texture2D(cc_jointsTexture, vec2((4.5 / 12.0), y))),\n decode32(texture2D(cc_jointsTexture, vec2((5.5 / 12.0), y))),\n decode32(texture2D(cc_jointsTexture, vec2((6.5 / 12.0), y))),\n decode32(texture2D(cc_jointsTexture, vec2((7.5 / 12.0), y)))\n );\n return vec3(\n decode32(texture2D(cc_jointsTexture, vec2((8.5 / 12.0), y))),\n decode32(texture2D(cc_jointsTexture, vec2((9.5 / 12.0), y))),\n decode32(texture2D(cc_jointsTexture, vec2((10.5 / 12.0), y)))\n );\n }\n#elif CC_USE_SKINNING == 3\n vec3 getJointDQ(float i, out vec4 Qr, out vec4 Qt) {\n float y = (i + 0.5) * cc_jointsTextureSizeInv.y;\n Qr = texture2D(cc_jointsTexture, vec2((0.5 / 3.0), y));\n Qt = texture2D(cc_jointsTexture, vec2((1.5 / 3.0), y));\n return texture2D(cc_jointsTexture, vec2((2.5 / 3.0), y)).xyz;\n }\n#endif\nvoid skinRTS(out vec4 R, out vec3 T, out vec3 S) {\n vec4 r, t, Qt = vec4(0.0);\n R = vec4(0.0); S = vec3(0.0);\n for (int i = 0; i < 4; i++) {\n float w = a_weights[i];\n S += getJointDQ(a_joints[i], r, t) * w;\n R += r * w; Qt += t * w;\n }\n float invNorm = 1.0 / length(R); R *= invNorm; Qt *= invNorm;\n T = 2.0 * (R.w * Qt.xyz - Qt.w * R.xyz + cross(R.xyz, Qt.xyz));\n}\nvec3 VectorTransformQuat(vec3 v, vec4 Q) {\n return v + 2.0 * cross(Q.xyz, cross(Q.xyz, v) + Q.w * v);\n}\nvoid CCSkin(inout vec3 position) {\n vec4 R; vec3 T, S;\n skinRTS(R, T, S);\n position = VectorTransformQuat(position * S, R) + T;\n}\nvoid CCSkin(inout StandardAttributes attr) {\n vec4 R; vec3 T, S;\n skinRTS(R, T, S);\n attr.position = VectorTransformQuat(attr.position * S, R) + T;\n attr.normal = VectorTransformQuat(attr.normal, R);\n attr.tangent = VectorTransformQuat(attr.tangent, R);\n}\n#endif\nvoid CCVertInput (out highp vec3 position) {\n CCDecode(position);\n #if CC_USE_SKINNING\n CCSkin(position);\n #endif\n}\nvarying vec3 viewDir;\nvec4 vert () {\n CCVertInput(viewDir);\n mat4 matViewRotOnly = mat4(mat3(cc_matView));\n highp vec4 pos = cc_matProj * matViewRotOnly * vec4(viewDir, 1.0);\n pos.z = pos.w * 0.99999;\n return pos;\n}\nvoid main() { gl_Position = vert(); }\n`, "frag": `\nprecision mediump float;\nuniform samplerCube cc_environment;\nvec3 unpackNormal(vec4 nmap) {\n return nmap.xyz * 2.0 - 1.0;\n}\nvec3 unpackRGBE(vec4 rgbe) {\n return rgbe.rgb * pow(2.0, rgbe.a * 255.0 - 128.0);\n}\nvec3 SRGBToLinear(vec3 gamma)\n{\n return pow(gamma, vec3(2.2));\n}\nvec3 LinearToSRGB(vec3 linear)\n{\n return pow(linear, vec3(0.454545));\n}\nuniform vec4 cc_exposure;\nvec4 CCFragOutput(vec4 color) {\n #if CC_USE_HDR\n color.rgb = mix(color.rgb, SRGBToLinear(color.rgb) * cc_exposure.w, vec3(cc_exposure.z));\n #endif\n return color;\n}\nvarying vec3 viewDir;\nvec4 frag () {\n #if USE_RGBE_CUBEMAP\n vec3 c = unpackRGBE(textureCube(cc_environment, viewDir));\n c = LinearToSRGB(c / (1.0 + c));\n vec4 o = vec4(c, 1.0);\n #else\n vec4 o = textureCube(cc_environment, viewDir);\n #endif\n return CCFragOutput(o);\n}\nvoid main() { gl_FragColor = frag(); }\n` }, "builtins": {"globals":{"blocks":["CCGlobal"], "samplers":["cc_environment"]}, "locals":{"blocks":["CCSkinning", "CCSkinningTexture"], "samplers":["cc_jointsTexture"]}}, @@ -194,19 +194,19 @@ export default [ { "name": "builtin-standard", "techniques": [ - {"name":"opaque", "passes":[{"program":"builtin-standard|standard-vs:vert|standard-fs:frag", "properties":{"tilingOffset":{"value":[1, 1, 0, 0], "type":16}, "albedo":{"value":[1, 1, 1, 1], "inspector":{"type":"color"}, "type":16}, "albedoScale":{"value":[1, 1, 1, 0], "type":16}, "pbrParams":{"value":[0.8, 0.6, 1, 1], "type":16}, "pbrScale":{"value":[1, 1, 1, 1], "type":16}, "emissive":{"value":[0, 0, 0, 1], "inspector":{"type":"color"}, "type":16}, "emissiveScale":{"value":[1, 1, 1, 1], "type":16}, "albedoMap":{"value":"grey", "type":28}, "normalMap":{"value":"normal", "type":28}, "pbrMap":{"value":"grey", "type":28}, "emissiveMap":{"value":"grey", "type":28}}}]} + {"name":"opaque", "passes":[{"program":"builtin-standard|standard-vs:vert|standard-fs:frag", "properties":{"tilingOffset":{"value":[1, 1, 0, 0], "type":16}, "albedo":{"value":[1, 1, 1, 1], "inspector":{"type":"color"}, "type":16}, "albedoScale":{"value":[1, 1, 1, 0], "type":16}, "pbrParams":{"value":[0.8, 0.6, 1, 1], "type":16}, "pbrScale":{"value":[1, 1, 1, 1], "type":16}, "emissive":{"value":[0, 0, 0, 1], "inspector":{"type":"color"}, "type":16}, "emissiveScale":{"value":[1, 1, 1, 1], "type":16}, "albedoMap":{"value":"grey", "type":28}, "normalMap":{"value":"normal", "type":28}, "pbrMap":{"value":"grey", "type":28}, "metallicRoughnessMap":{"value":"grey", "type":28}, "occlusionMap":{"value":"white", "type":28}, "emissiveMap":{"value":"grey", "type":28}}}]} ], "shaders": [ { "name": "builtin-standard|standard-vs:vert|standard-fs:frag", - "hash": 157415429, + "hash": 2722729507, "glsl3": { - "vert": `\nprecision mediump float;\nuniform CCGlobal {\n vec4 cc_time;\n vec4 cc_screenSize;\n vec4 cc_screenScale;\n vec4 cc_nativeSize;\n mat4 cc_matView;\n mat4 cc_matViewInv;\n mat4 cc_matProj;\n mat4 cc_matProjInv;\n mat4 cc_matViewProj;\n mat4 cc_matViewProjInv;\n vec4 cc_cameraPos;\n vec4 cc_exposure;\n vec4 cc_mainLitDir;\n vec4 cc_mainLitColor;\n vec4 cc_ambientSky;\n vec4 cc_ambientGround;\n};\nuniform CCLocal {\n highp mat4 cc_matWorld;\n mat4 cc_matWorldIT;\n};\nstruct StandardAttributes {\n vec3 position;\n vec3 normal;\n vec3 tangent;\n};\nin vec3 a_position;\nin vec3 a_normal;\nin vec3 a_tangent;\nvoid CCDecode (out StandardAttributes attr) {\n attr.position = a_position;\n attr.normal = a_normal;\n attr.tangent = a_tangent;\n}\n#if CC_USE_SKINNING\nin vec4 a_weights;\nin vec4 a_joints;\n#if CC_USE_SKINNING == 1\n uniform CCSkinning {\n vec4 cc_jointsData[30 * 3];\n };\n#else\n uniform CCSkinningTexture {\n vec4 cc_jointsTextureSizeInv;\n };\n uniform sampler2D cc_jointsTexture;\n#endif\n#if CC_USE_SKINNING == 2\n float decode32(highp vec4 rgba) {\n rgba = rgba * 255.0;\n float Sign = 1.0 - step(128.0, rgba[3]) * 2.0;\n float Exponent = 2.0 * mod(rgba[3], 128.0) + step(128.0, rgba[2]) - 127.0;\n float Mantissa = mod(rgba[2], 128.0) * 65536.0 + rgba[1] * 256.0 + rgba[0] + 8388608.0;\n return Sign * exp2(Exponent - 23.0) * Mantissa;\n }\n#endif\n#if CC_USE_SKINNING == 1\n vec3 getJointDQ(float i, out vec4 Qr, out vec4 Qt) {\n int idx = 3 * int(i);\n Qr = cc_jointsData[idx];\n Qt = cc_jointsData[idx + 1];\n return cc_jointsData[idx + 2].xyz;\n }\n#elif CC_USE_SKINNING == 2\n vec3 getJointDQ(float i, out vec4 Qr, out vec4 Qt) {\n float y = (i + 0.5) * cc_jointsTextureSizeInv.y;\n Qr = vec4(\n decode32(texture(cc_jointsTexture, vec2((0.5 / 12.0), y))),\n decode32(texture(cc_jointsTexture, vec2((1.5 / 12.0), y))),\n decode32(texture(cc_jointsTexture, vec2((2.5 / 12.0), y))),\n decode32(texture(cc_jointsTexture, vec2((3.5 / 12.0), y)))\n );\n Qt = vec4(\n decode32(texture(cc_jointsTexture, vec2((4.5 / 12.0), y))),\n decode32(texture(cc_jointsTexture, vec2((5.5 / 12.0), y))),\n decode32(texture(cc_jointsTexture, vec2((6.5 / 12.0), y))),\n decode32(texture(cc_jointsTexture, vec2((7.5 / 12.0), y)))\n );\n return vec3(\n decode32(texture(cc_jointsTexture, vec2((8.5 / 12.0), y))),\n decode32(texture(cc_jointsTexture, vec2((9.5 / 12.0), y))),\n decode32(texture(cc_jointsTexture, vec2((10.5 / 12.0), y)))\n );\n }\n#elif CC_USE_SKINNING == 3\n vec3 getJointDQ(float i, out vec4 Qr, out vec4 Qt) {\n float y = (i + 0.5) * cc_jointsTextureSizeInv.y;\n Qr = texture(cc_jointsTexture, vec2((0.5 / 3.0), y));\n Qt = texture(cc_jointsTexture, vec2((1.5 / 3.0), y));\n return texture(cc_jointsTexture, vec2((2.5 / 3.0), y)).xyz;\n }\n#endif\nvoid skinRTS(out vec4 R, out vec3 T, out vec3 S) {\n vec4 r, t, Qt = vec4(0.0);\n R = vec4(0.0); S = vec3(0.0);\n for (int i = 0; i < 4; i++) {\n float w = a_weights[i];\n S += getJointDQ(a_joints[i], r, t) * w;\n R += r * w; Qt += t * w;\n }\n float invNorm = 1.0 / length(R); R *= invNorm; Qt *= invNorm;\n T = 2.0 * (R.w * Qt.xyz - Qt.w * R.xyz + cross(R.xyz, Qt.xyz));\n}\nvec3 VectorTransformQuat(vec3 v, vec4 Q) {\n return v + 2.0 * cross(Q.xyz, cross(Q.xyz, v) + Q.w * v);\n}\nvoid CCSkin(inout vec3 position) {\n vec4 R; vec3 T, S;\n skinRTS(R, T, S);\n position = VectorTransformQuat(position * S, R) + T;\n}\nvoid CCSkin(inout StandardAttributes attr) {\n vec4 R; vec3 T, S;\n skinRTS(R, T, S);\n attr.position = VectorTransformQuat(attr.position * S, R) + T;\n attr.normal = VectorTransformQuat(attr.normal, R);\n attr.tangent = VectorTransformQuat(attr.tangent, R);\n}\n#endif\nstruct StandardVertInput {\n highp vec3 position;\n vec3 normal;\n vec3 tangent;\n};\nvoid CCAttrToInput (in StandardAttributes attr, out StandardVertInput In) {\n In.position = attr.position;\n In.normal = attr.normal;\n In.tangent = attr.tangent;\n}\nvoid CCVertInput (out StandardVertInput In) {\n StandardAttributes attr;\n CCDecode(attr);\n #if CC_USE_SKINNING\n CCSkin(attr);\n #endif\n CCAttrToInput(attr, In);\n}\nuniform Constants {\n vec4 tilingOffset;\n vec4 albedo;\n vec4 albedoScale;\n vec4 pbrParams;\n vec4 pbrScale;\n vec4 emissive;\n vec4 emissiveScale;\n};\nout vec3 v_position;\nout vec3 v_normal;\n#if USE_NORMAL_MAP\n out vec3 v_tangent;\n out vec3 v_bitangent;\n#endif\n#if USE_ALBEDO_MAP || USE_NORMAL_MAP || USE_PBR_MAP || USE_EMISSIVE_MAP\n in vec2 a_texCoord;\n out vec2 v_uv;\n#endif\nvec4 vert () {\n StandardVertInput In;\n CCVertInput(In);\n vec4 pos = cc_matWorld * vec4(In.position, 1.0);\n v_position = pos.xyz;\n v_normal = (cc_matWorldIT * vec4(In.normal, 0.0)).xyz;\n #if USE_NORMAL_MAP\n v_tangent = (cc_matWorldIT * vec4(In.tangent, 0.0)).xyz;\n v_bitangent = cross(v_tangent, v_normal);\n #endif\n #if USE_ALBEDO_MAP || USE_NORMAL_MAP || USE_PBR_MAP || USE_EMISSIVE_MAP\n v_uv = a_texCoord * tilingOffset.xy + tilingOffset.zw;\n #endif\n return cc_matViewProj * pos;\n}\nvoid main() { gl_Position = vert(); }\n`, - "frag": `\nprecision mediump float;\nuniform CCGlobal {\n vec4 cc_time;\n vec4 cc_screenSize;\n vec4 cc_screenScale;\n vec4 cc_nativeSize;\n mat4 cc_matView;\n mat4 cc_matViewInv;\n mat4 cc_matProj;\n mat4 cc_matProjInv;\n mat4 cc_matViewProj;\n mat4 cc_matViewProjInv;\n vec4 cc_cameraPos;\n vec4 cc_exposure;\n vec4 cc_mainLitDir;\n vec4 cc_mainLitColor;\n vec4 cc_ambientSky;\n vec4 cc_ambientGround;\n};\nuniform CCForwardLight {\n highp vec4 cc_sphereLitPos[2];\n vec4 cc_sphereLitSizeRange[2];\n vec4 cc_sphereLitColor[2];\n highp vec4 cc_spotLitPos[2];\n vec4 cc_spotLitSizeRangeAngle[2];\n vec4 cc_spotLitDir[2];\n vec4 cc_spotLitColor[2];\n};\n#if CC_USE_IBL\nuniform samplerCube cc_environment;\n#endif\n#define saturate(a) clamp( a, 0.0, 1.0 )\nvec3 SRGBToLinear(vec3 gamma)\n{\n return pow(gamma, vec3(2.2));\n}\nvec3 LinearToSRGB(vec3 linear)\n{\n return pow(linear, vec3(0.454545));\n}\nfloat SmoothDistAtt2(float distSqr, float invSqrAttRadius) {\n float factor = distSqr * invSqrAttRadius;\n float factor2 = factor * factor;\n float factor3 = factor2 * factor2;\n float smoothFactor = clamp(1.0 - factor3 * factor3, 0.0, 1.0);\n return smoothFactor * smoothFactor;\n}\nfloat SmoothDistAtt(float distSqr, float invSqrAttRadius) {\n float factor = distSqr * invSqrAttRadius;\n float smoothFactor = clamp(1.0 - factor * factor, 0.0, 1.0);\n return smoothFactor * smoothFactor;\n}\nfloat GetDistAtt(float distSqr, float invSqrAttRadius) {\n float attenuation = 1.0 / max(distSqr, 0.01*0.01);\n attenuation *= SmoothDistAtt(distSqr , invSqrAttRadius);\n return attenuation;\n}\nfloat GetAngleAtt(vec3 L, vec3 litDir, float litAngleScale, float litAngleOffset) {\n float cd = dot(litDir, L);\n float attenuation = clamp(cd * litAngleScale + litAngleOffset, 0.0, 1.0);\n return (attenuation * attenuation);\n}\nfloat GGXMobile(float roughness, float NoH, vec3 H, vec3 N) {\n vec3 NxH = cross(N, H);\n float OneMinusNoHSqr = dot(NxH, NxH);\n float a = roughness * roughness;\n float n = NoH * a;\n float p = a / (OneMinusNoHSqr + n * n);\n return p * p;\n}\nfloat CalcSpecular(float roughness, float NoH, vec3 H, vec3 N) {\n return (roughness*0.25 + 0.25) * GGXMobile(roughness, NoH, H, N);\n}\nvec3 BRDFApprox(vec3 specular, float roughness, float NoV) {\n const vec4 c0 = vec4(-1.0, -0.0275, -0.572, 0.022);\n const vec4 c1 = vec4(1.0, 0.0425, 1.04, -0.04);\n vec4 r = roughness * c0 + c1;\n float a004 = min( r.x * r.x, exp2( -9.28 * NoV ) ) * r.x + r.y;\n vec2 AB = vec2( -1.04, 1.04 ) * a004 + r.zw;\n AB.y *= clamp(50.0 * specular.g, 0.0, 1.0);\n return specular * AB.x + AB.y;\n}\nvec3 CalcDynamicLighting(vec3 worldPos, vec3 N, vec3 V, vec3 diffuse, vec3 specular, float roughness) {\n vec3 lighting = vec3(0.0);\n vec3 diffuseContrib = diffuse / 3.14159265359;\n for (int i = 0; i < 2; i++) {\n vec3 PLU = cc_sphereLitPos[i].xyz - worldPos;\n vec3 PL = normalize(PLU);\n vec3 PH = normalize(PL+V);\n float PNL = max(dot(N, PL), 0.001);\n float PNH = max(dot(N, PH), 0.0);\n float distSqr = dot(PLU, PLU);\n float litRadius = cc_sphereLitSizeRange[i].x;\n float litRadiusSqr = litRadius * litRadius;\n float illum = 3.14159265359 * (litRadiusSqr / max(litRadiusSqr , distSqr));\n float attRadiusSqrInv = 1.0 / max(cc_sphereLitSizeRange[i].y, 0.01);\n attRadiusSqrInv *= attRadiusSqrInv;\n float att = GetDistAtt(distSqr, attRadiusSqrInv);\n vec3 lspec = specular * CalcSpecular(roughness, PNH, PH, N);\n lighting += PNL * cc_sphereLitColor[i].rgb * cc_sphereLitColor[i].w * illum * att * (diffuseContrib + lspec);\n }\n for (int i = 0; i < 2; i++) {\n vec3 SLU = cc_spotLitPos[i].xyz - worldPos;\n vec3 SL = normalize(SLU);\n vec3 SH = normalize(SL+V);\n float SNL = max(dot(N, SL), 0.001);\n float SNH = max(dot(N, SH), 0.0);\n float distSqr = dot(SLU, SLU);\n float litRadius = cc_spotLitSizeRangeAngle[i].x;\n float litRadiusSqr = litRadius * litRadius;\n float illum = 3.14159265359 * (litRadiusSqr / max(litRadiusSqr , distSqr));\n float attRadiusSqrInv = 1.0 / max(cc_spotLitSizeRangeAngle[i].y, 0.01);\n attRadiusSqrInv *= attRadiusSqrInv;\n float cosInner = max(dot(-cc_spotLitDir[i].xyz, SL), 0.01);\n float cosOuter = cc_spotLitSizeRangeAngle[i].z;\n float litAngleScale = 1.0 / max(0.001, cosInner - cosOuter);\n float litAngleOffset = -cosOuter * litAngleScale;\n float att = GetDistAtt(distSqr, attRadiusSqrInv);\n att *= GetAngleAtt(SL, -cc_spotLitDir[i].xyz, litAngleScale, litAngleOffset);\n vec3 lspec = specular * CalcSpecular(roughness, SNH, SH, N);\n lighting += SNL * cc_spotLitColor[i].rgb * cc_spotLitColor[i].w * illum * att * (diffuseContrib + lspec);\n }\n return lighting;\n}\nstruct StandardSurface {\n vec3 albedo;\n float alpha;\n vec3 position;\n vec3 normal;\n float roughness;\n float metallic;\n float occlusion;\n vec3 emissive;\n};\nvec4 CCStandardShading (StandardSurface s) {\n vec3 diffuse = s.albedo * (1.0 - s.metallic);\n vec3 specular = mix(vec3(0.04), s.albedo, s.metallic);\n vec3 V = normalize(cc_cameraPos.xyz - s.position);\n vec3 L = normalize(-cc_mainLitDir.xyz);\n vec3 H = normalize(L+V);\n float NV = max(abs(dot(s.normal, V)), 0.001);\n float NL = max(dot(s.normal, L), 0.001);\n float NH = max(dot(s.normal, H), 0.0);\n specular = BRDFApprox(specular, s.roughness, NV);\n vec3 specularContrib = specular * CalcSpecular(s.roughness, NH, H, s.normal);\n vec3 diffuseContrib = diffuse / 3.14159265359;\n vec3 finalColor = NL * cc_mainLitColor.rgb * cc_mainLitColor.w * (diffuseContrib + specularContrib);\n finalColor += CalcDynamicLighting(s.position, s.normal, V, diffuse, specular, s.roughness);\n float fAmb = dot(s.normal, vec3(0.0, -1.0, 0.0)) * 0.5 + 0.5;\n vec3 ambDiff = mix(cc_ambientSky.rgb, cc_ambientGround.rgb, fAmb) * cc_ambientSky.w;\n finalColor += (ambDiff.rgb * diffuse);\n #if CC_USE_IBL\n vec3 R = normalize(reflect(-V, s.normal));\n vec3 env = SRGBToLinear(texture(cc_environment, R).rgb) * cc_ambientSky.w;\n finalColor += env * specular;\n #endif\n finalColor = finalColor * s.occlusion;\n #if CC_USE_HDR\n s.emissive *= cc_exposure.w;\n #endif\n finalColor += s.emissive;\n return vec4(finalColor, s.alpha);\n}\nvec4 CCFragOutput (vec4 color) {\n #if !CC_USE_HDR\n color.rgb = LinearToSRGB(color.rgb);\n #endif\n return color;\n}\nuniform Constants {\n vec4 tilingOffset;\n vec4 albedo;\n vec4 albedoScale;\n vec4 pbrParams;\n vec4 pbrScale;\n vec4 emissive;\n vec4 emissiveScale;\n};\nin vec3 v_position;\n#if USE_ALBEDO_MAP || USE_NORMAL_MAP || USE_PBR_MAP || USE_EMISSIVE_MAP\n in vec2 v_uv;\n#endif\nin vec3 v_normal;\n#if USE_NORMAL_MAP\n in vec3 v_tangent;\n in vec3 v_bitangent;\n#endif\n#if USE_ALBEDO_MAP\n uniform sampler2D albedoMap;\n#endif\n#if USE_NORMAL_MAP\n uniform sampler2D normalMap;\n#endif\n#if USE_PBR_MAP\n uniform sampler2D pbrMap;\n#endif\n#if USE_EMISSIVE_MAP\n uniform sampler2D emissiveMap;\n#endif\nvoid surf (out StandardSurface s) {\n vec4 baseColor = albedo;\n #if USE_ALBEDO_MAP\n vec4 texColor = texture(albedoMap, v_uv);\n texColor.rgb = SRGBToLinear(texColor.rgb);\n baseColor *= texColor;\n #endif\n s.albedo = baseColor.rgb * albedoScale.xyz;\n s.alpha = albedo.a;\n #if USE_ALPHA_TEST\n if(s.alpha < albedoScale.w)\n discard;\n #endif\n s.normal = normalize(v_normal);\n #if USE_NORMAL_MAP\n vec3 nmmp = texture(normalMap, v_uv).xyz - vec3(0.5);\n s.normal = normalize(\n nmmp.x * normalize(v_tangent) +\n nmmp.y * normalize(v_bitangent) +\n nmmp.z * s.normal);\n #endif\n s.position = v_position;\n #if USE_PBR_MAP\n vec4 pbr = texture(pbrMap, v_uv);\n #else\n vec4 pbr = pbrParams;\n #endif\n pbr *= pbrScale;\n s.roughness = clamp(pbr.ROUGHNESS_CHANNEL, 0.04, 1.0);\n s.metallic = clamp(pbr.METALLIC_CHANNEL, 0.0, 0.96);\n s.occlusion = pbr.AO_CHANNEL;\n s.emissive = emissive.rgb * emissiveScale.xyz;\n #if USE_EMISSIVE_MAP\n s.emissive *= SRGBToLinear(texture(emissiveMap, v_uv).rgb);\n #endif\n}\nvec4 frag () {\n StandardSurface s; surf(s);\n vec4 color = CCStandardShading(s);\n return CCFragOutput(color);\n}\nout vec4 cc_FragColor;\nvoid main() { cc_FragColor = frag(); }\n` + "vert": `\nprecision mediump float;\nuniform CCGlobal {\n vec4 cc_time;\n vec4 cc_screenSize;\n vec4 cc_screenScale;\n vec4 cc_nativeSize;\n mat4 cc_matView;\n mat4 cc_matViewInv;\n mat4 cc_matProj;\n mat4 cc_matProjInv;\n mat4 cc_matViewProj;\n mat4 cc_matViewProjInv;\n vec4 cc_cameraPos;\n vec4 cc_exposure;\n vec4 cc_mainLitDir;\n vec4 cc_mainLitColor;\n vec4 cc_ambientSky;\n vec4 cc_ambientGround;\n};\nuniform CCLocal {\n highp mat4 cc_matWorld;\n mat4 cc_matWorldIT;\n};\nstruct StandardAttributes {\n vec3 position;\n vec3 normal;\n vec3 tangent;\n};\nin vec3 a_position;\nin vec3 a_normal;\nin vec3 a_tangent;\nvoid CCDecode (out StandardAttributes attr) {\n attr.position = a_position;\n attr.normal = a_normal;\n attr.tangent = a_tangent;\n}\n#if CC_USE_SKINNING\nin vec4 a_weights;\nin vec4 a_joints;\n#if CC_USE_SKINNING == 1\n uniform CCSkinning {\n vec4 cc_jointsData[30 * 3];\n };\n#else\n uniform CCSkinningTexture {\n vec4 cc_jointsTextureSizeInv;\n };\n uniform sampler2D cc_jointsTexture;\n#endif\n#if CC_USE_SKINNING == 2\n float decode32(highp vec4 rgba) {\n rgba = rgba * 255.0;\n float Sign = 1.0 - step(128.0, rgba[3]) * 2.0;\n float Exponent = 2.0 * mod(rgba[3], 128.0) + step(128.0, rgba[2]) - 127.0;\n float Mantissa = mod(rgba[2], 128.0) * 65536.0 + rgba[1] * 256.0 + rgba[0] + 8388608.0;\n return Sign * exp2(Exponent - 23.0) * Mantissa;\n }\n#endif\n#if CC_USE_SKINNING == 1\n vec3 getJointDQ(float i, out vec4 Qr, out vec4 Qt) {\n int idx = 3 * int(i);\n Qr = cc_jointsData[idx];\n Qt = cc_jointsData[idx + 1];\n return cc_jointsData[idx + 2].xyz;\n }\n#elif CC_USE_SKINNING == 2\n vec3 getJointDQ(float i, out vec4 Qr, out vec4 Qt) {\n float y = (i + 0.5) * cc_jointsTextureSizeInv.y;\n Qr = vec4(\n decode32(texture(cc_jointsTexture, vec2((0.5 / 12.0), y))),\n decode32(texture(cc_jointsTexture, vec2((1.5 / 12.0), y))),\n decode32(texture(cc_jointsTexture, vec2((2.5 / 12.0), y))),\n decode32(texture(cc_jointsTexture, vec2((3.5 / 12.0), y)))\n );\n Qt = vec4(\n decode32(texture(cc_jointsTexture, vec2((4.5 / 12.0), y))),\n decode32(texture(cc_jointsTexture, vec2((5.5 / 12.0), y))),\n decode32(texture(cc_jointsTexture, vec2((6.5 / 12.0), y))),\n decode32(texture(cc_jointsTexture, vec2((7.5 / 12.0), y)))\n );\n return vec3(\n decode32(texture(cc_jointsTexture, vec2((8.5 / 12.0), y))),\n decode32(texture(cc_jointsTexture, vec2((9.5 / 12.0), y))),\n decode32(texture(cc_jointsTexture, vec2((10.5 / 12.0), y)))\n );\n }\n#elif CC_USE_SKINNING == 3\n vec3 getJointDQ(float i, out vec4 Qr, out vec4 Qt) {\n float y = (i + 0.5) * cc_jointsTextureSizeInv.y;\n Qr = texture(cc_jointsTexture, vec2((0.5 / 3.0), y));\n Qt = texture(cc_jointsTexture, vec2((1.5 / 3.0), y));\n return texture(cc_jointsTexture, vec2((2.5 / 3.0), y)).xyz;\n }\n#endif\nvoid skinRTS(out vec4 R, out vec3 T, out vec3 S) {\n vec4 r, t, Qt = vec4(0.0);\n R = vec4(0.0); S = vec3(0.0);\n for (int i = 0; i < 4; i++) {\n float w = a_weights[i];\n S += getJointDQ(a_joints[i], r, t) * w;\n R += r * w; Qt += t * w;\n }\n float invNorm = 1.0 / length(R); R *= invNorm; Qt *= invNorm;\n T = 2.0 * (R.w * Qt.xyz - Qt.w * R.xyz + cross(R.xyz, Qt.xyz));\n}\nvec3 VectorTransformQuat(vec3 v, vec4 Q) {\n return v + 2.0 * cross(Q.xyz, cross(Q.xyz, v) + Q.w * v);\n}\nvoid CCSkin(inout vec3 position) {\n vec4 R; vec3 T, S;\n skinRTS(R, T, S);\n position = VectorTransformQuat(position * S, R) + T;\n}\nvoid CCSkin(inout StandardAttributes attr) {\n vec4 R; vec3 T, S;\n skinRTS(R, T, S);\n attr.position = VectorTransformQuat(attr.position * S, R) + T;\n attr.normal = VectorTransformQuat(attr.normal, R);\n attr.tangent = VectorTransformQuat(attr.tangent, R);\n}\n#endif\nstruct StandardVertInput {\n highp vec3 position;\n vec3 normal;\n vec3 tangent;\n};\nvoid CCAttrToInput (in StandardAttributes attr, out StandardVertInput In) {\n In.position = attr.position;\n In.normal = attr.normal;\n In.tangent = attr.tangent;\n}\nvoid CCVertInput (out StandardVertInput In) {\n StandardAttributes attr;\n CCDecode(attr);\n #if CC_USE_SKINNING\n CCSkin(attr);\n #endif\n CCAttrToInput(attr, In);\n}\nuniform Constants {\n vec4 tilingOffset;\n vec4 albedo;\n vec4 albedoScale;\n vec4 pbrParams;\n vec4 pbrScale;\n vec4 emissive;\n vec4 emissiveScale;\n};\nout vec3 v_position;\nout vec3 v_normal;\n#if USE_NORMAL_MAP\n out vec3 v_tangent;\n out vec3 v_bitangent;\n#endif\n#if USE_ALBEDO_MAP || USE_NORMAL_MAP || USE_PBR_MAP || USE_EMISSIVE_MAP || USE_METALLIC_ROUGHNESS_MAP || USE_OCCLUSION_MAP\n in vec2 a_texCoord;\n out vec2 v_uv;\n#endif\nvec4 vert () {\n StandardVertInput In;\n CCVertInput(In);\n vec4 pos = cc_matWorld * vec4(In.position, 1.0);\n v_position = pos.xyz;\n v_normal = (cc_matWorldIT * vec4(In.normal, 0.0)).xyz;\n #if USE_NORMAL_MAP\n v_tangent = (cc_matWorldIT * vec4(In.tangent, 0.0)).xyz;\n v_bitangent = cross(v_tangent, v_normal);\n #endif\n #if USE_ALBEDO_MAP || USE_NORMAL_MAP || USE_PBR_MAP || USE_EMISSIVE_MAP || USE_METALLIC_ROUGHNESS_MAP || USE_OCCLUSION_MAP\n v_uv = a_texCoord * tilingOffset.xy + tilingOffset.zw;\n #endif\n return cc_matViewProj * pos;\n}\nvoid main() { gl_Position = vert(); }\n`, + "frag": `\nprecision mediump float;\nuniform CCGlobal {\n vec4 cc_time;\n vec4 cc_screenSize;\n vec4 cc_screenScale;\n vec4 cc_nativeSize;\n mat4 cc_matView;\n mat4 cc_matViewInv;\n mat4 cc_matProj;\n mat4 cc_matProjInv;\n mat4 cc_matViewProj;\n mat4 cc_matViewProjInv;\n vec4 cc_cameraPos;\n vec4 cc_exposure;\n vec4 cc_mainLitDir;\n vec4 cc_mainLitColor;\n vec4 cc_ambientSky;\n vec4 cc_ambientGround;\n};\nuniform CCForwardLight {\n highp vec4 cc_sphereLitPos[2];\n vec4 cc_sphereLitSizeRange[2];\n vec4 cc_sphereLitColor[2];\n highp vec4 cc_spotLitPos[2];\n vec4 cc_spotLitSizeRangeAngle[2];\n vec4 cc_spotLitDir[2];\n vec4 cc_spotLitColor[2];\n};\n#if CC_USE_IBL\nuniform samplerCube cc_environment;\n#endif\n#define saturate(a) clamp( a, 0.0, 1.0 )\nvec3 SRGBToLinear(vec3 gamma)\n{\n return pow(gamma, vec3(2.2));\n}\nvec3 LinearToSRGB(vec3 linear)\n{\n return pow(linear, vec3(0.454545));\n}\nfloat SmoothDistAtt2(float distSqr, float invSqrAttRadius) {\n float factor = distSqr * invSqrAttRadius;\n float factor2 = factor * factor;\n float factor3 = factor2 * factor2;\n float smoothFactor = clamp(1.0 - factor3 * factor3, 0.0, 1.0);\n return smoothFactor * smoothFactor;\n}\nfloat SmoothDistAtt(float distSqr, float invSqrAttRadius) {\n float factor = distSqr * invSqrAttRadius;\n float smoothFactor = clamp(1.0 - factor * factor, 0.0, 1.0);\n return smoothFactor * smoothFactor;\n}\nfloat GetDistAtt(float distSqr, float invSqrAttRadius) {\n float attenuation = 1.0 / max(distSqr, 0.01*0.01);\n attenuation *= SmoothDistAtt(distSqr , invSqrAttRadius);\n return attenuation;\n}\nfloat GetAngleAtt(vec3 L, vec3 litDir, float litAngleScale, float litAngleOffset) {\n float cd = dot(litDir, L);\n float attenuation = clamp(cd * litAngleScale + litAngleOffset, 0.0, 1.0);\n return (attenuation * attenuation);\n}\nfloat GGXMobile(float roughness, float NoH, vec3 H, vec3 N) {\n vec3 NxH = cross(N, H);\n float OneMinusNoHSqr = dot(NxH, NxH);\n float a = roughness * roughness;\n float n = NoH * a;\n float p = a / (OneMinusNoHSqr + n * n);\n return p * p;\n}\nfloat CalcSpecular(float roughness, float NoH, vec3 H, vec3 N) {\n return (roughness*0.25 + 0.25) * GGXMobile(roughness, NoH, H, N);\n}\nvec3 BRDFApprox(vec3 specular, float roughness, float NoV) {\n const vec4 c0 = vec4(-1.0, -0.0275, -0.572, 0.022);\n const vec4 c1 = vec4(1.0, 0.0425, 1.04, -0.04);\n vec4 r = roughness * c0 + c1;\n float a004 = min( r.x * r.x, exp2( -9.28 * NoV ) ) * r.x + r.y;\n vec2 AB = vec2( -1.04, 1.04 ) * a004 + r.zw;\n AB.y *= clamp(50.0 * specular.g, 0.0, 1.0);\n return specular * AB.x + AB.y;\n}\nvec3 CalcDynamicLighting(vec3 worldPos, vec3 N, vec3 V, vec3 diffuse, vec3 specular, float roughness) {\n vec3 lighting = vec3(0.0);\n vec3 diffuseContrib = diffuse / 3.14159265359;\n for (int i = 0; i < 2; i++) {\n vec3 PLU = cc_sphereLitPos[i].xyz - worldPos;\n vec3 PL = normalize(PLU);\n vec3 PH = normalize(PL+V);\n float PNL = max(dot(N, PL), 0.001);\n float PNH = max(dot(N, PH), 0.0);\n float distSqr = dot(PLU, PLU);\n float litRadius = cc_sphereLitSizeRange[i].x;\n float litRadiusSqr = litRadius * litRadius;\n float illum = 3.14159265359 * (litRadiusSqr / max(litRadiusSqr , distSqr));\n float attRadiusSqrInv = 1.0 / max(cc_sphereLitSizeRange[i].y, 0.01);\n attRadiusSqrInv *= attRadiusSqrInv;\n float att = GetDistAtt(distSqr, attRadiusSqrInv);\n vec3 lspec = specular * CalcSpecular(roughness, PNH, PH, N);\n lighting += PNL * cc_sphereLitColor[i].rgb * cc_sphereLitColor[i].w * illum * att * (diffuseContrib + lspec);\n }\n for (int i = 0; i < 2; i++) {\n vec3 SLU = cc_spotLitPos[i].xyz - worldPos;\n vec3 SL = normalize(SLU);\n vec3 SH = normalize(SL+V);\n float SNL = max(dot(N, SL), 0.001);\n float SNH = max(dot(N, SH), 0.0);\n float distSqr = dot(SLU, SLU);\n float litRadius = cc_spotLitSizeRangeAngle[i].x;\n float litRadiusSqr = litRadius * litRadius;\n float illum = 3.14159265359 * (litRadiusSqr / max(litRadiusSqr , distSqr));\n float attRadiusSqrInv = 1.0 / max(cc_spotLitSizeRangeAngle[i].y, 0.01);\n attRadiusSqrInv *= attRadiusSqrInv;\n float cosInner = max(dot(-cc_spotLitDir[i].xyz, SL), 0.01);\n float cosOuter = cc_spotLitSizeRangeAngle[i].z;\n float litAngleScale = 1.0 / max(0.001, cosInner - cosOuter);\n float litAngleOffset = -cosOuter * litAngleScale;\n float att = GetDistAtt(distSqr, attRadiusSqrInv);\n att *= GetAngleAtt(SL, -cc_spotLitDir[i].xyz, litAngleScale, litAngleOffset);\n vec3 lspec = specular * CalcSpecular(roughness, SNH, SH, N);\n lighting += SNL * cc_spotLitColor[i].rgb * cc_spotLitColor[i].w * illum * att * (diffuseContrib + lspec);\n }\n return lighting;\n}\nstruct StandardSurface {\n vec3 albedo;\n float alpha;\n vec3 position;\n vec3 normal;\n float roughness;\n float metallic;\n float occlusion;\n vec3 emissive;\n};\nvec4 CCStandardShading (StandardSurface s) {\n vec3 diffuse = s.albedo * (1.0 - s.metallic);\n vec3 specular = mix(vec3(0.04), s.albedo, s.metallic);\n vec3 V = normalize(cc_cameraPos.xyz - s.position);\n vec3 L = normalize(-cc_mainLitDir.xyz);\n vec3 H = normalize(L+V);\n float NV = max(abs(dot(s.normal, V)), 0.001);\n float NL = max(dot(s.normal, L), 0.001);\n float NH = max(dot(s.normal, H), 0.0);\n specular = BRDFApprox(specular, s.roughness, NV);\n vec3 specularContrib = specular * CalcSpecular(s.roughness, NH, H, s.normal);\n vec3 diffuseContrib = diffuse / 3.14159265359;\n vec3 finalColor = NL * cc_mainLitColor.rgb * cc_mainLitColor.w * (diffuseContrib + specularContrib);\n finalColor += CalcDynamicLighting(s.position, s.normal, V, diffuse, specular, s.roughness);\n float fAmb = dot(s.normal, vec3(0.0, -1.0, 0.0)) * 0.5 + 0.5;\n vec3 ambDiff = mix(cc_ambientSky.rgb, cc_ambientGround.rgb, fAmb) * cc_ambientSky.w;\n finalColor += (ambDiff.rgb * diffuse);\n #if CC_USE_IBL\n vec3 R = normalize(reflect(-V, s.normal));\n vec3 env = SRGBToLinear(texture(cc_environment, R).rgb) * cc_ambientSky.w;\n finalColor += env * specular;\n #endif\n finalColor = finalColor * s.occlusion;\n #if CC_USE_HDR\n s.emissive *= cc_exposure.w;\n #endif\n finalColor += s.emissive;\n return vec4(finalColor, s.alpha);\n}\nvec4 CCFragOutput (vec4 color) {\n #if !CC_USE_HDR\n color.rgb = LinearToSRGB(color.rgb);\n #endif\n return color;\n}\nuniform Constants {\n vec4 tilingOffset;\n vec4 albedo;\n vec4 albedoScale;\n vec4 pbrParams;\n vec4 pbrScale;\n vec4 emissive;\n vec4 emissiveScale;\n};\nin vec3 v_position;\n#if USE_ALBEDO_MAP || USE_NORMAL_MAP || USE_PBR_MAP || USE_EMISSIVE_MAP || USE_METALLIC_ROUGHNESS_MAP || USE_OCCLUSION_MAP\n in vec2 v_uv;\n#endif\nin vec3 v_normal;\n#if USE_NORMAL_MAP\n in vec3 v_tangent;\n in vec3 v_bitangent;\n#endif\n#if USE_ALBEDO_MAP\n uniform sampler2D albedoMap;\n#endif\n#if USE_NORMAL_MAP\n uniform sampler2D normalMap;\n#endif\n#if USE_PBR_MAP\n uniform sampler2D pbrMap;\n#endif\n#if USE_METALLIC_ROUGHNESS_MAP\n uniform sampler2D metallicRoughnessMap;\n#endif\n#if USE_OCCLUSION_MAP\n uniform sampler2D occlusionMap;\n#endif\n#if USE_EMISSIVE_MAP\n uniform sampler2D emissiveMap;\n#endif\nvoid surf (out StandardSurface s) {\n vec4 baseColor = albedo;\n #if USE_ALBEDO_MAP\n vec4 texColor = texture(albedoMap, v_uv);\n texColor.rgb = SRGBToLinear(texColor.rgb);\n baseColor *= texColor;\n #endif\n s.albedo = baseColor.rgb * albedoScale.xyz;\n s.alpha = baseColor.a;\n #if USE_ALPHA_TEST\n if(s.alpha < albedoScale.w)\n discard;\n #endif\n s.normal = normalize(v_normal);\n #if USE_NORMAL_MAP\n vec3 nmmp = texture(normalMap, v_uv).xyz - vec3(0.5);\n s.normal = normalize(\n (nmmp.x * pbrScale.w) * normalize(v_tangent) +\n (nmmp.y * pbrScale.w) * normalize(v_bitangent) +\n nmmp.z * s.normal);\n #endif\n s.position = v_position;\n vec4 pbr = pbrParams;\n #if USE_PBR_MAP\n pbr = texture(pbrMap, v_uv);\n #endif\n #if USE_METALLIC_ROUGHNESS_MAP\n vec4 metallicRoughness = texture(metallicRoughnessMap, v_uv);\n pbr.METALLIC_CHANNEL = metallicRoughness.METALLIC_CHANNEL;\n pbr.ROUGHNESS_CHANNEL = metallicRoughness.ROUGHNESS_CHANNEL;\n #endif\n #if USE_OCCLUSION_MAP\n pbr.OCCLUSION_CHANNEL = texture(occlusionMap, v_uv).OCCLUSION_CHANNEL;\n #endif\n pbr *= pbrScale;\n s.roughness = clamp(pbr.ROUGHNESS_CHANNEL, 0.04, 1.0);\n s.metallic = clamp(pbr.METALLIC_CHANNEL, 0.0, 0.96);\n s.occlusion = pbr.OCCLUSION_CHANNEL;\n s.emissive = emissive.rgb * emissiveScale.xyz;\n #if USE_EMISSIVE_MAP\n s.emissive *= SRGBToLinear(texture(emissiveMap, v_uv).rgb);\n #endif\n}\nvec4 frag () {\n StandardSurface s; surf(s);\n vec4 color = CCStandardShading(s);\n return CCFragOutput(color);\n}\nout vec4 cc_FragColor;\nvoid main() { cc_FragColor = frag(); }\n` }, "glsl1": { - "vert": `\nprecision mediump float;\nuniform mat4 cc_matViewProj;\nuniform highp mat4 cc_matWorld;\nuniform mat4 cc_matWorldIT;\nstruct StandardAttributes {\n vec3 position;\n vec3 normal;\n vec3 tangent;\n};\nattribute vec3 a_position;\nattribute vec3 a_normal;\nattribute vec3 a_tangent;\nvoid CCDecode (out StandardAttributes attr) {\n attr.position = a_position;\n attr.normal = a_normal;\n attr.tangent = a_tangent;\n}\n#if CC_USE_SKINNING\nattribute vec4 a_weights;\nattribute vec4 a_joints;\n#if CC_USE_SKINNING == 1\n uniform vec4 cc_jointsData[90];\n#else\n uniform vec4 cc_jointsTextureSizeInv;\n uniform sampler2D cc_jointsTexture;\n#endif\n#if CC_USE_SKINNING == 2\n float decode32(highp vec4 rgba) {\n rgba = rgba * 255.0;\n float Sign = 1.0 - step(128.0, rgba[3]) * 2.0;\n float Exponent = 2.0 * mod(rgba[3], 128.0) + step(128.0, rgba[2]) - 127.0;\n float Mantissa = mod(rgba[2], 128.0) * 65536.0 + rgba[1] * 256.0 + rgba[0] + 8388608.0;\n return Sign * exp2(Exponent - 23.0) * Mantissa;\n }\n#endif\n#if CC_USE_SKINNING == 1\n vec3 getJointDQ(float i, out vec4 Qr, out vec4 Qt) {\n int idx = 3 * int(i);\n Qr = cc_jointsData[idx];\n Qt = cc_jointsData[idx + 1];\n return cc_jointsData[idx + 2].xyz;\n }\n#elif CC_USE_SKINNING == 2\n vec3 getJointDQ(float i, out vec4 Qr, out vec4 Qt) {\n float y = (i + 0.5) * cc_jointsTextureSizeInv.y;\n Qr = vec4(\n decode32(texture2D(cc_jointsTexture, vec2((0.5 / 12.0), y))),\n decode32(texture2D(cc_jointsTexture, vec2((1.5 / 12.0), y))),\n decode32(texture2D(cc_jointsTexture, vec2((2.5 / 12.0), y))),\n decode32(texture2D(cc_jointsTexture, vec2((3.5 / 12.0), y)))\n );\n Qt = vec4(\n decode32(texture2D(cc_jointsTexture, vec2((4.5 / 12.0), y))),\n decode32(texture2D(cc_jointsTexture, vec2((5.5 / 12.0), y))),\n decode32(texture2D(cc_jointsTexture, vec2((6.5 / 12.0), y))),\n decode32(texture2D(cc_jointsTexture, vec2((7.5 / 12.0), y)))\n );\n return vec3(\n decode32(texture2D(cc_jointsTexture, vec2((8.5 / 12.0), y))),\n decode32(texture2D(cc_jointsTexture, vec2((9.5 / 12.0), y))),\n decode32(texture2D(cc_jointsTexture, vec2((10.5 / 12.0), y)))\n );\n }\n#elif CC_USE_SKINNING == 3\n vec3 getJointDQ(float i, out vec4 Qr, out vec4 Qt) {\n float y = (i + 0.5) * cc_jointsTextureSizeInv.y;\n Qr = texture2D(cc_jointsTexture, vec2((0.5 / 3.0), y));\n Qt = texture2D(cc_jointsTexture, vec2((1.5 / 3.0), y));\n return texture2D(cc_jointsTexture, vec2((2.5 / 3.0), y)).xyz;\n }\n#endif\nvoid skinRTS(out vec4 R, out vec3 T, out vec3 S) {\n vec4 r, t, Qt = vec4(0.0);\n R = vec4(0.0); S = vec3(0.0);\n for (int i = 0; i < 4; i++) {\n float w = a_weights[i];\n S += getJointDQ(a_joints[i], r, t) * w;\n R += r * w; Qt += t * w;\n }\n float invNorm = 1.0 / length(R); R *= invNorm; Qt *= invNorm;\n T = 2.0 * (R.w * Qt.xyz - Qt.w * R.xyz + cross(R.xyz, Qt.xyz));\n}\nvec3 VectorTransformQuat(vec3 v, vec4 Q) {\n return v + 2.0 * cross(Q.xyz, cross(Q.xyz, v) + Q.w * v);\n}\nvoid CCSkin(inout vec3 position) {\n vec4 R; vec3 T, S;\n skinRTS(R, T, S);\n position = VectorTransformQuat(position * S, R) + T;\n}\nvoid CCSkin(inout StandardAttributes attr) {\n vec4 R; vec3 T, S;\n skinRTS(R, T, S);\n attr.position = VectorTransformQuat(attr.position * S, R) + T;\n attr.normal = VectorTransformQuat(attr.normal, R);\n attr.tangent = VectorTransformQuat(attr.tangent, R);\n}\n#endif\nstruct StandardVertInput {\n highp vec3 position;\n vec3 normal;\n vec3 tangent;\n};\nvoid CCAttrToInput (in StandardAttributes attr, out StandardVertInput In) {\n In.position = attr.position;\n In.normal = attr.normal;\n In.tangent = attr.tangent;\n}\nvoid CCVertInput (out StandardVertInput In) {\n StandardAttributes attr;\n CCDecode(attr);\n #if CC_USE_SKINNING\n CCSkin(attr);\n #endif\n CCAttrToInput(attr, In);\n}\nuniform vec4 tilingOffset;\nvarying vec3 v_position;\nvarying vec3 v_normal;\n#if USE_NORMAL_MAP\n varying vec3 v_tangent;\n varying vec3 v_bitangent;\n#endif\n#if USE_ALBEDO_MAP || USE_NORMAL_MAP || USE_PBR_MAP || USE_EMISSIVE_MAP\n attribute vec2 a_texCoord;\n varying vec2 v_uv;\n#endif\nvec4 vert () {\n StandardVertInput In;\n CCVertInput(In);\n vec4 pos = cc_matWorld * vec4(In.position, 1.0);\n v_position = pos.xyz;\n v_normal = (cc_matWorldIT * vec4(In.normal, 0.0)).xyz;\n #if USE_NORMAL_MAP\n v_tangent = (cc_matWorldIT * vec4(In.tangent, 0.0)).xyz;\n v_bitangent = cross(v_tangent, v_normal);\n #endif\n #if USE_ALBEDO_MAP || USE_NORMAL_MAP || USE_PBR_MAP || USE_EMISSIVE_MAP\n v_uv = a_texCoord * tilingOffset.xy + tilingOffset.zw;\n #endif\n return cc_matViewProj * pos;\n}\nvoid main() { gl_Position = vert(); }\n`, - "frag": `\nprecision mediump float;\nuniform vec4 cc_cameraPos;\nuniform vec4 cc_exposure;\nuniform vec4 cc_mainLitDir;\nuniform vec4 cc_mainLitColor;\nuniform vec4 cc_ambientSky;\nuniform vec4 cc_ambientGround;\nuniform highp vec4 cc_sphereLitPos[2];\nuniform vec4 cc_sphereLitSizeRange[2];\nuniform vec4 cc_sphereLitColor[2];\nuniform highp vec4 cc_spotLitPos[2];\nuniform vec4 cc_spotLitSizeRangeAngle[2];\nuniform vec4 cc_spotLitDir[2];\nuniform vec4 cc_spotLitColor[2];\n#if CC_USE_IBL\nuniform samplerCube cc_environment;\n#endif\n#define saturate(a) clamp( a, 0.0, 1.0 )\nvec3 SRGBToLinear(vec3 gamma)\n{\n return pow(gamma, vec3(2.2));\n}\nvec3 LinearToSRGB(vec3 linear)\n{\n return pow(linear, vec3(0.454545));\n}\nfloat SmoothDistAtt2(float distSqr, float invSqrAttRadius) {\n float factor = distSqr * invSqrAttRadius;\n float factor2 = factor * factor;\n float factor3 = factor2 * factor2;\n float smoothFactor = clamp(1.0 - factor3 * factor3, 0.0, 1.0);\n return smoothFactor * smoothFactor;\n}\nfloat SmoothDistAtt(float distSqr, float invSqrAttRadius) {\n float factor = distSqr * invSqrAttRadius;\n float smoothFactor = clamp(1.0 - factor * factor, 0.0, 1.0);\n return smoothFactor * smoothFactor;\n}\nfloat GetDistAtt(float distSqr, float invSqrAttRadius) {\n float attenuation = 1.0 / max(distSqr, 0.01*0.01);\n attenuation *= SmoothDistAtt(distSqr , invSqrAttRadius);\n return attenuation;\n}\nfloat GetAngleAtt(vec3 L, vec3 litDir, float litAngleScale, float litAngleOffset) {\n float cd = dot(litDir, L);\n float attenuation = clamp(cd * litAngleScale + litAngleOffset, 0.0, 1.0);\n return (attenuation * attenuation);\n}\nfloat GGXMobile(float roughness, float NoH, vec3 H, vec3 N) {\n vec3 NxH = cross(N, H);\n float OneMinusNoHSqr = dot(NxH, NxH);\n float a = roughness * roughness;\n float n = NoH * a;\n float p = a / (OneMinusNoHSqr + n * n);\n return p * p;\n}\nfloat CalcSpecular(float roughness, float NoH, vec3 H, vec3 N) {\n return (roughness*0.25 + 0.25) * GGXMobile(roughness, NoH, H, N);\n}\nvec3 BRDFApprox(vec3 specular, float roughness, float NoV) {\n const vec4 c0 = vec4(-1.0, -0.0275, -0.572, 0.022);\n const vec4 c1 = vec4(1.0, 0.0425, 1.04, -0.04);\n vec4 r = roughness * c0 + c1;\n float a004 = min( r.x * r.x, exp2( -9.28 * NoV ) ) * r.x + r.y;\n vec2 AB = vec2( -1.04, 1.04 ) * a004 + r.zw;\n AB.y *= clamp(50.0 * specular.g, 0.0, 1.0);\n return specular * AB.x + AB.y;\n}\nvec3 CalcDynamicLighting(vec3 worldPos, vec3 N, vec3 V, vec3 diffuse, vec3 specular, float roughness) {\n vec3 lighting = vec3(0.0);\n vec3 diffuseContrib = diffuse / 3.14159265359;\n for (int i = 0; i < 2; i++) {\n vec3 PLU = cc_sphereLitPos[i].xyz - worldPos;\n vec3 PL = normalize(PLU);\n vec3 PH = normalize(PL+V);\n float PNL = max(dot(N, PL), 0.001);\n float PNH = max(dot(N, PH), 0.0);\n float distSqr = dot(PLU, PLU);\n float litRadius = cc_sphereLitSizeRange[i].x;\n float litRadiusSqr = litRadius * litRadius;\n float illum = 3.14159265359 * (litRadiusSqr / max(litRadiusSqr , distSqr));\n float attRadiusSqrInv = 1.0 / max(cc_sphereLitSizeRange[i].y, 0.01);\n attRadiusSqrInv *= attRadiusSqrInv;\n float att = GetDistAtt(distSqr, attRadiusSqrInv);\n vec3 lspec = specular * CalcSpecular(roughness, PNH, PH, N);\n lighting += PNL * cc_sphereLitColor[i].rgb * cc_sphereLitColor[i].w * illum * att * (diffuseContrib + lspec);\n }\n for (int i = 0; i < 2; i++) {\n vec3 SLU = cc_spotLitPos[i].xyz - worldPos;\n vec3 SL = normalize(SLU);\n vec3 SH = normalize(SL+V);\n float SNL = max(dot(N, SL), 0.001);\n float SNH = max(dot(N, SH), 0.0);\n float distSqr = dot(SLU, SLU);\n float litRadius = cc_spotLitSizeRangeAngle[i].x;\n float litRadiusSqr = litRadius * litRadius;\n float illum = 3.14159265359 * (litRadiusSqr / max(litRadiusSqr , distSqr));\n float attRadiusSqrInv = 1.0 / max(cc_spotLitSizeRangeAngle[i].y, 0.01);\n attRadiusSqrInv *= attRadiusSqrInv;\n float cosInner = max(dot(-cc_spotLitDir[i].xyz, SL), 0.01);\n float cosOuter = cc_spotLitSizeRangeAngle[i].z;\n float litAngleScale = 1.0 / max(0.001, cosInner - cosOuter);\n float litAngleOffset = -cosOuter * litAngleScale;\n float att = GetDistAtt(distSqr, attRadiusSqrInv);\n att *= GetAngleAtt(SL, -cc_spotLitDir[i].xyz, litAngleScale, litAngleOffset);\n vec3 lspec = specular * CalcSpecular(roughness, SNH, SH, N);\n lighting += SNL * cc_spotLitColor[i].rgb * cc_spotLitColor[i].w * illum * att * (diffuseContrib + lspec);\n }\n return lighting;\n}\nstruct StandardSurface {\n vec3 albedo;\n float alpha;\n vec3 position;\n vec3 normal;\n float roughness;\n float metallic;\n float occlusion;\n vec3 emissive;\n};\nvec4 CCStandardShading (StandardSurface s) {\n vec3 diffuse = s.albedo * (1.0 - s.metallic);\n vec3 specular = mix(vec3(0.04), s.albedo, s.metallic);\n vec3 V = normalize(cc_cameraPos.xyz - s.position);\n vec3 L = normalize(-cc_mainLitDir.xyz);\n vec3 H = normalize(L+V);\n float NV = max(abs(dot(s.normal, V)), 0.001);\n float NL = max(dot(s.normal, L), 0.001);\n float NH = max(dot(s.normal, H), 0.0);\n specular = BRDFApprox(specular, s.roughness, NV);\n vec3 specularContrib = specular * CalcSpecular(s.roughness, NH, H, s.normal);\n vec3 diffuseContrib = diffuse / 3.14159265359;\n vec3 finalColor = NL * cc_mainLitColor.rgb * cc_mainLitColor.w * (diffuseContrib + specularContrib);\n finalColor += CalcDynamicLighting(s.position, s.normal, V, diffuse, specular, s.roughness);\n float fAmb = dot(s.normal, vec3(0.0, -1.0, 0.0)) * 0.5 + 0.5;\n vec3 ambDiff = mix(cc_ambientSky.rgb, cc_ambientGround.rgb, fAmb) * cc_ambientSky.w;\n finalColor += (ambDiff.rgb * diffuse);\n #if CC_USE_IBL\n vec3 R = normalize(reflect(-V, s.normal));\n vec3 env = SRGBToLinear(textureCube(cc_environment, R).rgb) * cc_ambientSky.w;\n finalColor += env * specular;\n #endif\n finalColor = finalColor * s.occlusion;\n #if CC_USE_HDR\n s.emissive *= cc_exposure.w;\n #endif\n finalColor += s.emissive;\n return vec4(finalColor, s.alpha);\n}\nvec4 CCFragOutput (vec4 color) {\n #if !CC_USE_HDR\n color.rgb = LinearToSRGB(color.rgb);\n #endif\n return color;\n}\nuniform vec4 albedo;\nuniform vec4 albedoScale;\nuniform vec4 pbrParams;\nuniform vec4 pbrScale;\nuniform vec4 emissive;\nuniform vec4 emissiveScale;\nvarying vec3 v_position;\n#if USE_ALBEDO_MAP || USE_NORMAL_MAP || USE_PBR_MAP || USE_EMISSIVE_MAP\n varying vec2 v_uv;\n#endif\nvarying vec3 v_normal;\n#if USE_NORMAL_MAP\n varying vec3 v_tangent;\n varying vec3 v_bitangent;\n#endif\n#if USE_ALBEDO_MAP\n uniform sampler2D albedoMap;\n#endif\n#if USE_NORMAL_MAP\n uniform sampler2D normalMap;\n#endif\n#if USE_PBR_MAP\n uniform sampler2D pbrMap;\n#endif\n#if USE_EMISSIVE_MAP\n uniform sampler2D emissiveMap;\n#endif\nvoid surf (out StandardSurface s) {\n vec4 baseColor = albedo;\n #if USE_ALBEDO_MAP\n vec4 texColor = texture2D(albedoMap, v_uv);\n texColor.rgb = SRGBToLinear(texColor.rgb);\n baseColor *= texColor;\n #endif\n s.albedo = baseColor.rgb * albedoScale.xyz;\n s.alpha = albedo.a;\n #if USE_ALPHA_TEST\n if(s.alpha < albedoScale.w)\n discard;\n #endif\n s.normal = normalize(v_normal);\n #if USE_NORMAL_MAP\n vec3 nmmp = texture2D(normalMap, v_uv).xyz - vec3(0.5);\n s.normal = normalize(\n nmmp.x * normalize(v_tangent) +\n nmmp.y * normalize(v_bitangent) +\n nmmp.z * s.normal);\n #endif\n s.position = v_position;\n #if USE_PBR_MAP\n vec4 pbr = texture2D(pbrMap, v_uv);\n #else\n vec4 pbr = pbrParams;\n #endif\n pbr *= pbrScale;\n s.roughness = clamp(pbr.ROUGHNESS_CHANNEL, 0.04, 1.0);\n s.metallic = clamp(pbr.METALLIC_CHANNEL, 0.0, 0.96);\n s.occlusion = pbr.AO_CHANNEL;\n s.emissive = emissive.rgb * emissiveScale.xyz;\n #if USE_EMISSIVE_MAP\n s.emissive *= SRGBToLinear(texture2D(emissiveMap, v_uv).rgb);\n #endif\n}\nvec4 frag () {\n StandardSurface s; surf(s);\n vec4 color = CCStandardShading(s);\n return CCFragOutput(color);\n}\nvoid main() { gl_FragColor = frag(); }\n` + "vert": `\nprecision mediump float;\nuniform mat4 cc_matViewProj;\nuniform highp mat4 cc_matWorld;\nuniform mat4 cc_matWorldIT;\nstruct StandardAttributes {\n vec3 position;\n vec3 normal;\n vec3 tangent;\n};\nattribute vec3 a_position;\nattribute vec3 a_normal;\nattribute vec3 a_tangent;\nvoid CCDecode (out StandardAttributes attr) {\n attr.position = a_position;\n attr.normal = a_normal;\n attr.tangent = a_tangent;\n}\n#if CC_USE_SKINNING\nattribute vec4 a_weights;\nattribute vec4 a_joints;\n#if CC_USE_SKINNING == 1\n uniform vec4 cc_jointsData[90];\n#else\n uniform vec4 cc_jointsTextureSizeInv;\n uniform sampler2D cc_jointsTexture;\n#endif\n#if CC_USE_SKINNING == 2\n float decode32(highp vec4 rgba) {\n rgba = rgba * 255.0;\n float Sign = 1.0 - step(128.0, rgba[3]) * 2.0;\n float Exponent = 2.0 * mod(rgba[3], 128.0) + step(128.0, rgba[2]) - 127.0;\n float Mantissa = mod(rgba[2], 128.0) * 65536.0 + rgba[1] * 256.0 + rgba[0] + 8388608.0;\n return Sign * exp2(Exponent - 23.0) * Mantissa;\n }\n#endif\n#if CC_USE_SKINNING == 1\n vec3 getJointDQ(float i, out vec4 Qr, out vec4 Qt) {\n int idx = 3 * int(i);\n Qr = cc_jointsData[idx];\n Qt = cc_jointsData[idx + 1];\n return cc_jointsData[idx + 2].xyz;\n }\n#elif CC_USE_SKINNING == 2\n vec3 getJointDQ(float i, out vec4 Qr, out vec4 Qt) {\n float y = (i + 0.5) * cc_jointsTextureSizeInv.y;\n Qr = vec4(\n decode32(texture2D(cc_jointsTexture, vec2((0.5 / 12.0), y))),\n decode32(texture2D(cc_jointsTexture, vec2((1.5 / 12.0), y))),\n decode32(texture2D(cc_jointsTexture, vec2((2.5 / 12.0), y))),\n decode32(texture2D(cc_jointsTexture, vec2((3.5 / 12.0), y)))\n );\n Qt = vec4(\n decode32(texture2D(cc_jointsTexture, vec2((4.5 / 12.0), y))),\n decode32(texture2D(cc_jointsTexture, vec2((5.5 / 12.0), y))),\n decode32(texture2D(cc_jointsTexture, vec2((6.5 / 12.0), y))),\n decode32(texture2D(cc_jointsTexture, vec2((7.5 / 12.0), y)))\n );\n return vec3(\n decode32(texture2D(cc_jointsTexture, vec2((8.5 / 12.0), y))),\n decode32(texture2D(cc_jointsTexture, vec2((9.5 / 12.0), y))),\n decode32(texture2D(cc_jointsTexture, vec2((10.5 / 12.0), y)))\n );\n }\n#elif CC_USE_SKINNING == 3\n vec3 getJointDQ(float i, out vec4 Qr, out vec4 Qt) {\n float y = (i + 0.5) * cc_jointsTextureSizeInv.y;\n Qr = texture2D(cc_jointsTexture, vec2((0.5 / 3.0), y));\n Qt = texture2D(cc_jointsTexture, vec2((1.5 / 3.0), y));\n return texture2D(cc_jointsTexture, vec2((2.5 / 3.0), y)).xyz;\n }\n#endif\nvoid skinRTS(out vec4 R, out vec3 T, out vec3 S) {\n vec4 r, t, Qt = vec4(0.0);\n R = vec4(0.0); S = vec3(0.0);\n for (int i = 0; i < 4; i++) {\n float w = a_weights[i];\n S += getJointDQ(a_joints[i], r, t) * w;\n R += r * w; Qt += t * w;\n }\n float invNorm = 1.0 / length(R); R *= invNorm; Qt *= invNorm;\n T = 2.0 * (R.w * Qt.xyz - Qt.w * R.xyz + cross(R.xyz, Qt.xyz));\n}\nvec3 VectorTransformQuat(vec3 v, vec4 Q) {\n return v + 2.0 * cross(Q.xyz, cross(Q.xyz, v) + Q.w * v);\n}\nvoid CCSkin(inout vec3 position) {\n vec4 R; vec3 T, S;\n skinRTS(R, T, S);\n position = VectorTransformQuat(position * S, R) + T;\n}\nvoid CCSkin(inout StandardAttributes attr) {\n vec4 R; vec3 T, S;\n skinRTS(R, T, S);\n attr.position = VectorTransformQuat(attr.position * S, R) + T;\n attr.normal = VectorTransformQuat(attr.normal, R);\n attr.tangent = VectorTransformQuat(attr.tangent, R);\n}\n#endif\nstruct StandardVertInput {\n highp vec3 position;\n vec3 normal;\n vec3 tangent;\n};\nvoid CCAttrToInput (in StandardAttributes attr, out StandardVertInput In) {\n In.position = attr.position;\n In.normal = attr.normal;\n In.tangent = attr.tangent;\n}\nvoid CCVertInput (out StandardVertInput In) {\n StandardAttributes attr;\n CCDecode(attr);\n #if CC_USE_SKINNING\n CCSkin(attr);\n #endif\n CCAttrToInput(attr, In);\n}\nuniform vec4 tilingOffset;\nvarying vec3 v_position;\nvarying vec3 v_normal;\n#if USE_NORMAL_MAP\n varying vec3 v_tangent;\n varying vec3 v_bitangent;\n#endif\n#if USE_ALBEDO_MAP || USE_NORMAL_MAP || USE_PBR_MAP || USE_EMISSIVE_MAP || USE_METALLIC_ROUGHNESS_MAP || USE_OCCLUSION_MAP\n attribute vec2 a_texCoord;\n varying vec2 v_uv;\n#endif\nvec4 vert () {\n StandardVertInput In;\n CCVertInput(In);\n vec4 pos = cc_matWorld * vec4(In.position, 1.0);\n v_position = pos.xyz;\n v_normal = (cc_matWorldIT * vec4(In.normal, 0.0)).xyz;\n #if USE_NORMAL_MAP\n v_tangent = (cc_matWorldIT * vec4(In.tangent, 0.0)).xyz;\n v_bitangent = cross(v_tangent, v_normal);\n #endif\n #if USE_ALBEDO_MAP || USE_NORMAL_MAP || USE_PBR_MAP || USE_EMISSIVE_MAP || USE_METALLIC_ROUGHNESS_MAP || USE_OCCLUSION_MAP\n v_uv = a_texCoord * tilingOffset.xy + tilingOffset.zw;\n #endif\n return cc_matViewProj * pos;\n}\nvoid main() { gl_Position = vert(); }\n`, + "frag": `\nprecision mediump float;\nuniform vec4 cc_cameraPos;\nuniform vec4 cc_exposure;\nuniform vec4 cc_mainLitDir;\nuniform vec4 cc_mainLitColor;\nuniform vec4 cc_ambientSky;\nuniform vec4 cc_ambientGround;\nuniform highp vec4 cc_sphereLitPos[2];\nuniform vec4 cc_sphereLitSizeRange[2];\nuniform vec4 cc_sphereLitColor[2];\nuniform highp vec4 cc_spotLitPos[2];\nuniform vec4 cc_spotLitSizeRangeAngle[2];\nuniform vec4 cc_spotLitDir[2];\nuniform vec4 cc_spotLitColor[2];\n#if CC_USE_IBL\nuniform samplerCube cc_environment;\n#endif\n#define saturate(a) clamp( a, 0.0, 1.0 )\nvec3 SRGBToLinear(vec3 gamma)\n{\n return pow(gamma, vec3(2.2));\n}\nvec3 LinearToSRGB(vec3 linear)\n{\n return pow(linear, vec3(0.454545));\n}\nfloat SmoothDistAtt2(float distSqr, float invSqrAttRadius) {\n float factor = distSqr * invSqrAttRadius;\n float factor2 = factor * factor;\n float factor3 = factor2 * factor2;\n float smoothFactor = clamp(1.0 - factor3 * factor3, 0.0, 1.0);\n return smoothFactor * smoothFactor;\n}\nfloat SmoothDistAtt(float distSqr, float invSqrAttRadius) {\n float factor = distSqr * invSqrAttRadius;\n float smoothFactor = clamp(1.0 - factor * factor, 0.0, 1.0);\n return smoothFactor * smoothFactor;\n}\nfloat GetDistAtt(float distSqr, float invSqrAttRadius) {\n float attenuation = 1.0 / max(distSqr, 0.01*0.01);\n attenuation *= SmoothDistAtt(distSqr , invSqrAttRadius);\n return attenuation;\n}\nfloat GetAngleAtt(vec3 L, vec3 litDir, float litAngleScale, float litAngleOffset) {\n float cd = dot(litDir, L);\n float attenuation = clamp(cd * litAngleScale + litAngleOffset, 0.0, 1.0);\n return (attenuation * attenuation);\n}\nfloat GGXMobile(float roughness, float NoH, vec3 H, vec3 N) {\n vec3 NxH = cross(N, H);\n float OneMinusNoHSqr = dot(NxH, NxH);\n float a = roughness * roughness;\n float n = NoH * a;\n float p = a / (OneMinusNoHSqr + n * n);\n return p * p;\n}\nfloat CalcSpecular(float roughness, float NoH, vec3 H, vec3 N) {\n return (roughness*0.25 + 0.25) * GGXMobile(roughness, NoH, H, N);\n}\nvec3 BRDFApprox(vec3 specular, float roughness, float NoV) {\n const vec4 c0 = vec4(-1.0, -0.0275, -0.572, 0.022);\n const vec4 c1 = vec4(1.0, 0.0425, 1.04, -0.04);\n vec4 r = roughness * c0 + c1;\n float a004 = min( r.x * r.x, exp2( -9.28 * NoV ) ) * r.x + r.y;\n vec2 AB = vec2( -1.04, 1.04 ) * a004 + r.zw;\n AB.y *= clamp(50.0 * specular.g, 0.0, 1.0);\n return specular * AB.x + AB.y;\n}\nvec3 CalcDynamicLighting(vec3 worldPos, vec3 N, vec3 V, vec3 diffuse, vec3 specular, float roughness) {\n vec3 lighting = vec3(0.0);\n vec3 diffuseContrib = diffuse / 3.14159265359;\n for (int i = 0; i < 2; i++) {\n vec3 PLU = cc_sphereLitPos[i].xyz - worldPos;\n vec3 PL = normalize(PLU);\n vec3 PH = normalize(PL+V);\n float PNL = max(dot(N, PL), 0.001);\n float PNH = max(dot(N, PH), 0.0);\n float distSqr = dot(PLU, PLU);\n float litRadius = cc_sphereLitSizeRange[i].x;\n float litRadiusSqr = litRadius * litRadius;\n float illum = 3.14159265359 * (litRadiusSqr / max(litRadiusSqr , distSqr));\n float attRadiusSqrInv = 1.0 / max(cc_sphereLitSizeRange[i].y, 0.01);\n attRadiusSqrInv *= attRadiusSqrInv;\n float att = GetDistAtt(distSqr, attRadiusSqrInv);\n vec3 lspec = specular * CalcSpecular(roughness, PNH, PH, N);\n lighting += PNL * cc_sphereLitColor[i].rgb * cc_sphereLitColor[i].w * illum * att * (diffuseContrib + lspec);\n }\n for (int i = 0; i < 2; i++) {\n vec3 SLU = cc_spotLitPos[i].xyz - worldPos;\n vec3 SL = normalize(SLU);\n vec3 SH = normalize(SL+V);\n float SNL = max(dot(N, SL), 0.001);\n float SNH = max(dot(N, SH), 0.0);\n float distSqr = dot(SLU, SLU);\n float litRadius = cc_spotLitSizeRangeAngle[i].x;\n float litRadiusSqr = litRadius * litRadius;\n float illum = 3.14159265359 * (litRadiusSqr / max(litRadiusSqr , distSqr));\n float attRadiusSqrInv = 1.0 / max(cc_spotLitSizeRangeAngle[i].y, 0.01);\n attRadiusSqrInv *= attRadiusSqrInv;\n float cosInner = max(dot(-cc_spotLitDir[i].xyz, SL), 0.01);\n float cosOuter = cc_spotLitSizeRangeAngle[i].z;\n float litAngleScale = 1.0 / max(0.001, cosInner - cosOuter);\n float litAngleOffset = -cosOuter * litAngleScale;\n float att = GetDistAtt(distSqr, attRadiusSqrInv);\n att *= GetAngleAtt(SL, -cc_spotLitDir[i].xyz, litAngleScale, litAngleOffset);\n vec3 lspec = specular * CalcSpecular(roughness, SNH, SH, N);\n lighting += SNL * cc_spotLitColor[i].rgb * cc_spotLitColor[i].w * illum * att * (diffuseContrib + lspec);\n }\n return lighting;\n}\nstruct StandardSurface {\n vec3 albedo;\n float alpha;\n vec3 position;\n vec3 normal;\n float roughness;\n float metallic;\n float occlusion;\n vec3 emissive;\n};\nvec4 CCStandardShading (StandardSurface s) {\n vec3 diffuse = s.albedo * (1.0 - s.metallic);\n vec3 specular = mix(vec3(0.04), s.albedo, s.metallic);\n vec3 V = normalize(cc_cameraPos.xyz - s.position);\n vec3 L = normalize(-cc_mainLitDir.xyz);\n vec3 H = normalize(L+V);\n float NV = max(abs(dot(s.normal, V)), 0.001);\n float NL = max(dot(s.normal, L), 0.001);\n float NH = max(dot(s.normal, H), 0.0);\n specular = BRDFApprox(specular, s.roughness, NV);\n vec3 specularContrib = specular * CalcSpecular(s.roughness, NH, H, s.normal);\n vec3 diffuseContrib = diffuse / 3.14159265359;\n vec3 finalColor = NL * cc_mainLitColor.rgb * cc_mainLitColor.w * (diffuseContrib + specularContrib);\n finalColor += CalcDynamicLighting(s.position, s.normal, V, diffuse, specular, s.roughness);\n float fAmb = dot(s.normal, vec3(0.0, -1.0, 0.0)) * 0.5 + 0.5;\n vec3 ambDiff = mix(cc_ambientSky.rgb, cc_ambientGround.rgb, fAmb) * cc_ambientSky.w;\n finalColor += (ambDiff.rgb * diffuse);\n #if CC_USE_IBL\n vec3 R = normalize(reflect(-V, s.normal));\n vec3 env = SRGBToLinear(textureCube(cc_environment, R).rgb) * cc_ambientSky.w;\n finalColor += env * specular;\n #endif\n finalColor = finalColor * s.occlusion;\n #if CC_USE_HDR\n s.emissive *= cc_exposure.w;\n #endif\n finalColor += s.emissive;\n return vec4(finalColor, s.alpha);\n}\nvec4 CCFragOutput (vec4 color) {\n #if !CC_USE_HDR\n color.rgb = LinearToSRGB(color.rgb);\n #endif\n return color;\n}\nuniform vec4 albedo;\nuniform vec4 albedoScale;\nuniform vec4 pbrParams;\nuniform vec4 pbrScale;\nuniform vec4 emissive;\nuniform vec4 emissiveScale;\nvarying vec3 v_position;\n#if USE_ALBEDO_MAP || USE_NORMAL_MAP || USE_PBR_MAP || USE_EMISSIVE_MAP || USE_METALLIC_ROUGHNESS_MAP || USE_OCCLUSION_MAP\n varying vec2 v_uv;\n#endif\nvarying vec3 v_normal;\n#if USE_NORMAL_MAP\n varying vec3 v_tangent;\n varying vec3 v_bitangent;\n#endif\n#if USE_ALBEDO_MAP\n uniform sampler2D albedoMap;\n#endif\n#if USE_NORMAL_MAP\n uniform sampler2D normalMap;\n#endif\n#if USE_PBR_MAP\n uniform sampler2D pbrMap;\n#endif\n#if USE_METALLIC_ROUGHNESS_MAP\n uniform sampler2D metallicRoughnessMap;\n#endif\n#if USE_OCCLUSION_MAP\n uniform sampler2D occlusionMap;\n#endif\n#if USE_EMISSIVE_MAP\n uniform sampler2D emissiveMap;\n#endif\nvoid surf (out StandardSurface s) {\n vec4 baseColor = albedo;\n #if USE_ALBEDO_MAP\n vec4 texColor = texture2D(albedoMap, v_uv);\n texColor.rgb = SRGBToLinear(texColor.rgb);\n baseColor *= texColor;\n #endif\n s.albedo = baseColor.rgb * albedoScale.xyz;\n s.alpha = baseColor.a;\n #if USE_ALPHA_TEST\n if(s.alpha < albedoScale.w)\n discard;\n #endif\n s.normal = normalize(v_normal);\n #if USE_NORMAL_MAP\n vec3 nmmp = texture2D(normalMap, v_uv).xyz - vec3(0.5);\n s.normal = normalize(\n (nmmp.x * pbrScale.w) * normalize(v_tangent) +\n (nmmp.y * pbrScale.w) * normalize(v_bitangent) +\n nmmp.z * s.normal);\n #endif\n s.position = v_position;\n vec4 pbr = pbrParams;\n #if USE_PBR_MAP\n pbr = texture2D(pbrMap, v_uv);\n #endif\n #if USE_METALLIC_ROUGHNESS_MAP\n vec4 metallicRoughness = texture2D(metallicRoughnessMap, v_uv);\n pbr.METALLIC_CHANNEL = metallicRoughness.METALLIC_CHANNEL;\n pbr.ROUGHNESS_CHANNEL = metallicRoughness.ROUGHNESS_CHANNEL;\n #endif\n #if USE_OCCLUSION_MAP\n pbr.OCCLUSION_CHANNEL = texture2D(occlusionMap, v_uv).OCCLUSION_CHANNEL;\n #endif\n pbr *= pbrScale;\n s.roughness = clamp(pbr.ROUGHNESS_CHANNEL, 0.04, 1.0);\n s.metallic = clamp(pbr.METALLIC_CHANNEL, 0.0, 0.96);\n s.occlusion = pbr.OCCLUSION_CHANNEL;\n s.emissive = emissive.rgb * emissiveScale.xyz;\n #if USE_EMISSIVE_MAP\n s.emissive *= SRGBToLinear(texture2D(emissiveMap, v_uv).rgb);\n #endif\n}\nvec4 frag () {\n StandardSurface s; surf(s);\n vec4 color = CCStandardShading(s);\n return CCFragOutput(color);\n}\nvoid main() { gl_FragColor = frag(); }\n` }, "builtins": {"globals":{"blocks":["CCGlobal"], "samplers":["cc_environment"]}, "locals":{"blocks":["CCLocal", "CCSkinning", "CCSkinningTexture", "CCForwardLight"], "samplers":["cc_jointsTexture"]}}, "defines": [ @@ -216,10 +216,12 @@ export default [ {"name":"CC_USE_IBL", "type":"boolean", "defines":[]}, {"name":"CC_USE_HDR", "type":"boolean", "defines":[]}, {"name":"USE_PBR_MAP", "type":"boolean", "defines":[]}, + {"name":"USE_METALLIC_ROUGHNESS_MAP", "type":"boolean", "defines":[]}, + {"name":"USE_OCCLUSION_MAP", "type":"boolean", "defines":[]}, {"name":"USE_EMISSIVE_MAP", "type":"boolean", "defines":[]}, {"name":"ROUGHNESS_CHANNEL", "type":"string", "defines":[], "options":["r", "g", "b", "a"]}, {"name":"METALLIC_CHANNEL", "type":"string", "defines":[], "options":["g", "r", "b", "a"]}, - {"name":"AO_CHANNEL", "type":"string", "defines":[], "options":["b", "r", "g", "a"]}, + {"name":"OCCLUSION_CHANNEL", "type":"string", "defines":[], "options":["b", "r", "g", "a"]}, {"name":"USE_ALPHA_TEST", "type":"boolean", "defines":[]} ], "blocks": [ @@ -237,7 +239,9 @@ export default [ {"name":"albedoMap", "type":28, "count":1, "defines":["USE_ALBEDO_MAP"], "binding":30}, {"name":"normalMap", "type":28, "count":1, "defines":["USE_NORMAL_MAP"], "binding":31}, {"name":"pbrMap", "type":28, "count":1, "defines":["USE_PBR_MAP"], "binding":32}, - {"name":"emissiveMap", "type":28, "count":1, "defines":["USE_EMISSIVE_MAP"], "binding":33} + {"name":"metallicRoughnessMap", "type":28, "count":1, "defines":["USE_METALLIC_ROUGHNESS_MAP"], "binding":33}, + {"name":"occlusionMap", "type":28, "count":1, "defines":["USE_OCCLUSION_MAP"], "binding":34}, + {"name":"emissiveMap", "type":28, "count":1, "defines":["USE_EMISSIVE_MAP"], "binding":35} ], "dependencies": {} } diff --git a/cocos/3d/framework/avatar-model-component.ts b/cocos/3d/framework/avatar-model-component.ts index 5c0173bde8..8033f9cc6f 100644 --- a/cocos/3d/framework/avatar-model-component.ts +++ b/cocos/3d/framework/avatar-model-component.ts @@ -301,7 +301,7 @@ export class AvatarModelComponent extends SkinningModelComponent { if (!lca) { console.warn('illegal skinning roots'); return; } // merge joints accordingly const skeleton = new Skeleton(); - skeleton.bindposes = []; + const bindposes: Mat4[] = []; for (const unit of this._avatarUnits) { if (!unit || !unit.skeleton || !unit.skinningRoot) { continue; } const partial = unit.skeleton; @@ -311,7 +311,7 @@ export class AvatarModelComponent extends SkinningModelComponent { const idx = skeleton.joints.findIndex((p) => p === path); if (idx >= 0) { continue; } skeleton.joints.push(path); - skeleton.bindposes.push(partial.bindposes && partial.bindposes[i] || new Mat4()); + bindposes.push(partial.bindposes[i] || new Mat4()); } } // sort the array to be more cache-friendly @@ -321,7 +321,7 @@ export class AvatarModelComponent extends SkinningModelComponent { return 0; }); skeleton.joints = skeleton.joints.map((_, idx, arr) => arr[idxMap[idx]]); - skeleton.bindposes = skeleton.bindposes.map((_, idx, arr) => arr[idxMap[idx]]); + skeleton.bindposes = bindposes.map((_, idx, arr) => arr[idxMap[idx]]); // apply // @ts-ignore super.skeleton = skeleton; diff --git a/cocos/3d/framework/batched-skinning-model-component.ts b/cocos/3d/framework/batched-skinning-model-component.ts index 89f5cb69c1..cb79a48ce6 100644 --- a/cocos/3d/framework/batched-skinning-model-component.ts +++ b/cocos/3d/framework/batched-skinning-model-component.ts @@ -148,8 +148,8 @@ export class BatchedSkinningModelComponent extends SkinningModelComponent { } public onLoad () { - this._batchMaterial = this.getSharedMaterial(0); super.onLoad(); + this._batchMaterial = this.getSharedMaterial(0); this.cook(); } @@ -217,7 +217,7 @@ export class BatchedSkinningModelComponent extends SkinningModelComponent { if (!lca) { console.warn('illegal skinning roots'); return; } // merge joints accordingly const skeleton = new Skeleton(); - skeleton.bindposes = []; + const bindposes: Mat4[] = []; for (const unit of this.units) { if (!unit || !unit.skeleton || !unit.skinningRoot) { continue; } const partial = unit.skeleton; @@ -227,7 +227,7 @@ export class BatchedSkinningModelComponent extends SkinningModelComponent { const idx = skeleton.joints.findIndex((p) => p === path); if (idx >= 0) { continue; } skeleton.joints.push(path); - skeleton.bindposes.push(partial.bindposes && partial.bindposes[i] || new Mat4()); + bindposes.push(partial.bindposes[i] || new Mat4()); } } // sort the array to be more cache-friendly @@ -237,7 +237,7 @@ export class BatchedSkinningModelComponent extends SkinningModelComponent { return 0; }); skeleton.joints = skeleton.joints.map((_, idx, arr) => arr[idxMap[idx]]); - skeleton.bindposes = skeleton.bindposes.map((_, idx, arr) => arr[idxMap[idx]]); + skeleton.bindposes = bindposes.map((_, idx, arr) => arr[idxMap[idx]]); // apply this.skeleton = skeleton; } diff --git a/cocos/3d/framework/particle/renderer/particle-system-renderer.ts b/cocos/3d/framework/particle/renderer/particle-system-renderer.ts index 79efde25f6..6f7c61823b 100644 --- a/cocos/3d/framework/particle/renderer/particle-system-renderer.ts +++ b/cocos/3d/framework/particle/renderer/particle-system-renderer.ts @@ -162,7 +162,7 @@ export default class ParticleSystemRenderer { displayOrder: 8, }) public get particleMaterial () { - return this.particleSystem.getMaterial(0, CC_EDITOR)!; + return this.particleSystem.getMaterial(0); } public set particleMaterial (val) { @@ -177,7 +177,7 @@ export default class ParticleSystemRenderer { displayOrder: 9, }) public get trailMaterial () { - return this.particleSystem.getMaterial(1, CC_EDITOR)!; + return this.particleSystem.getMaterial(1)!; } public set trailMaterial (val) { @@ -190,7 +190,7 @@ export default class ParticleSystemRenderer { private frameTile_velLenScale: Vec4; private _node_scale: Vec4; private attrs: any[]; - private _vertAttrs: IGFXAttribute[]; + private _vertAttrs: IGFXAttribute[] = []; private particleSystem: any; private _particles: RecyclePool | null = null; private _defaultMat: Material | null = null; diff --git a/cocos/3d/framework/renderable-component.ts b/cocos/3d/framework/renderable-component.ts index a5dd184266..7fab808620 100644 --- a/cocos/3d/framework/renderable-component.ts +++ b/cocos/3d/framework/renderable-component.ts @@ -69,7 +69,7 @@ export class RenderableComponent extends Component { * @zh 返回相对应序号的材质。 * @param {Number} idx - Look for the material list number */ - public getMaterial (idx: number, inEditor: boolean = false, autoUpdate: boolean = false): Material | null { + public getMaterial (idx: number, inEditor: boolean = CC_EDITOR, autoUpdate: boolean = false): Material | null { const mat = this._materials[idx]; if (!mat) { return null; } const instantiated = Material.getInstantiatedMaterial(mat, this, inEditor); diff --git a/cocos/3d/framework/skinning-model-component.ts b/cocos/3d/framework/skinning-model-component.ts index a1fcc4b307..8a9c5e61b6 100644 --- a/cocos/3d/framework/skinning-model-component.ts +++ b/cocos/3d/framework/skinning-model-component.ts @@ -90,7 +90,7 @@ export class SkinningModelComponent extends ModelComponent { const device: GFXDevice = cc.director.root && cc.director.root.device; const joints = this._skeleton && this._skeleton.joints.length || 0; const type = selectJointsMediumType(device, joints); - const mat = this.getMaterial(index, CC_EDITOR) || this._getBuiltinMaterial(); + const mat = this.getMaterial(index) || this._getBuiltinMaterial(); mat.recompileShaders({ CC_USE_SKINNING: type }); super._onMaterialModified(index, mat); } diff --git a/cocos/3d/ui/components/ui-model-component.ts b/cocos/3d/ui/components/ui-model-component.ts index efa9a3c0c0..40767377c0 100644 --- a/cocos/3d/ui/components/ui-model-component.ts +++ b/cocos/3d/ui/components/ui-model-component.ts @@ -82,7 +82,7 @@ export class UIModelComponent extends UIComponent { } const matNum = this._modelComponent.sharedMaterials.length; for (let i = 0; i < matNum; i++) { - const material = this._modelComponent.getMaterial(i, CC_EDITOR)! as Material; + const material = this._modelComponent.getMaterial(i)! as Material; if (material == null) { continue; } @@ -105,7 +105,7 @@ export class UIModelComponent extends UIComponent { } } for (let i = 0; i < matNum; i++) { - const material = this._modelComponent.getMaterial(i, CC_EDITOR)!; + const material = this._modelComponent.getMaterial(i); if (material == null) { continue; } diff --git a/cocos/gfx/webgl/webgl-command-buffer.ts b/cocos/gfx/webgl/webgl-command-buffer.ts index 001bc30cb2..cd5d1af767 100644 --- a/cocos/gfx/webgl/webgl-command-buffer.ts +++ b/cocos/gfx/webgl/webgl-command-buffer.ts @@ -352,12 +352,12 @@ export class WebGLGFXCommandBuffer extends GFXCommandBuffer { if (this._curGPUPipelineState) { const glPrimitive = this._curGPUPipelineState.glPrimitive; switch (glPrimitive) { - case WebGLRenderingContext.TRIANGLES: { + case 0x0004: { // WebGLRenderingContext.TRIANGLES this._numTris += inputAssembler.indexCount / 3 * Math.max(inputAssembler.instanceCount, 1); break; } - case WebGLRenderingContext.TRIANGLE_STRIP: - case WebGLRenderingContext.TRIANGLE_FAN: { + case 0x0005: // WebGLRenderingContext.TRIANGLE_STRIP + case 0x0006: { // WebGLRenderingContext.TRIANGLE_FAN this._numTris += (inputAssembler.indexCount - 2) * Math.max(inputAssembler.instanceCount, 1); break; } diff --git a/cocos/gfx/webgl/webgl-commands.ts b/cocos/gfx/webgl/webgl-commands.ts index 027bb256d8..ccfd749510 100644 --- a/cocos/gfx/webgl/webgl-commands.ts +++ b/cocos/gfx/webgl/webgl-commands.ts @@ -10,6 +10,7 @@ import { GFXDynamicState, GFXFormat, GFXFormatInfos, + GFXFormatSize, GFXFormatType, GFXLoadOp, GFXMemoryUsageBit, @@ -24,7 +25,6 @@ import { IGFXFormatInfo, IGFXRect, IGFXViewport, - GFXFormatSize, } from '../define'; import { WebGLGFXCommandAllocator } from './webgl-command-allocator'; import { @@ -45,129 +45,130 @@ function CmpF32NotEuqal (a: number, b: number): boolean { return (c > 0.000001 || c < -0.000001); } -function GFXFormatToWebGLType (format: GFXFormat): GLenum { +function GFXFormatToWebGLType (format: GFXFormat, gl: WebGLRenderingContext): GLenum { switch (format) { - case GFXFormat.R8: return WebGLRenderingContext.UNSIGNED_BYTE; - case GFXFormat.R8SN: return WebGLRenderingContext.BYTE; - case GFXFormat.R8UI: return WebGLRenderingContext.UNSIGNED_BYTE; - case GFXFormat.R8I: return WebGLRenderingContext.BYTE; + case GFXFormat.R8: return gl.UNSIGNED_BYTE; + case GFXFormat.R8SN: return gl.BYTE; + case GFXFormat.R8UI: return gl.UNSIGNED_BYTE; + case GFXFormat.R8I: return gl.BYTE; case GFXFormat.R16F: return WebGLEXT.HALF_FLOAT_OES; - case GFXFormat.R16UI: return WebGLRenderingContext.UNSIGNED_SHORT; - case GFXFormat.R16I: return WebGLRenderingContext.SHORT; - case GFXFormat.R32F: return WebGLRenderingContext.FLOAT; - case GFXFormat.R32UI: return WebGLRenderingContext.UNSIGNED_INT; - case GFXFormat.R32I: return WebGLRenderingContext.INT; + case GFXFormat.R16UI: return gl.UNSIGNED_SHORT; + case GFXFormat.R16I: return gl.SHORT; + case GFXFormat.R32F: return gl.FLOAT; + case GFXFormat.R32UI: return gl.UNSIGNED_INT; + case GFXFormat.R32I: return gl.INT; - case GFXFormat.RG8: return WebGLRenderingContext.UNSIGNED_BYTE; - case GFXFormat.RG8SN: return WebGLRenderingContext.BYTE; - case GFXFormat.RG8UI: return WebGLRenderingContext.UNSIGNED_BYTE; - case GFXFormat.RG8I: return WebGLRenderingContext.BYTE; + case GFXFormat.RG8: return gl.UNSIGNED_BYTE; + case GFXFormat.RG8SN: return gl.BYTE; + case GFXFormat.RG8UI: return gl.UNSIGNED_BYTE; + case GFXFormat.RG8I: return gl.BYTE; case GFXFormat.RG16F: return WebGLEXT.HALF_FLOAT_OES; - case GFXFormat.RG16UI: return WebGLRenderingContext.UNSIGNED_SHORT; - case GFXFormat.RG16I: return WebGLRenderingContext.SHORT; - case GFXFormat.RG32F: return WebGLRenderingContext.FLOAT; - case GFXFormat.RG32UI: return WebGLRenderingContext.UNSIGNED_INT; - case GFXFormat.RG32I: return WebGLRenderingContext.INT; + case GFXFormat.RG16UI: return gl.UNSIGNED_SHORT; + case GFXFormat.RG16I: return gl.SHORT; + case GFXFormat.RG32F: return gl.FLOAT; + case GFXFormat.RG32UI: return gl.UNSIGNED_INT; + case GFXFormat.RG32I: return gl.INT; - case GFXFormat.RGB8: return WebGLRenderingContext.UNSIGNED_BYTE; - case GFXFormat.SRGB8: return WebGLRenderingContext.UNSIGNED_BYTE; - case GFXFormat.RGB8SN: return WebGLRenderingContext.BYTE; - case GFXFormat.RGB8UI: return WebGLRenderingContext.UNSIGNED_BYTE; - case GFXFormat.RGB8I: return WebGLRenderingContext.BYTE; + case GFXFormat.RGB8: return gl.UNSIGNED_BYTE; + case GFXFormat.SRGB8: return gl.UNSIGNED_BYTE; + case GFXFormat.RGB8SN: return gl.BYTE; + case GFXFormat.RGB8UI: return gl.UNSIGNED_BYTE; + case GFXFormat.RGB8I: return gl.BYTE; case GFXFormat.RGB16F: return WebGLEXT.HALF_FLOAT_OES; - case GFXFormat.RGB16UI: return WebGLRenderingContext.UNSIGNED_SHORT; - case GFXFormat.RGB16I: return WebGLRenderingContext.SHORT; - case GFXFormat.RGB32F: return WebGLRenderingContext.FLOAT; - case GFXFormat.RGB32UI: return WebGLRenderingContext.UNSIGNED_INT; - case GFXFormat.RGB32I: return WebGLRenderingContext.INT; + case GFXFormat.RGB16UI: return gl.UNSIGNED_SHORT; + case GFXFormat.RGB16I: return gl.SHORT; + case GFXFormat.RGB32F: return gl.FLOAT; + case GFXFormat.RGB32UI: return gl.UNSIGNED_INT; + case GFXFormat.RGB32I: return gl.INT; - case GFXFormat.RGBA8: return WebGLRenderingContext.UNSIGNED_BYTE; - case GFXFormat.SRGB8_A8: return WebGLRenderingContext.UNSIGNED_BYTE; - case GFXFormat.RGBA8SN: return WebGLRenderingContext.BYTE; - case GFXFormat.RGBA8UI: return WebGLRenderingContext.UNSIGNED_BYTE; - case GFXFormat.RGBA8I: return WebGLRenderingContext.BYTE; + case GFXFormat.RGBA8: return gl.UNSIGNED_BYTE; + case GFXFormat.SRGB8_A8: return gl.UNSIGNED_BYTE; + case GFXFormat.RGBA8SN: return gl.BYTE; + case GFXFormat.RGBA8UI: return gl.UNSIGNED_BYTE; + case GFXFormat.RGBA8I: return gl.BYTE; case GFXFormat.RGBA16F: return WebGLEXT.HALF_FLOAT_OES; - case GFXFormat.RGBA16UI: return WebGLRenderingContext.UNSIGNED_SHORT; - case GFXFormat.RGBA16I: return WebGLRenderingContext.SHORT; - case GFXFormat.RGBA32F: return WebGLRenderingContext.FLOAT; - case GFXFormat.RGBA32UI: return WebGLRenderingContext.UNSIGNED_INT; - case GFXFormat.RGBA32I: return WebGLRenderingContext.INT; + case GFXFormat.RGBA16UI: return gl.UNSIGNED_SHORT; + case GFXFormat.RGBA16I: return gl.SHORT; + case GFXFormat.RGBA32F: return gl.FLOAT; + case GFXFormat.RGBA32UI: return gl.UNSIGNED_INT; + case GFXFormat.RGBA32I: return gl.INT; - case GFXFormat.R5G6B5: return WebGLRenderingContext.UNSIGNED_SHORT_5_6_5; - case GFXFormat.R11G11B10F: return WebGLRenderingContext.FLOAT; - case GFXFormat.RGB5A1: return WebGLRenderingContext.UNSIGNED_SHORT_5_5_5_1; - case GFXFormat.RGBA4: return WebGLRenderingContext.UNSIGNED_SHORT_4_4_4_4; - case GFXFormat.RGB10A2: return WebGLRenderingContext.UNSIGNED_BYTE; - case GFXFormat.RGB10A2UI: return WebGLRenderingContext.UNSIGNED_INT; - case GFXFormat.RGB9E5: return WebGLRenderingContext.UNSIGNED_BYTE; + case GFXFormat.R5G6B5: return gl.UNSIGNED_SHORT_5_6_5; + case GFXFormat.R11G11B10F: return gl.FLOAT; + case GFXFormat.RGB5A1: return gl.UNSIGNED_SHORT_5_5_5_1; + case GFXFormat.RGBA4: return gl.UNSIGNED_SHORT_4_4_4_4; + case GFXFormat.RGB10A2: return gl.UNSIGNED_BYTE; + case GFXFormat.RGB10A2UI: return gl.UNSIGNED_INT; + case GFXFormat.RGB9E5: return gl.UNSIGNED_BYTE; - case GFXFormat.D16: return WebGLRenderingContext.UNSIGNED_SHORT; - case GFXFormat.D16S8: return WebGLRenderingContext.UNSIGNED_SHORT; - case GFXFormat.D24: return WebGLRenderingContext.UNSIGNED_INT; + case GFXFormat.D16: return gl.UNSIGNED_SHORT; + case GFXFormat.D16S8: return gl.UNSIGNED_SHORT; + case GFXFormat.D24: return gl.UNSIGNED_INT; case GFXFormat.D24S8: return WebGLEXT.UNSIGNED_INT_24_8_WEBGL; - case GFXFormat.D32F: return WebGLRenderingContext.FLOAT; - case GFXFormat.D32F_S8: return WebGLRenderingContext.FLOAT; + case GFXFormat.D32F: return gl.FLOAT; + case GFXFormat.D32F_S8: return gl.FLOAT; - case GFXFormat.BC1: return WebGLRenderingContext.UNSIGNED_BYTE; - case GFXFormat.BC1_SRGB: return WebGLRenderingContext.UNSIGNED_BYTE; - case GFXFormat.BC2: return WebGLRenderingContext.UNSIGNED_BYTE; - case GFXFormat.BC2_SRGB: return WebGLRenderingContext.UNSIGNED_BYTE; - case GFXFormat.BC3: return WebGLRenderingContext.UNSIGNED_BYTE; - case GFXFormat.BC3_SRGB: return WebGLRenderingContext.UNSIGNED_BYTE; - case GFXFormat.BC4: return WebGLRenderingContext.UNSIGNED_BYTE; - case GFXFormat.BC4_SNORM: return WebGLRenderingContext.BYTE; - case GFXFormat.BC5: return WebGLRenderingContext.UNSIGNED_BYTE; - case GFXFormat.BC5_SNORM: return WebGLRenderingContext.BYTE; - case GFXFormat.BC6H_SF16: return WebGLRenderingContext.FLOAT; - case GFXFormat.BC6H_UF16: return WebGLRenderingContext.FLOAT; - case GFXFormat.BC7: return WebGLRenderingContext.UNSIGNED_BYTE; - case GFXFormat.BC7_SRGB: return WebGLRenderingContext.UNSIGNED_BYTE; + case GFXFormat.BC1: return gl.UNSIGNED_BYTE; + case GFXFormat.BC1_SRGB: return gl.UNSIGNED_BYTE; + case GFXFormat.BC2: return gl.UNSIGNED_BYTE; + case GFXFormat.BC2_SRGB: return gl.UNSIGNED_BYTE; + case GFXFormat.BC3: return gl.UNSIGNED_BYTE; + case GFXFormat.BC3_SRGB: return gl.UNSIGNED_BYTE; + case GFXFormat.BC4: return gl.UNSIGNED_BYTE; + case GFXFormat.BC4_SNORM: return gl.BYTE; + case GFXFormat.BC5: return gl.UNSIGNED_BYTE; + case GFXFormat.BC5_SNORM: return gl.BYTE; + case GFXFormat.BC6H_SF16: return gl.FLOAT; + case GFXFormat.BC6H_UF16: return gl.FLOAT; + case GFXFormat.BC7: return gl.UNSIGNED_BYTE; + case GFXFormat.BC7_SRGB: return gl.UNSIGNED_BYTE; - case GFXFormat.ETC_RGB8: return WebGLRenderingContext.UNSIGNED_BYTE; - case GFXFormat.ETC2_RGB8: return WebGLRenderingContext.UNSIGNED_BYTE; - case GFXFormat.ETC2_SRGB8: return WebGLRenderingContext.UNSIGNED_BYTE; - case GFXFormat.ETC2_RGB8_A1: return WebGLRenderingContext.UNSIGNED_BYTE; - case GFXFormat.ETC2_SRGB8_A1: return WebGLRenderingContext.UNSIGNED_BYTE; - case GFXFormat.ETC2_RGB8: return WebGLRenderingContext.UNSIGNED_BYTE; - case GFXFormat.ETC2_SRGB8: return WebGLRenderingContext.UNSIGNED_BYTE; - case GFXFormat.EAC_R11: return WebGLRenderingContext.UNSIGNED_BYTE; - case GFXFormat.EAC_R11SN: return WebGLRenderingContext.BYTE; - case GFXFormat.EAC_RG11: return WebGLRenderingContext.UNSIGNED_BYTE; - case GFXFormat.EAC_RG11SN: return WebGLRenderingContext.BYTE; + case GFXFormat.ETC_RGB8: return gl.UNSIGNED_BYTE; + case GFXFormat.ETC2_RGB8: return gl.UNSIGNED_BYTE; + case GFXFormat.ETC2_SRGB8: return gl.UNSIGNED_BYTE; + case GFXFormat.ETC2_RGB8_A1: return gl.UNSIGNED_BYTE; + case GFXFormat.ETC2_SRGB8_A1: return gl.UNSIGNED_BYTE; + case GFXFormat.ETC2_RGB8: return gl.UNSIGNED_BYTE; + case GFXFormat.ETC2_SRGB8: return gl.UNSIGNED_BYTE; + case GFXFormat.EAC_R11: return gl.UNSIGNED_BYTE; + case GFXFormat.EAC_R11SN: return gl.BYTE; + case GFXFormat.EAC_RG11: return gl.UNSIGNED_BYTE; + case GFXFormat.EAC_RG11SN: return gl.BYTE; - case GFXFormat.PVRTC_RGB2: return WebGLRenderingContext.UNSIGNED_BYTE; - case GFXFormat.PVRTC_RGBA2: return WebGLRenderingContext.UNSIGNED_BYTE; - case GFXFormat.PVRTC_RGB4: return WebGLRenderingContext.UNSIGNED_BYTE; - case GFXFormat.PVRTC_RGBA4: return WebGLRenderingContext.UNSIGNED_BYTE; - case GFXFormat.PVRTC2_2BPP: return WebGLRenderingContext.UNSIGNED_BYTE; - case GFXFormat.PVRTC2_4BPP: return WebGLRenderingContext.UNSIGNED_BYTE; + case GFXFormat.PVRTC_RGB2: return gl.UNSIGNED_BYTE; + case GFXFormat.PVRTC_RGBA2: return gl.UNSIGNED_BYTE; + case GFXFormat.PVRTC_RGB4: return gl.UNSIGNED_BYTE; + case GFXFormat.PVRTC_RGBA4: return gl.UNSIGNED_BYTE; + case GFXFormat.PVRTC2_2BPP: return gl.UNSIGNED_BYTE; + case GFXFormat.PVRTC2_4BPP: return gl.UNSIGNED_BYTE; default: { - return WebGLRenderingContext.UNSIGNED_BYTE; + return gl.UNSIGNED_BYTE; } } } -function GFXFormatToWebGLInternalFormat (format: GFXFormat): GLenum { +// tslint:disable: max-line-length +function GFXFormatToWebGLInternalFormat (format: GFXFormat, gl: WebGLRenderingContext): GLenum { switch (format) { - case GFXFormat.A8: return WebGLRenderingContext.ALPHA; - case GFXFormat.L8: return WebGLRenderingContext.LUMINANCE; - case GFXFormat.LA8: return WebGLRenderingContext.LUMINANCE_ALPHA; - case GFXFormat.RGB8: return WebGLRenderingContext.RGB; - case GFXFormat.RGB16F: return WebGLRenderingContext.RGB; - case GFXFormat.RGB32F: return WebGLRenderingContext.RGB; - case GFXFormat.RGBA8: return WebGLRenderingContext.RGBA; - case GFXFormat.RGBA16F: return WebGLRenderingContext.RGBA; - case GFXFormat.RGBA32F: return WebGLRenderingContext.RGBA; - case GFXFormat.R5G6B5: return WebGLRenderingContext.RGB565; - case GFXFormat.RGB5A1: return WebGLRenderingContext.RGB5_A1; - case GFXFormat.RGBA4: return WebGLRenderingContext.RGBA4; - case GFXFormat.D16: return WebGLRenderingContext.DEPTH_COMPONENT16; - case GFXFormat.D16S8: return WebGLRenderingContext.DEPTH_STENCIL; - case GFXFormat.D24: return WebGLRenderingContext.DEPTH_COMPONENT; - case GFXFormat.D24S8: return WebGLRenderingContext.DEPTH_STENCIL; - case GFXFormat.D32F: return WebGLRenderingContext.DEPTH_COMPONENT; - case GFXFormat.D32F_S8: return WebGLRenderingContext.DEPTH_STENCIL; + case GFXFormat.A8: return gl.ALPHA; + case GFXFormat.L8: return gl.LUMINANCE; + case GFXFormat.LA8: return gl.LUMINANCE_ALPHA; + case GFXFormat.RGB8: return gl.RGB; + case GFXFormat.RGB16F: return gl.RGB; + case GFXFormat.RGB32F: return gl.RGB; + case GFXFormat.RGBA8: return gl.RGBA; + case GFXFormat.RGBA16F: return gl.RGBA; + case GFXFormat.RGBA32F: return gl.RGBA; + case GFXFormat.R5G6B5: return gl.RGB565; + case GFXFormat.RGB5A1: return gl.RGB5_A1; + case GFXFormat.RGBA4: return gl.RGBA4; + case GFXFormat.D16: return gl.DEPTH_COMPONENT16; + case GFXFormat.D16S8: return gl.DEPTH_STENCIL; + case GFXFormat.D24: return gl.DEPTH_COMPONENT; + case GFXFormat.D24S8: return gl.DEPTH_STENCIL; + case GFXFormat.D32F: return gl.DEPTH_COMPONENT; + case GFXFormat.D32F_S8: return gl.DEPTH_STENCIL; case GFXFormat.BC1: return WebGLEXT.COMPRESSED_RGB_S3TC_DXT1_EXT; case GFXFormat.BC1_ALPHA: return WebGLEXT.COMPRESSED_RGBA_S3TC_DXT1_EXT; @@ -187,31 +188,32 @@ function GFXFormatToWebGLInternalFormat (format: GFXFormat): GLenum { default: { console.error('Unsupported GFXFormat, convert to WebGL internal format failed.'); - return WebGLRenderingContext.RGBA; + return gl.RGBA; } } } +// tslint:enable: max-line-length -function GFXFormatToWebGLFormat (format: GFXFormat): GLenum { +function GFXFormatToWebGLFormat (format: GFXFormat, gl: WebGLRenderingContext): GLenum { switch (format) { - case GFXFormat.A8: return WebGLRenderingContext.ALPHA; - case GFXFormat.L8: return WebGLRenderingContext.LUMINANCE; - case GFXFormat.LA8: return WebGLRenderingContext.LUMINANCE_ALPHA; - case GFXFormat.RGB8: return WebGLRenderingContext.RGB; - case GFXFormat.RGB16F: return WebGLRenderingContext.RGB; - case GFXFormat.RGB32F: return WebGLRenderingContext.RGB; - case GFXFormat.RGBA8: return WebGLRenderingContext.RGBA; - case GFXFormat.RGBA16F: return WebGLRenderingContext.RGBA; - case GFXFormat.RGBA32F: return WebGLRenderingContext.RGBA; - case GFXFormat.R5G6B5: return WebGLRenderingContext.RGB; - case GFXFormat.RGB5A1: return WebGLRenderingContext.RGBA; - case GFXFormat.RGBA4: return WebGLRenderingContext.RGBA; - case GFXFormat.D16: return WebGLRenderingContext.DEPTH_COMPONENT; - case GFXFormat.D16S8: return WebGLRenderingContext.DEPTH_STENCIL; - case GFXFormat.D24: return WebGLRenderingContext.DEPTH_COMPONENT; - case GFXFormat.D24S8: return WebGLRenderingContext.DEPTH_STENCIL; - case GFXFormat.D32F: return WebGLRenderingContext.DEPTH_COMPONENT; - case GFXFormat.D32F_S8: return WebGLRenderingContext.DEPTH_STENCIL; + case GFXFormat.A8: return gl.ALPHA; + case GFXFormat.L8: return gl.LUMINANCE; + case GFXFormat.LA8: return gl.LUMINANCE_ALPHA; + case GFXFormat.RGB8: return gl.RGB; + case GFXFormat.RGB16F: return gl.RGB; + case GFXFormat.RGB32F: return gl.RGB; + case GFXFormat.RGBA8: return gl.RGBA; + case GFXFormat.RGBA16F: return gl.RGBA; + case GFXFormat.RGBA32F: return gl.RGBA; + case GFXFormat.R5G6B5: return gl.RGB; + case GFXFormat.RGB5A1: return gl.RGBA; + case GFXFormat.RGBA4: return gl.RGBA; + case GFXFormat.D16: return gl.DEPTH_COMPONENT; + case GFXFormat.D16S8: return gl.DEPTH_STENCIL; + case GFXFormat.D24: return gl.DEPTH_COMPONENT; + case GFXFormat.D24S8: return gl.DEPTH_STENCIL; + case GFXFormat.D32F: return gl.DEPTH_COMPONENT; + case GFXFormat.D32F_S8: return gl.DEPTH_STENCIL; case GFXFormat.BC1: return WebGLEXT.COMPRESSED_RGB_S3TC_DXT1_EXT; case GFXFormat.BC1_ALPHA: return WebGLEXT.COMPRESSED_RGBA_S3TC_DXT1_EXT; @@ -241,31 +243,31 @@ function GFXFormatToWebGLFormat (format: GFXFormat): GLenum { default: { console.error('Unsupported GFXFormat, convert to WebGL format failed.'); - return WebGLRenderingContext.RGBA; + return gl.RGBA; } } } -function GFXTypeToWebGLType (type: GFXType): GLenum { +function GFXTypeToWebGLType (type: GFXType, gl: WebGLRenderingContext): GLenum { switch (type) { - case GFXType.BOOL: return WebGLRenderingContext.BOOL; - case GFXType.BOOL2: return WebGLRenderingContext.BOOL_VEC2; - case GFXType.BOOL3: return WebGLRenderingContext.BOOL_VEC3; - case GFXType.BOOL4: return WebGLRenderingContext.BOOL_VEC4; - case GFXType.INT: return WebGLRenderingContext.INT; - case GFXType.INT2: return WebGLRenderingContext.INT_VEC2; - case GFXType.INT3: return WebGLRenderingContext.INT_VEC3; - case GFXType.INT4: return WebGLRenderingContext.INT_VEC4; - case GFXType.UINT: return WebGLRenderingContext.UNSIGNED_INT; - case GFXType.FLOAT: return WebGLRenderingContext.FLOAT; - case GFXType.FLOAT2: return WebGLRenderingContext.FLOAT_VEC2; - case GFXType.FLOAT3: return WebGLRenderingContext.FLOAT_VEC3; - case GFXType.FLOAT4: return WebGLRenderingContext.FLOAT_VEC4; - case GFXType.MAT2: return WebGLRenderingContext.FLOAT_MAT2; - case GFXType.MAT3: return WebGLRenderingContext.FLOAT_MAT3; - case GFXType.MAT4: return WebGLRenderingContext.FLOAT_MAT4; - case GFXType.SAMPLER2D: return WebGLRenderingContext.SAMPLER_2D; - case GFXType.SAMPLER_CUBE: return WebGLRenderingContext.SAMPLER_CUBE; + case GFXType.BOOL: return gl.BOOL; + case GFXType.BOOL2: return gl.BOOL_VEC2; + case GFXType.BOOL3: return gl.BOOL_VEC3; + case GFXType.BOOL4: return gl.BOOL_VEC4; + case GFXType.INT: return gl.INT; + case GFXType.INT2: return gl.INT_VEC2; + case GFXType.INT3: return gl.INT_VEC3; + case GFXType.INT4: return gl.INT_VEC4; + case GFXType.UINT: return gl.UNSIGNED_INT; + case GFXType.FLOAT: return gl.FLOAT; + case GFXType.FLOAT2: return gl.FLOAT_VEC2; + case GFXType.FLOAT3: return gl.FLOAT_VEC3; + case GFXType.FLOAT4: return gl.FLOAT_VEC4; + case GFXType.MAT2: return gl.FLOAT_MAT2; + case GFXType.MAT3: return gl.FLOAT_MAT3; + case GFXType.MAT4: return gl.FLOAT_MAT4; + case GFXType.SAMPLER2D: return gl.SAMPLER_2D; + case GFXType.SAMPLER_CUBE: return gl.SAMPLER_CUBE; default: { console.error('Unsupported GLType, convert to GL type failed.'); return GFXType.UNKNOWN; @@ -273,26 +275,26 @@ function GFXTypeToWebGLType (type: GFXType): GLenum { } } -function WebGLTypeToGFXType (glType: GLenum): GFXType { +function WebGLTypeToGFXType (glType: GLenum, gl: WebGLRenderingContext): GFXType { switch (glType) { - case WebGLRenderingContext.BOOL: return GFXType.BOOL; - case WebGLRenderingContext.BOOL_VEC2: return GFXType.BOOL2; - case WebGLRenderingContext.BOOL_VEC3: return GFXType.BOOL3; - case WebGLRenderingContext.BOOL_VEC4: return GFXType.BOOL4; - case WebGLRenderingContext.INT: return GFXType.INT; - case WebGLRenderingContext.INT_VEC2: return GFXType.INT2; - case WebGLRenderingContext.INT_VEC3: return GFXType.INT3; - case WebGLRenderingContext.INT_VEC4: return GFXType.INT4; - case WebGLRenderingContext.UNSIGNED_INT: return GFXType.UINT; - case WebGLRenderingContext.FLOAT: return GFXType.FLOAT; - case WebGLRenderingContext.FLOAT_VEC2: return GFXType.FLOAT2; - case WebGLRenderingContext.FLOAT_VEC3: return GFXType.FLOAT3; - case WebGLRenderingContext.FLOAT_VEC4: return GFXType.FLOAT4; - case WebGLRenderingContext.FLOAT_MAT2: return GFXType.MAT2; - case WebGLRenderingContext.FLOAT_MAT3: return GFXType.MAT3; - case WebGLRenderingContext.FLOAT_MAT4: return GFXType.MAT4; - case WebGLRenderingContext.SAMPLER_2D: return GFXType.SAMPLER2D; - case WebGLRenderingContext.SAMPLER_CUBE: return GFXType.SAMPLER_CUBE; + case gl.BOOL: return GFXType.BOOL; + case gl.BOOL_VEC2: return GFXType.BOOL2; + case gl.BOOL_VEC3: return GFXType.BOOL3; + case gl.BOOL_VEC4: return GFXType.BOOL4; + case gl.INT: return GFXType.INT; + case gl.INT_VEC2: return GFXType.INT2; + case gl.INT_VEC3: return GFXType.INT3; + case gl.INT_VEC4: return GFXType.INT4; + case gl.UNSIGNED_INT: return GFXType.UINT; + case gl.FLOAT: return GFXType.FLOAT; + case gl.FLOAT_VEC2: return GFXType.FLOAT2; + case gl.FLOAT_VEC3: return GFXType.FLOAT3; + case gl.FLOAT_VEC4: return GFXType.FLOAT4; + case gl.FLOAT_MAT2: return GFXType.MAT2; + case gl.FLOAT_MAT3: return GFXType.MAT3; + case gl.FLOAT_MAT4: return GFXType.MAT4; + case gl.SAMPLER_2D: return GFXType.SAMPLER2D; + case gl.SAMPLER_CUBE: return GFXType.SAMPLER_CUBE; default: { console.error('Unsupported GLType, convert to GFXType failed.'); return GFXType.UNKNOWN; @@ -300,26 +302,26 @@ function WebGLTypeToGFXType (glType: GLenum): GFXType { } } -function WebGLGetTypeSize (glType: GLenum): GFXType { +function WebGLGetTypeSize (glType: GLenum, gl: WebGLRenderingContext): GFXType { switch (glType) { - case WebGLRenderingContext.BOOL: return 4; - case WebGLRenderingContext.BOOL_VEC2: return 8; - case WebGLRenderingContext.BOOL_VEC3: return 12; - case WebGLRenderingContext.BOOL_VEC4: return 16; - case WebGLRenderingContext.INT: return 4; - case WebGLRenderingContext.INT_VEC2: return 8; - case WebGLRenderingContext.INT_VEC3: return 12; - case WebGLRenderingContext.INT_VEC4: return 16; - case WebGLRenderingContext.UNSIGNED_INT: return 4; - case WebGLRenderingContext.FLOAT: return 4; - case WebGLRenderingContext.FLOAT_VEC2: return 8; - case WebGLRenderingContext.FLOAT_VEC3: return 12; - case WebGLRenderingContext.FLOAT_VEC4: return 16; - case WebGLRenderingContext.FLOAT_MAT2: return 16; - case WebGLRenderingContext.FLOAT_MAT3: return 36; - case WebGLRenderingContext.FLOAT_MAT4: return 64; - case WebGLRenderingContext.SAMPLER_2D: return 4; - case WebGLRenderingContext.SAMPLER_CUBE: return 4; + case gl.BOOL: return 4; + case gl.BOOL_VEC2: return 8; + case gl.BOOL_VEC3: return 12; + case gl.BOOL_VEC4: return 16; + case gl.INT: return 4; + case gl.INT_VEC2: return 8; + case gl.INT_VEC3: return 12; + case gl.INT_VEC4: return 16; + case gl.UNSIGNED_INT: return 4; + case gl.FLOAT: return 4; + case gl.FLOAT_VEC2: return 8; + case gl.FLOAT_VEC3: return 12; + case gl.FLOAT_VEC4: return 16; + case gl.FLOAT_MAT2: return 16; + case gl.FLOAT_MAT3: return 36; + case gl.FLOAT_MAT4: return 64; + case gl.SAMPLER_2D: return 4; + case gl.SAMPLER_CUBE: return 4; default: { console.error('Unsupported GLType, get type failed.'); return 0; @@ -327,11 +329,11 @@ function WebGLGetTypeSize (glType: GLenum): GFXType { } } -function WebGLGetComponentCount (glType: GLenum): GFXType { +function WebGLGetComponentCount (glType: GLenum, gl: WebGLRenderingContext): GFXType { switch (glType) { - case WebGLRenderingContext.FLOAT_MAT2: return 2; - case WebGLRenderingContext.FLOAT_MAT3: return 3; - case WebGLRenderingContext.FLOAT_MAT4: return 4; + case gl.FLOAT_MAT2: return 2; + case gl.FLOAT_MAT3: return 3; + case gl.FLOAT_MAT4: return 4; default: { return 1; } @@ -339,51 +341,51 @@ function WebGLGetComponentCount (glType: GLenum): GFXType { } const WebGLCmpFuncs: GLenum[] = [ - WebGLRenderingContext.NEVER, - WebGLRenderingContext.LESS, - WebGLRenderingContext.EQUAL, - WebGLRenderingContext.LEQUAL, - WebGLRenderingContext.GREATER, - WebGLRenderingContext.NOTEQUAL, - WebGLRenderingContext.GEQUAL, - WebGLRenderingContext.ALWAYS, + 0x0200, // WebGLRenderingContext.NEVER, + 0x0201, // WebGLRenderingContext.LESS, + 0x0202, // WebGLRenderingContext.EQUAL, + 0x0203, // WebGLRenderingContext.LEQUAL, + 0x0204, // WebGLRenderingContext.GREATER, + 0x0205, // WebGLRenderingContext.NOTEQUAL, + 0x0206, // WebGLRenderingContext.GEQUAL, + 0x0207, // WebGLRenderingContext.ALWAYS, ]; const WebGLStencilOps: GLenum[] = [ - WebGLRenderingContext.ZERO, - WebGLRenderingContext.KEEP, - WebGLRenderingContext.REPLACE, - WebGLRenderingContext.INCR, - WebGLRenderingContext.DECR, - WebGLRenderingContext.INVERT, - WebGLRenderingContext.INCR_WRAP, - WebGLRenderingContext.DECR_WRAP, + 0x0000, // WebGLRenderingContext.ZERO, + 0x1E00, // WebGLRenderingContext.KEEP, + 0x1E01, // WebGLRenderingContext.REPLACE, + 0x1E02, // WebGLRenderingContext.INCR, + 0x1E03, // WebGLRenderingContext.DECR, + 0x150A, // WebGLRenderingContext.INVERT, + 0x8507, // WebGLRenderingContext.INCR_WRAP, + 0x8508, // WebGLRenderingContext.DECR_WRAP, ]; const WebGLBlendOps: GLenum[] = [ - WebGLRenderingContext.FUNC_ADD, - WebGLRenderingContext.FUNC_SUBTRACT, - WebGLRenderingContext.FUNC_REVERSE_SUBTRACT, - WebGLRenderingContext.FUNC_ADD, - WebGLRenderingContext.FUNC_ADD, + 0x8006, // WebGLRenderingContext.FUNC_ADD, + 0x800A, // WebGLRenderingContext.FUNC_SUBTRACT, + 0x800B, // WebGLRenderingContext.FUNC_REVERSE_SUBTRACT, + 0x8006, // WebGLRenderingContext.FUNC_ADD, + 0x8006, // WebGLRenderingContext.FUNC_ADD, ]; const WebGLBlendFactors: GLenum[] = [ - WebGLRenderingContext.ZERO, - WebGLRenderingContext.ONE, - WebGLRenderingContext.SRC_ALPHA, - WebGLRenderingContext.DST_ALPHA, - WebGLRenderingContext.ONE_MINUS_SRC_ALPHA, - WebGLRenderingContext.ONE_MINUS_DST_ALPHA, - WebGLRenderingContext.SRC_COLOR, - WebGLRenderingContext.DST_COLOR, - WebGLRenderingContext.ONE_MINUS_SRC_COLOR, - WebGLRenderingContext.ONE_MINUS_DST_COLOR, - WebGLRenderingContext.SRC_ALPHA_SATURATE, - WebGLRenderingContext.CONSTANT_COLOR, - WebGLRenderingContext.ONE_MINUS_CONSTANT_COLOR, - WebGLRenderingContext.CONSTANT_ALPHA, - WebGLRenderingContext.ONE_MINUS_CONSTANT_ALPHA, + 0x0000, // WebGLRenderingContext.ZERO, + 0x0001, // WebGLRenderingContext.ONE, + 0x0302, // WebGLRenderingContext.SRC_ALPHA, + 0x0304, // WebGLRenderingContext.DST_ALPHA, + 0x0303, // WebGLRenderingContext.ONE_MINUS_SRC_ALPHA, + 0x0305, // WebGLRenderingContext.ONE_MINUS_DST_ALPHA, + 0x0300, // WebGLRenderingContext.SRC_COLOR, + 0x0306, // WebGLRenderingContext.DST_COLOR, + 0x0301, // WebGLRenderingContext.ONE_MINUS_SRC_COLOR, + 0x0307, // WebGLRenderingContext.ONE_MINUS_DST_COLOR, + 0x0308, // WebGLRenderingContext.SRC_ALPHA_SATURATE, + 0x8001, // WebGLRenderingContext.CONSTANT_COLOR, + 0x8002, // WebGLRenderingContext.ONE_MINUS_CONSTANT_COLOR, + 0x8003, // WebGLRenderingContext.CONSTANT_ALPHA, + 0x8004, // WebGLRenderingContext.ONE_MINUS_CONSTANT_ALPHA, ]; export enum WebGLCmd { @@ -574,11 +576,11 @@ export function WebGLCmdFuncCreateBuffer (device: WebGLGFXDevice, gpuBuffer: Web const gl = device.gl; const cache = device.stateCache; - const glUsage: GLenum = gpuBuffer.memUsage & GFXMemoryUsageBit.HOST ? WebGLRenderingContext.DYNAMIC_DRAW : WebGLRenderingContext.STATIC_DRAW; + const glUsage: GLenum = gpuBuffer.memUsage & GFXMemoryUsageBit.HOST ? gl.DYNAMIC_DRAW : gl.STATIC_DRAW; if (gpuBuffer.usage & GFXBufferUsageBit.VERTEX) { - gpuBuffer.glTarget = WebGLRenderingContext.ARRAY_BUFFER; + gpuBuffer.glTarget = gl.ARRAY_BUFFER; const glBuffer = gl.createBuffer(); if (glBuffer) { gpuBuffer.glBuffer = glBuffer; @@ -591,18 +593,18 @@ export function WebGLCmdFuncCreateBuffer (device: WebGLGFXDevice, gpuBuffer: Web } if (device.stateCache.glArrayBuffer !== gpuBuffer.glBuffer) { - gl.bindBuffer(WebGLRenderingContext.ARRAY_BUFFER, gpuBuffer.glBuffer); + gl.bindBuffer(gl.ARRAY_BUFFER, gpuBuffer.glBuffer); device.stateCache.glArrayBuffer = gpuBuffer.glBuffer; } - gl.bufferData(WebGLRenderingContext.ARRAY_BUFFER, gpuBuffer.size, glUsage); - gl.bindBuffer(WebGLRenderingContext.ARRAY_BUFFER, null); + gl.bufferData(gl.ARRAY_BUFFER, gpuBuffer.size, glUsage); + gl.bindBuffer(gl.ARRAY_BUFFER, null); device.stateCache.glArrayBuffer = null; } } } else if (gpuBuffer.usage & GFXBufferUsageBit.INDEX) { - gpuBuffer.glTarget = WebGLRenderingContext.ELEMENT_ARRAY_BUFFER; + gpuBuffer.glTarget = gl.ELEMENT_ARRAY_BUFFER; const glBuffer = gl.createBuffer(); if (glBuffer) { @@ -616,31 +618,31 @@ export function WebGLCmdFuncCreateBuffer (device: WebGLGFXDevice, gpuBuffer: Web } if (device.stateCache.glElementArrayBuffer !== gpuBuffer.glBuffer) { - gl.bindBuffer(WebGLRenderingContext.ELEMENT_ARRAY_BUFFER, gpuBuffer.glBuffer); + gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, gpuBuffer.glBuffer); device.stateCache.glElementArrayBuffer = gpuBuffer.glBuffer; } - gl.bufferData(WebGLRenderingContext.ELEMENT_ARRAY_BUFFER, gpuBuffer.size, glUsage); - gl.bindBuffer(WebGLRenderingContext.ELEMENT_ARRAY_BUFFER, null); + gl.bufferData(gl.ELEMENT_ARRAY_BUFFER, gpuBuffer.size, glUsage); + gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, null); device.stateCache.glElementArrayBuffer = null; } } } else if (gpuBuffer.usage & GFXBufferUsageBit.UNIFORM) { // console.error("WebGL 1.0 doesn't support uniform buffer."); - gpuBuffer.glTarget = WebGLRenderingContext.NONE; + gpuBuffer.glTarget = gl.NONE; if (gpuBuffer.buffer) { gpuBuffer.vf32 = new Float32Array(gpuBuffer.buffer as ArrayBuffer); } } else if (gpuBuffer.usage & GFXBufferUsageBit.INDIRECT) { - gpuBuffer.glTarget = WebGLRenderingContext.NONE; + gpuBuffer.glTarget = gl.NONE; } else if (gpuBuffer.usage & GFXBufferUsageBit.TRANSFER_DST) { - gpuBuffer.glTarget = WebGLRenderingContext.NONE; + gpuBuffer.glTarget = gl.NONE; } else if (gpuBuffer.usage & GFXBufferUsageBit.TRANSFER_SRC) { - gpuBuffer.glTarget = WebGLRenderingContext.NONE; + gpuBuffer.glTarget = gl.NONE; } else { console.error('Unsupported GFXBufferType, create buffer failed.'); - gpuBuffer.glTarget = WebGLRenderingContext.NONE; + gpuBuffer.glTarget = gl.NONE; } } @@ -655,7 +657,7 @@ export function WebGLCmdFuncResizeBuffer (device: WebGLGFXDevice, gpuBuffer: Web const gl = device.gl; const cache = device.stateCache; - const glUsage: GLenum = gpuBuffer.memUsage & GFXMemoryUsageBit.HOST ? WebGLRenderingContext.DYNAMIC_DRAW : WebGLRenderingContext.STATIC_DRAW; + const glUsage: GLenum = gpuBuffer.memUsage & GFXMemoryUsageBit.HOST ? gl.DYNAMIC_DRAW : gl.STATIC_DRAW; if (gpuBuffer.usage & GFXBufferUsageBit.VERTEX) { if (device.useVAO) { @@ -666,11 +668,11 @@ export function WebGLCmdFuncResizeBuffer (device: WebGLGFXDevice, gpuBuffer: Web } if (device.stateCache.glArrayBuffer !== gpuBuffer.glBuffer) { - gl.bindBuffer(WebGLRenderingContext.ARRAY_BUFFER, gpuBuffer.glBuffer); + gl.bindBuffer(gl.ARRAY_BUFFER, gpuBuffer.glBuffer); } - gl.bufferData(WebGLRenderingContext.ARRAY_BUFFER, gpuBuffer.size, glUsage); - gl.bindBuffer(WebGLRenderingContext.ARRAY_BUFFER, null); + gl.bufferData(gl.ARRAY_BUFFER, gpuBuffer.size, glUsage); + gl.bindBuffer(gl.ARRAY_BUFFER, null); device.stateCache.glArrayBuffer = null; } else if (gpuBuffer.usage & GFXBufferUsageBit.INDEX) { if (device.useVAO) { @@ -681,11 +683,11 @@ export function WebGLCmdFuncResizeBuffer (device: WebGLGFXDevice, gpuBuffer: Web } if (device.stateCache.glElementArrayBuffer !== gpuBuffer.glBuffer) { - gl.bindBuffer(WebGLRenderingContext.ELEMENT_ARRAY_BUFFER, gpuBuffer.glBuffer); + gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, gpuBuffer.glBuffer); } - gl.bufferData(WebGLRenderingContext.ELEMENT_ARRAY_BUFFER, gpuBuffer.size, glUsage); - gl.bindBuffer(WebGLRenderingContext.ELEMENT_ARRAY_BUFFER, null); + gl.bufferData(gl.ELEMENT_ARRAY_BUFFER, gpuBuffer.size, glUsage); + gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, null); device.stateCache.glElementArrayBuffer = null; } else if (gpuBuffer.usage & GFXBufferUsageBit.UNIFORM) { // console.error("WebGL 1.0 doesn't support uniform buffer."); @@ -695,10 +697,10 @@ export function WebGLCmdFuncResizeBuffer (device: WebGLGFXDevice, gpuBuffer: Web } else if ((gpuBuffer.usage & GFXBufferUsageBit.INDIRECT) || (gpuBuffer.usage & GFXBufferUsageBit.TRANSFER_DST) || (gpuBuffer.usage & GFXBufferUsageBit.TRANSFER_SRC)) { - gpuBuffer.glTarget = WebGLRenderingContext.NONE; + gpuBuffer.glTarget = gl.NONE; } else { console.error('Unsupported GFXBufferType, create buffer failed.'); - gpuBuffer.glTarget = WebGLRenderingContext.NONE; + gpuBuffer.glTarget = gl.NONE; } } @@ -718,7 +720,7 @@ export function WebGLCmdFuncUpdateBuffer (device: WebGLGFXDevice, gpuBuffer: Web const cache = device.stateCache; switch (gpuBuffer.glTarget) { - case WebGLRenderingContext.ARRAY_BUFFER: { + case gl.ARRAY_BUFFER: { if (device.useVAO) { if (cache.glVAO) { device.OES_vertex_array_object!.bindVertexArrayOES(null); @@ -727,12 +729,12 @@ export function WebGLCmdFuncUpdateBuffer (device: WebGLGFXDevice, gpuBuffer: Web } if (device.stateCache.glArrayBuffer !== gpuBuffer.glBuffer) { - gl.bindBuffer(WebGLRenderingContext.ARRAY_BUFFER, gpuBuffer.glBuffer); + gl.bindBuffer(gl.ARRAY_BUFFER, gpuBuffer.glBuffer); device.stateCache.glArrayBuffer = gpuBuffer.glBuffer; } break; } - case WebGLRenderingContext.ELEMENT_ARRAY_BUFFER: { + case gl.ELEMENT_ARRAY_BUFFER: { if (device.useVAO) { if (cache.glVAO) { device.OES_vertex_array_object!.bindVertexArrayOES(null); @@ -741,7 +743,7 @@ export function WebGLCmdFuncUpdateBuffer (device: WebGLGFXDevice, gpuBuffer: Web } if (device.stateCache.glElementArrayBuffer !== gpuBuffer.glBuffer) { - gl.bindBuffer(WebGLRenderingContext.ELEMENT_ARRAY_BUFFER, gpuBuffer.glBuffer); + gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, gpuBuffer.glBuffer); device.stateCache.glElementArrayBuffer = gpuBuffer.glBuffer; } break; @@ -764,15 +766,15 @@ export function WebGLCmdFuncCreateTexture (device: WebGLGFXDevice, gpuTexture: W const gl = device.gl; - gpuTexture.glInternelFmt = GFXFormatToWebGLInternalFormat(gpuTexture.format); - gpuTexture.glFormat = GFXFormatToWebGLFormat(gpuTexture.format); - gpuTexture.glType = GFXFormatToWebGLType(gpuTexture.format); + gpuTexture.glInternelFmt = GFXFormatToWebGLInternalFormat(gpuTexture.format, gl); + gpuTexture.glFormat = GFXFormatToWebGLFormat(gpuTexture.format, gl); + gpuTexture.glType = GFXFormatToWebGLType(gpuTexture.format, gl); switch (gpuTexture.viewType) { case GFXTextureViewType.TV2D: { gpuTexture.viewType = GFXTextureViewType.TV2D; - gpuTexture.glTarget = WebGLRenderingContext.TEXTURE_2D; + gpuTexture.glTarget = gl.TEXTURE_2D; if (gpuTexture.samples === GFXSampleCount.X1) { const glTexture = gl.createTexture(); @@ -781,7 +783,7 @@ export function WebGLCmdFuncCreateTexture (device: WebGLGFXDevice, gpuTexture: W const glTexUnit = device.stateCache.glTex2DUnits[device.stateCache.texUnit]; if (glTexUnit.glTexture !== gpuTexture.glTexture) { - gl.bindTexture(WebGLRenderingContext.TEXTURE_2D, gpuTexture.glTexture); + gl.bindTexture(gl.TEXTURE_2D, gpuTexture.glTexture); glTexUnit.glTexture = gpuTexture.glTexture; } @@ -790,7 +792,7 @@ export function WebGLCmdFuncCreateTexture (device: WebGLGFXDevice, gpuTexture: W if (!GFXFormatInfos[gpuTexture.format].isCompressed) { for (let i = 0; i < gpuTexture.mipLevel; ++i) { - gl.texImage2D(WebGLRenderingContext.TEXTURE_2D, i, gpuTexture.glInternelFmt, w, h, 0, gpuTexture.glFormat, gpuTexture.glType, null); + gl.texImage2D(gl.TEXTURE_2D, i, gpuTexture.glInternelFmt, w, h, 0, gpuTexture.glFormat, gpuTexture.glType, null); w = Math.max(1, w >> 1); h = Math.max(1, h >> 1); } @@ -799,7 +801,7 @@ export function WebGLCmdFuncCreateTexture (device: WebGLGFXDevice, gpuTexture: W for (let i = 0; i < gpuTexture.mipLevel; ++i) { const imgSize = GFXFormatSize(gpuTexture.format, w, h, 1); const view: Uint8Array = new Uint8Array(imgSize); - gl.compressedTexImage2D(WebGLRenderingContext.TEXTURE_2D, i, gpuTexture.glInternelFmt, w, h, 0, view); + gl.compressedTexImage2D(gl.TEXTURE_2D, i, gpuTexture.glInternelFmt, w, h, 0, view); w = Math.max(1, w >> 1); h = Math.max(1, h >> 1); } @@ -808,24 +810,24 @@ export function WebGLCmdFuncCreateTexture (device: WebGLGFXDevice, gpuTexture: W // init 2 x 2 texture const imgSize = GFXFormatSize(gpuTexture.format, 2, 2, 1); const view: Uint8Array = new Uint8Array(imgSize); - gl.compressedTexImage2D(WebGLRenderingContext.TEXTURE_2D, 0, gpuTexture.glInternelFmt, 2, 2, 0, view); + gl.compressedTexImage2D(gl.TEXTURE_2D, 0, gpuTexture.glInternelFmt, 2, 2, 0, view); } } if (gpuTexture.isPowerOf2) { - gpuTexture.glWrapS = WebGLRenderingContext.REPEAT; - gpuTexture.glWrapT = WebGLRenderingContext.REPEAT; + gpuTexture.glWrapS = gl.REPEAT; + gpuTexture.glWrapT = gl.REPEAT; } else { - gpuTexture.glWrapS = WebGLRenderingContext.CLAMP_TO_EDGE; - gpuTexture.glWrapT = WebGLRenderingContext.CLAMP_TO_EDGE; + gpuTexture.glWrapS = gl.CLAMP_TO_EDGE; + gpuTexture.glWrapT = gl.CLAMP_TO_EDGE; } - gpuTexture.glMinFilter = WebGLRenderingContext.LINEAR; - gpuTexture.glMagFilter = WebGLRenderingContext.LINEAR; + gpuTexture.glMinFilter = gl.LINEAR; + gpuTexture.glMagFilter = gl.LINEAR; - gl.texParameteri(gpuTexture.glTarget, WebGLRenderingContext.TEXTURE_WRAP_S, gpuTexture.glWrapS); - gl.texParameteri(gpuTexture.glTarget, WebGLRenderingContext.TEXTURE_WRAP_T, gpuTexture.glWrapT); - gl.texParameteri(gpuTexture.glTarget, WebGLRenderingContext.TEXTURE_MIN_FILTER, gpuTexture.glMinFilter); - gl.texParameteri(gpuTexture.glTarget, WebGLRenderingContext.TEXTURE_MAG_FILTER, gpuTexture.glMagFilter); + gl.texParameteri(gpuTexture.glTarget, gl.TEXTURE_WRAP_S, gpuTexture.glWrapS); + gl.texParameteri(gpuTexture.glTarget, gl.TEXTURE_WRAP_T, gpuTexture.glWrapT); + gl.texParameteri(gpuTexture.glTarget, gl.TEXTURE_MIN_FILTER, gpuTexture.glMinFilter); + gl.texParameteri(gpuTexture.glTarget, gl.TEXTURE_MAG_FILTER, gpuTexture.glMagFilter); } } @@ -834,7 +836,7 @@ export function WebGLCmdFuncCreateTexture (device: WebGLGFXDevice, gpuTexture: W case GFXTextureViewType.CUBE: { gpuTexture.viewType = GFXTextureViewType.CUBE; - gpuTexture.glTarget = WebGLRenderingContext.TEXTURE_CUBE_MAP; + gpuTexture.glTarget = gl.TEXTURE_CUBE_MAP; const glTexture = gl.createTexture(); if (glTexture && gpuTexture.size > 0) { @@ -842,7 +844,7 @@ export function WebGLCmdFuncCreateTexture (device: WebGLGFXDevice, gpuTexture: W const glTexUnit = device.stateCache.glTexCubeUnits[device.stateCache.texUnit]; if (glTexUnit.glTexture !== gpuTexture.glTexture) { - gl.bindTexture(WebGLRenderingContext.TEXTURE_CUBE_MAP, gpuTexture.glTexture); + gl.bindTexture(gl.TEXTURE_CUBE_MAP, gpuTexture.glTexture); glTexUnit.glTexture = gpuTexture.glTexture; } @@ -851,7 +853,7 @@ export function WebGLCmdFuncCreateTexture (device: WebGLGFXDevice, gpuTexture: W let w = gpuTexture.width; let h = gpuTexture.height; for (let i = 0; i < gpuTexture.mipLevel; ++i) { - gl.texImage2D(WebGLRenderingContext.TEXTURE_CUBE_MAP_POSITIVE_X + f, i, gpuTexture.glInternelFmt, w, h, 0, + gl.texImage2D(gl.TEXTURE_CUBE_MAP_POSITIVE_X + f, i, gpuTexture.glInternelFmt, w, h, 0, gpuTexture.glFormat, gpuTexture.glType, null); w = Math.max(1, w >> 1); h = Math.max(1, h >> 1); @@ -865,7 +867,7 @@ export function WebGLCmdFuncCreateTexture (device: WebGLGFXDevice, gpuTexture: W for (let i = 0; i < gpuTexture.mipLevel; ++i) { const imgSize = GFXFormatSize(gpuTexture.format, w, h, 1); const view: Uint8Array = new Uint8Array(imgSize); - gl.compressedTexImage2D(WebGLRenderingContext.TEXTURE_CUBE_MAP_POSITIVE_X + f, i, gpuTexture.glInternelFmt, w, h, 0, view); + gl.compressedTexImage2D(gl.TEXTURE_CUBE_MAP_POSITIVE_X + f, i, gpuTexture.glInternelFmt, w, h, 0, view); w = Math.max(1, w >> 1); h = Math.max(1, h >> 1); } @@ -875,25 +877,25 @@ export function WebGLCmdFuncCreateTexture (device: WebGLGFXDevice, gpuTexture: W for (let f = 0; f < 6; ++f) { const imgSize = GFXFormatSize(gpuTexture.format, 2, 2, 1); const view: Uint8Array = new Uint8Array(imgSize); - gl.compressedTexImage2D(WebGLRenderingContext.TEXTURE_CUBE_MAP_POSITIVE_X + f, 0, gpuTexture.glInternelFmt, 2, 2, 0, view); + gl.compressedTexImage2D(gl.TEXTURE_CUBE_MAP_POSITIVE_X + f, 0, gpuTexture.glInternelFmt, 2, 2, 0, view); } } } if (gpuTexture.isPowerOf2) { - gpuTexture.glWrapS = WebGLRenderingContext.REPEAT; - gpuTexture.glWrapT = WebGLRenderingContext.REPEAT; + gpuTexture.glWrapS = gl.REPEAT; + gpuTexture.glWrapT = gl.REPEAT; } else { - gpuTexture.glWrapS = WebGLRenderingContext.CLAMP_TO_EDGE; - gpuTexture.glWrapT = WebGLRenderingContext.CLAMP_TO_EDGE; + gpuTexture.glWrapS = gl.CLAMP_TO_EDGE; + gpuTexture.glWrapT = gl.CLAMP_TO_EDGE; } - gpuTexture.glMinFilter = WebGLRenderingContext.LINEAR; - gpuTexture.glMagFilter = WebGLRenderingContext.LINEAR; + gpuTexture.glMinFilter = gl.LINEAR; + gpuTexture.glMagFilter = gl.LINEAR; - gl.texParameteri(gpuTexture.glTarget, WebGLRenderingContext.TEXTURE_WRAP_S, gpuTexture.glWrapS); - gl.texParameteri(gpuTexture.glTarget, WebGLRenderingContext.TEXTURE_WRAP_T, gpuTexture.glWrapT); - gl.texParameteri(gpuTexture.glTarget, WebGLRenderingContext.TEXTURE_MIN_FILTER, gpuTexture.glMinFilter); - gl.texParameteri(gpuTexture.glTarget, WebGLRenderingContext.TEXTURE_MAG_FILTER, gpuTexture.glMagFilter); + gl.texParameteri(gpuTexture.glTarget, gl.TEXTURE_WRAP_S, gpuTexture.glWrapS); + gl.texParameteri(gpuTexture.glTarget, gl.TEXTURE_WRAP_T, gpuTexture.glWrapT); + gl.texParameteri(gpuTexture.glTarget, gl.TEXTURE_MIN_FILTER, gpuTexture.glMinFilter); + gl.texParameteri(gpuTexture.glTarget, gl.TEXTURE_MAG_FILTER, gpuTexture.glMagFilter); } break; @@ -901,7 +903,7 @@ export function WebGLCmdFuncCreateTexture (device: WebGLGFXDevice, gpuTexture: W default: { console.error('Unsupported GFXTextureType, create texture failed.'); gpuTexture.viewType = GFXTextureViewType.TV2D; - gpuTexture.glTarget = WebGLRenderingContext.TEXTURE_2D; + gpuTexture.glTarget = gl.TEXTURE_2D; } } } @@ -922,9 +924,9 @@ export function WebGLCmdFuncResizeTexture (device: WebGLGFXDevice, gpuTexture: W const gl = device.gl; - gpuTexture.glInternelFmt = GFXFormatToWebGLInternalFormat(gpuTexture.format); - gpuTexture.glFormat = GFXFormatToWebGLFormat(gpuTexture.format); - gpuTexture.glType = GFXFormatToWebGLType(gpuTexture.format); + gpuTexture.glInternelFmt = GFXFormatToWebGLInternalFormat(gpuTexture.format, gl); + gpuTexture.glFormat = GFXFormatToWebGLFormat(gpuTexture.format, gl); + gpuTexture.glType = GFXFormatToWebGLType(gpuTexture.format, gl); switch (gpuTexture.viewType) { case GFXTextureViewType.TV2D: { @@ -1117,12 +1119,12 @@ export function WebGLCmdFuncCreateShader (device: WebGLGFXDevice, gpuShader: Web switch (gpuStage.type) { case GFXShaderType.VERTEX: { shaderTypeStr = 'VertexShader'; - glShaderType = WebGLRenderingContext.VERTEX_SHADER; + glShaderType = gl.VERTEX_SHADER; break; } case GFXShaderType.FRAGMENT: { shaderTypeStr = 'FragmentShader'; - glShaderType = WebGLRenderingContext.FRAGMENT_SHADER; + glShaderType = gl.FRAGMENT_SHADER; break; } default: { @@ -1191,8 +1193,8 @@ export function WebGLCmdFuncCreateShader (device: WebGLGFXDevice, gpuShader: Web } const glLoc = gl.getAttribLocation(gpuShader.glProgram, varName); - const type = WebGLTypeToGFXType(attribInfo.type); - const stride = WebGLGetTypeSize(attribInfo.type); + const type = WebGLTypeToGFXType(attribInfo.type, gl); + const stride = WebGLGetTypeSize(attribInfo.type, gl); gpuShader.glInputs[i] = { binding: glLoc, @@ -1227,8 +1229,8 @@ export function WebGLCmdFuncCreateShader (device: WebGLGFXDevice, gpuShader: Web for (let u = 0; u < block.members.length; ++u) { const uniform = block.members[u]; - const glType = GFXTypeToWebGLType(uniform.type); - const stride = WebGLGetTypeSize(glType); + const glType = GFXTypeToWebGLType(uniform.type, gl); + const stride = WebGLGetTypeSize(glType, gl); const size = stride * uniform.count; const begin = glBlock.size / 4; const count = size / 4; @@ -1292,7 +1294,7 @@ export function WebGLCmdFuncCreateShader (device: WebGLGFXDevice, gpuShader: Web name: sampler.name, type: sampler.type, units: [], - glType: GFXTypeToWebGLType(sampler.type), + glType: GFXTypeToWebGLType(sampler.type, gl), glLoc: -1, }; } @@ -1317,8 +1319,8 @@ export function WebGLCmdFuncCreateShader (device: WebGLGFXDevice, gpuShader: Web varName = uniformInfo.name; } - const isSampler = (uniformInfo.type === WebGLRenderingContext.SAMPLER_2D) || - (uniformInfo.type === WebGLRenderingContext.SAMPLER_CUBE); + const isSampler = (uniformInfo.type === gl.SAMPLER_2D) || + (uniformInfo.type === gl.SAMPLER_CUBE); if (!isSampler) { // let stride = WebGLGetTypeSize(info.type); @@ -1389,6 +1391,8 @@ export function WebGLCmdFuncDestroyShader (device: WebGLGFXDevice, gpuShader: We export function WebGLCmdFuncCreateInputAssember (device: WebGLGFXDevice, gpuInputAssembler: IWebGLGPUInputAssembler) { + const gl = device.gl; + gpuInputAssembler.glAttribs = new Array(gpuInputAssembler.attributes.length); const offsets = [0, 0, 0, 0, 0, 0, 0, 0]; @@ -1400,7 +1404,7 @@ export function WebGLCmdFuncCreateInputAssember (device: WebGLGFXDevice, gpuInpu const gpuBuffer = gpuInputAssembler.gpuVertexBuffers[stream]; - const glType = GFXFormatToWebGLType(attrib.format); + const glType = GFXFormatToWebGLType(attrib.format, gl); const size = GFXFormatInfos[attrib.format].size; gpuInputAssembler.glAttribs[i] = { @@ -1410,7 +1414,7 @@ export function WebGLCmdFuncCreateInputAssember (device: WebGLGFXDevice, gpuInpu size, count: GFXFormatInfos[attrib.format].count, stride: gpuBuffer.stride, - componentCount: WebGLGetComponentCount(glType), + componentCount: WebGLGetComponentCount(glType, gl), isNormalized: (attrib.isNormalized !== undefined ? attrib.isNormalized : false), isInstanced: (attrib.isInstanced !== undefined ? attrib.isInstanced : false), offset: offsets[stream], @@ -1437,7 +1441,7 @@ export function WebGLCmdFuncExecuteCmds (device: WebGLGFXDevice, cmdPackage: Web let gpuPipelineState: WebGLGPUPipelineState | null = null; let gpuShader: WebGLGPUShader | null = null; let gpuInputAssembler: IWebGLGPUInputAssembler | null = null; - let glPrimitive = WebGLRenderingContext.TRIANGLES; + let glPrimitive = gl.TRIANGLES; let glWrapS; let glWrapT; let glMinFilter; @@ -1454,7 +1458,7 @@ export function WebGLCmdFuncExecuteCmds (device: WebGLGFXDevice, cmdPackage: Web if (cmd0.gpuFramebuffer) { if (cache.glFramebuffer !== cmd0.gpuFramebuffer.glFramebuffer) { - gl.bindFramebuffer(WebGLRenderingContext.FRAMEBUFFER, cmd0.gpuFramebuffer.glFramebuffer); + gl.bindFramebuffer(gl.FRAMEBUFFER, cmd0.gpuFramebuffer.glFramebuffer); cache.glFramebuffer = cmd0.gpuFramebuffer.glFramebuffer; } @@ -1506,13 +1510,13 @@ export function WebGLCmdFuncExecuteCmds (device: WebGLGFXDevice, cmdPackage: Web const clearColor = cmd0.clearColors[0]; gl.clearColor(clearColor.r, clearColor.g, clearColor.b, clearColor.a); - clears |= WebGLRenderingContext.COLOR_BUFFER_BIT; + clears |= gl.COLOR_BUFFER_BIT; } break; } case GFXLoadOp.DISCARD: { // invalidate the framebuffer - // invalidateAttachments.push(WebGLRenderingContext.COLOR_ATTACHMENT0 + j); + // invalidateAttachments.push(gl.COLOR_ATTACHMENT0 + j); break; } default: @@ -1533,13 +1537,13 @@ export function WebGLCmdFuncExecuteCmds (device: WebGLGFXDevice, cmdPackage: Web gl.clearDepth(cmd0.clearDepth); - clears |= WebGLRenderingContext.DEPTH_BUFFER_BIT; + clears |= gl.DEPTH_BUFFER_BIT; } break; } case GFXLoadOp.DISCARD: { // invalidate the framebuffer - // invalidateAttachments.push(WebGLRenderingContext.DEPTH_ATTACHMENT); + // invalidateAttachments.push(gl.DEPTH_ATTACHMENT); break; } default: @@ -1551,21 +1555,21 @@ export function WebGLCmdFuncExecuteCmds (device: WebGLGFXDevice, cmdPackage: Web case GFXLoadOp.CLEAR: { if (cmd0.clearFlag & GFXClearFlag.STENCIL) { if (!cache.dss.stencilWriteMaskFront) { - gl.stencilMaskSeparate(WebGLRenderingContext.FRONT, 0xFFFFFFFF); + gl.stencilMaskSeparate(gl.FRONT, 0xFFFFFFFF); } if (!cache.dss.stencilWriteMaskBack) { - gl.stencilMaskSeparate(WebGLRenderingContext.BACK, 0xFFFFFFFF); + gl.stencilMaskSeparate(gl.BACK, 0xFFFFFFFF); } gl.clearStencil(cmd0.clearStencil); - clears |= WebGLRenderingContext.STENCIL_BUFFER_BIT; + clears |= gl.STENCIL_BUFFER_BIT; } break; } case GFXLoadOp.DISCARD: { // invalidate the framebuffer - // invalidateAttachments.push(WebGLRenderingContext.STENCIL_ATTACHMENT); + // invalidateAttachments.push(gl.STENCIL_ATTACHMENT); break; } default: @@ -1576,7 +1580,7 @@ export function WebGLCmdFuncExecuteCmds (device: WebGLGFXDevice, cmdPackage: Web /* if (numInvalidAttach) { - gl.invalidateFramebuffer(WebGLRenderingContext.FRAMEBUFFER, numInvalidAttach, invalidateAttachments); + gl.invalidateFramebuffer(gl.FRAMEBUFFER, numInvalidAttach, invalidateAttachments); } */ @@ -1585,7 +1589,7 @@ export function WebGLCmdFuncExecuteCmds (device: WebGLGFXDevice, cmdPackage: Web } // restore states - if (clears & WebGLRenderingContext.COLOR_BUFFER_BIT) { + if (clears & gl.COLOR_BUFFER_BIT) { const colorMask = cache.bs.targets[0].blendColorMask; if (colorMask !== GFXColorMask.ALL) { @@ -1597,18 +1601,18 @@ export function WebGLCmdFuncExecuteCmds (device: WebGLGFXDevice, cmdPackage: Web } } - if ((clears & WebGLRenderingContext.DEPTH_BUFFER_BIT) && + if ((clears & gl.DEPTH_BUFFER_BIT) && !cache.dss.depthWrite) { gl.depthMask(false); } - if (clears & WebGLRenderingContext.STENCIL_BUFFER_BIT) { + if (clears & gl.STENCIL_BUFFER_BIT) { if (!cache.dss.stencilWriteMaskFront) { - gl.stencilMaskSeparate(WebGLRenderingContext.FRONT, 0); + gl.stencilMaskSeparate(gl.FRONT, 0); } if (!cache.dss.stencilWriteMaskBack) { - gl.stencilMaskSeparate(WebGLRenderingContext.BACK, 0); + gl.stencilMaskSeparate(gl.BACK, 0); } } } // if (curGPURenderPass) @@ -1645,17 +1649,17 @@ export function WebGLCmdFuncExecuteCmds (device: WebGLGFXDevice, cmdPackage: Web if (cache.rs.cullMode !== rs.cullMode) { switch (rs.cullMode) { case GFXCullMode.NONE: { - gl.disable(WebGLRenderingContext.CULL_FACE); + gl.disable(gl.CULL_FACE); break; } case GFXCullMode.FRONT: { - gl.enable(WebGLRenderingContext.CULL_FACE); - gl.cullFace(WebGLRenderingContext.FRONT); + gl.enable(gl.CULL_FACE); + gl.cullFace(gl.FRONT); break; } case GFXCullMode.BACK: { - gl.enable(WebGLRenderingContext.CULL_FACE); - gl.cullFace(WebGLRenderingContext.BACK); + gl.enable(gl.CULL_FACE); + gl.cullFace(gl.BACK); break; } default: @@ -1665,7 +1669,7 @@ export function WebGLCmdFuncExecuteCmds (device: WebGLGFXDevice, cmdPackage: Web } if (cache.rs.isFrontFaceCCW !== rs.isFrontFaceCCW) { - gl.frontFace(rs.isFrontFaceCCW ? WebGLRenderingContext.CCW : WebGLRenderingContext.CW); + gl.frontFace(rs.isFrontFaceCCW ? gl.CCW : gl.CW); cache.rs.isFrontFaceCCW = rs.isFrontFaceCCW; } @@ -1689,9 +1693,9 @@ export function WebGLCmdFuncExecuteCmds (device: WebGLGFXDevice, cmdPackage: Web if (cache.dss.depthTest !== dss.depthTest) { if (dss.depthTest) { - gl.enable(WebGLRenderingContext.DEPTH_TEST); + gl.enable(gl.DEPTH_TEST); } else { - gl.disable(WebGLRenderingContext.DEPTH_TEST); + gl.disable(gl.DEPTH_TEST); } cache.dss.depthTest = dss.depthTest; } @@ -1710,9 +1714,9 @@ export function WebGLCmdFuncExecuteCmds (device: WebGLGFXDevice, cmdPackage: Web if ((cache.dss.stencilTestFront !== dss.stencilTestFront) || (cache.dss.stencilTestBack !== dss.stencilTestBack)) { if (dss.stencilTestFront || dss.stencilTestBack) { - gl.enable(WebGLRenderingContext.STENCIL_TEST); + gl.enable(gl.STENCIL_TEST); } else { - gl.disable(WebGLRenderingContext.STENCIL_TEST); + gl.disable(gl.STENCIL_TEST); } cache.dss.stencilTestFront = dss.stencilTestFront; cache.dss.stencilTestBack = dss.stencilTestBack; @@ -1723,7 +1727,7 @@ export function WebGLCmdFuncExecuteCmds (device: WebGLGFXDevice, cmdPackage: Web (cache.dss.stencilReadMaskFront !== dss.stencilReadMaskFront)) { gl.stencilFuncSeparate( - WebGLRenderingContext.FRONT, + gl.FRONT, WebGLCmpFuncs[dss.stencilFuncFront], dss.stencilRefFront, dss.stencilReadMaskFront); @@ -1738,7 +1742,7 @@ export function WebGLCmdFuncExecuteCmds (device: WebGLGFXDevice, cmdPackage: Web (cache.dss.stencilPassOpFront !== dss.stencilPassOpFront)) { gl.stencilOpSeparate( - WebGLRenderingContext.FRONT, + gl.FRONT, WebGLStencilOps[dss.stencilFailOpFront], WebGLStencilOps[dss.stencilZFailOpFront], WebGLStencilOps[dss.stencilPassOpFront]); @@ -1749,7 +1753,7 @@ export function WebGLCmdFuncExecuteCmds (device: WebGLGFXDevice, cmdPackage: Web } if (cache.dss.stencilWriteMaskFront !== dss.stencilWriteMaskFront) { - gl.stencilMaskSeparate(WebGLRenderingContext.FRONT, dss.stencilWriteMaskFront); + gl.stencilMaskSeparate(gl.FRONT, dss.stencilWriteMaskFront); cache.dss.stencilWriteMaskFront = dss.stencilWriteMaskFront; } @@ -1759,7 +1763,7 @@ export function WebGLCmdFuncExecuteCmds (device: WebGLGFXDevice, cmdPackage: Web (cache.dss.stencilReadMaskBack !== dss.stencilReadMaskBack)) { gl.stencilFuncSeparate( - WebGLRenderingContext.BACK, + gl.BACK, WebGLCmpFuncs[dss.stencilFuncBack], dss.stencilRefBack, dss.stencilReadMaskBack); @@ -1774,7 +1778,7 @@ export function WebGLCmdFuncExecuteCmds (device: WebGLGFXDevice, cmdPackage: Web (cache.dss.stencilPassOpBack !== dss.stencilPassOpBack)) { gl.stencilOpSeparate( - WebGLRenderingContext.BACK, + gl.BACK, WebGLStencilOps[dss.stencilFailOpBack], WebGLStencilOps[dss.stencilZFailOpBack], WebGLStencilOps[dss.stencilPassOpBack]); @@ -1785,7 +1789,7 @@ export function WebGLCmdFuncExecuteCmds (device: WebGLGFXDevice, cmdPackage: Web } if (cache.dss.stencilWriteMaskBack !== dss.stencilWriteMaskBack) { - gl.stencilMaskSeparate(WebGLRenderingContext.BACK, dss.stencilWriteMaskBack); + gl.stencilMaskSeparate(gl.BACK, dss.stencilWriteMaskBack); cache.dss.stencilWriteMaskBack = dss.stencilWriteMaskBack; } } // depth-stencil state @@ -1796,9 +1800,9 @@ export function WebGLCmdFuncExecuteCmds (device: WebGLGFXDevice, cmdPackage: Web if (cache.bs.isA2C !== bs.isA2C) { if (bs.isA2C) { - gl.enable(WebGLRenderingContext.SAMPLE_ALPHA_TO_COVERAGE); + gl.enable(gl.SAMPLE_ALPHA_TO_COVERAGE); } else { - gl.disable(WebGLRenderingContext.SAMPLE_ALPHA_TO_COVERAGE); + gl.disable(gl.SAMPLE_ALPHA_TO_COVERAGE); } cache.bs.isA2C = bs.isA2C; } @@ -1821,9 +1825,9 @@ export function WebGLCmdFuncExecuteCmds (device: WebGLGFXDevice, cmdPackage: Web if (target0Cache.blend !== target0.blend) { if (target0.blend) { - gl.enable(WebGLRenderingContext.BLEND); + gl.enable(gl.BLEND); } else { - gl.disable(WebGLRenderingContext.BLEND); + gl.disable(gl.BLEND); } target0Cache.blend = target0.blend; } @@ -1887,8 +1891,8 @@ export function WebGLCmdFuncExecuteCmds (device: WebGLGFXDevice, cmdPackage: Web if (glBlock && gpuBinding.gpuBuffer.vf32) { for (const glUniform of glBlock.glActiveUniforms) { switch (glUniform.glType) { - case WebGLRenderingContext.BOOL: - case WebGLRenderingContext.INT: { + case gl.BOOL: + case gl.INT: { for (let u = 0; u < glUniform.array.length; ++u) { const idx = glUniform.begin + u; if (gpuBinding.gpuBuffer.vf32[idx] !== glUniform.array[u]) { @@ -1901,8 +1905,8 @@ export function WebGLCmdFuncExecuteCmds (device: WebGLGFXDevice, cmdPackage: Web } break; } - case WebGLRenderingContext.BOOL_VEC2: - case WebGLRenderingContext.INT_VEC2: { + case gl.BOOL_VEC2: + case gl.INT_VEC2: { for (let u = 0; u < glUniform.array.length; ++u) { const idx = glUniform.begin + u; if (gpuBinding.gpuBuffer.vf32[idx] !== glUniform.array[u]) { @@ -1915,8 +1919,8 @@ export function WebGLCmdFuncExecuteCmds (device: WebGLGFXDevice, cmdPackage: Web } break; } - case WebGLRenderingContext.BOOL_VEC3: - case WebGLRenderingContext.INT_VEC3: { + case gl.BOOL_VEC3: + case gl.INT_VEC3: { for (let u = 0; u < glUniform.array.length; ++u) { const idx = glUniform.begin + u; if (gpuBinding.gpuBuffer.vf32[idx] !== glUniform.array[u]) { @@ -1929,8 +1933,8 @@ export function WebGLCmdFuncExecuteCmds (device: WebGLGFXDevice, cmdPackage: Web } break; } - case WebGLRenderingContext.BOOL_VEC4: - case WebGLRenderingContext.INT_VEC4: { + case gl.BOOL_VEC4: + case gl.INT_VEC4: { for (let u = 0; u < glUniform.array.length; ++u) { const idx = glUniform.begin + u; if (gpuBinding.gpuBuffer.vf32[idx] !== glUniform.array[u]) { @@ -1943,7 +1947,7 @@ export function WebGLCmdFuncExecuteCmds (device: WebGLGFXDevice, cmdPackage: Web } break; } - case WebGLRenderingContext.FLOAT: { + case gl.FLOAT: { for (let u = 0; u < glUniform.array.length; ++u) { const idx = glUniform.begin + u; if (CmpF32NotEuqal(gpuBinding.gpuBuffer.vf32[idx], glUniform.array[u])) { @@ -1956,7 +1960,7 @@ export function WebGLCmdFuncExecuteCmds (device: WebGLGFXDevice, cmdPackage: Web } break; } - case WebGLRenderingContext.FLOAT_VEC2: { + case gl.FLOAT_VEC2: { for (let u = 0; u < glUniform.array.length; ++u) { const idx = glUniform.begin + u; if (CmpF32NotEuqal(gpuBinding.gpuBuffer.vf32[idx], glUniform.array[u])) { @@ -1969,7 +1973,7 @@ export function WebGLCmdFuncExecuteCmds (device: WebGLGFXDevice, cmdPackage: Web } break; } - case WebGLRenderingContext.FLOAT_VEC3: { + case gl.FLOAT_VEC3: { for (let u = 0; u < glUniform.array.length; ++u) { const idx = glUniform.begin + u; if (CmpF32NotEuqal(gpuBinding.gpuBuffer.vf32[idx], glUniform.array[u])) { @@ -1982,7 +1986,7 @@ export function WebGLCmdFuncExecuteCmds (device: WebGLGFXDevice, cmdPackage: Web } break; } - case WebGLRenderingContext.FLOAT_VEC4: { + case gl.FLOAT_VEC4: { for (let u = 0; u < glUniform.array.length; ++u) { const idx = glUniform.begin + u; if (CmpF32NotEuqal(gpuBinding.gpuBuffer.vf32[idx], glUniform.array[u])) { @@ -1995,7 +1999,7 @@ export function WebGLCmdFuncExecuteCmds (device: WebGLGFXDevice, cmdPackage: Web } break; } - case WebGLRenderingContext.FLOAT_MAT2: { + case gl.FLOAT_MAT2: { for (let u = 0; u < glUniform.array.length; ++u) { const idx = glUniform.begin + u; if (CmpF32NotEuqal(gpuBinding.gpuBuffer.vf32[idx], glUniform.array[u])) { @@ -2008,7 +2012,7 @@ export function WebGLCmdFuncExecuteCmds (device: WebGLGFXDevice, cmdPackage: Web } break; } - case WebGLRenderingContext.FLOAT_MAT3: { + case gl.FLOAT_MAT3: { for (let u = 0; u < glUniform.array.length; ++u) { const idx = glUniform.begin + u; if (CmpF32NotEuqal(gpuBinding.gpuBuffer.vf32[idx], glUniform.array[u])) { @@ -2021,7 +2025,7 @@ export function WebGLCmdFuncExecuteCmds (device: WebGLGFXDevice, cmdPackage: Web } break; } - case WebGLRenderingContext.FLOAT_MAT4: { + case gl.FLOAT_MAT4: { for (let u = 0; u < glUniform.array.length; ++u) { const idx = glUniform.begin + u; if (CmpF32NotEuqal(gpuBinding.gpuBuffer.vf32[idx], glUniform.array[u])) { @@ -2064,7 +2068,7 @@ export function WebGLCmdFuncExecuteCmds (device: WebGLGFXDevice, cmdPackage: Web gpuBinding.gpuTexView.gpuTexture.size > 0) { if (cache.texUnit !== texUnit) { - gl.activeTexture(WebGLRenderingContext.TEXTURE0 + texUnit); + gl.activeTexture(gl.TEXTURE0 + texUnit); cache.texUnit = texUnit; } @@ -2124,22 +2128,22 @@ export function WebGLCmdFuncExecuteCmds (device: WebGLGFXDevice, cmdPackage: Web } if (gpuTexture.glWrapS !== glWrapS) { - gl.texParameteri(gpuTexture.glTarget, WebGLRenderingContext.TEXTURE_WRAP_S, glWrapS); + gl.texParameteri(gpuTexture.glTarget, gl.TEXTURE_WRAP_S, glWrapS); gpuTexture.glWrapS = glWrapS; } if (gpuTexture.glWrapT !== glWrapT) { - gl.texParameteri(gpuTexture.glTarget, WebGLRenderingContext.TEXTURE_WRAP_T, glWrapT); + gl.texParameteri(gpuTexture.glTarget, gl.TEXTURE_WRAP_T, glWrapT); gpuTexture.glWrapT = glWrapT; } if (gpuTexture.glMinFilter !== glMinFilter) { - gl.texParameteri(gpuTexture.glTarget, WebGLRenderingContext.TEXTURE_MIN_FILTER, glMinFilter); + gl.texParameteri(gpuTexture.glTarget, gl.TEXTURE_MIN_FILTER, glMinFilter); gpuTexture.glMinFilter = glMinFilter; } if (gpuTexture.glMagFilter !== gpuSampler.glMagFilter) { - gl.texParameteri(gpuTexture.glTarget, WebGLRenderingContext.TEXTURE_MAG_FILTER, gpuSampler.glMagFilter); + gl.texParameteri(gpuTexture.glTarget, gl.TEXTURE_MAG_FILTER, gpuSampler.glMagFilter); gpuTexture.glMagFilter = gpuSampler.glMagFilter; } } @@ -2176,8 +2180,8 @@ export function WebGLCmdFuncExecuteCmds (device: WebGLGFXDevice, cmdPackage: Web vao.bindVertexArrayOES(_glVAO); cache.glVAO = _glVAO; - gl.bindBuffer(WebGLRenderingContext.ARRAY_BUFFER, null); - gl.bindBuffer(WebGLRenderingContext.ELEMENT_ARRAY_BUFFER, null); + gl.bindBuffer(gl.ARRAY_BUFFER, null); + gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, null); cache.glArrayBuffer = 0; cache.glElementArrayBuffer = 0; @@ -2194,7 +2198,7 @@ export function WebGLCmdFuncExecuteCmds (device: WebGLGFXDevice, cmdPackage: Web if (glAttrib) { if (cache.glArrayBuffer !== glAttrib.glBuffer) { - gl.bindBuffer(WebGLRenderingContext.ARRAY_BUFFER, glAttrib.glBuffer); + gl.bindBuffer(gl.ARRAY_BUFFER, glAttrib.glBuffer); cache.glArrayBuffer = glAttrib.glBuffer; } @@ -2214,7 +2218,7 @@ export function WebGLCmdFuncExecuteCmds (device: WebGLGFXDevice, cmdPackage: Web const gpuBuffer = gpuInputAssembler.gpuIndexBuffer; if (gpuBuffer) { if (cache.glElementArrayBuffer !== gpuBuffer.glBuffer) { - gl.bindBuffer(WebGLRenderingContext.ELEMENT_ARRAY_BUFFER, gpuBuffer.glBuffer); + gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, gpuBuffer.glBuffer); cache.glElementArrayBuffer = gpuBuffer.glBuffer; } } @@ -2236,7 +2240,7 @@ export function WebGLCmdFuncExecuteCmds (device: WebGLGFXDevice, cmdPackage: Web if (glAttrib) { if (cache.glArrayBuffer !== glAttrib.glBuffer) { - gl.bindBuffer(WebGLRenderingContext.ARRAY_BUFFER, glAttrib.glBuffer); + gl.bindBuffer(gl.ARRAY_BUFFER, glAttrib.glBuffer); cache.glArrayBuffer = glAttrib.glBuffer; } @@ -2258,7 +2262,7 @@ export function WebGLCmdFuncExecuteCmds (device: WebGLGFXDevice, cmdPackage: Web const gpuBuffer = gpuInputAssembler.gpuIndexBuffer; if (gpuBuffer) { if (cache.glElementArrayBuffer !== gpuBuffer.glBuffer) { - gl.bindBuffer(WebGLRenderingContext.ELEMENT_ARRAY_BUFFER, gpuBuffer.glBuffer); + gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, gpuBuffer.glBuffer); cache.glElementArrayBuffer = gpuBuffer.glBuffer; } } @@ -2352,14 +2356,14 @@ export function WebGLCmdFuncExecuteCmds (device: WebGLGFXDevice, cmdPackage: Web switch (cmd2.stencilWriteMask.face) { case GFXStencilFace.FRONT: { if (cache.dss.stencilWriteMaskFront !== cmd2.stencilWriteMask.writeMask) { - gl.stencilMaskSeparate(WebGLRenderingContext.FRONT, cmd2.stencilWriteMask.writeMask); + gl.stencilMaskSeparate(gl.FRONT, cmd2.stencilWriteMask.writeMask); cache.dss.stencilWriteMaskFront = cmd2.stencilWriteMask.writeMask; } break; } case GFXStencilFace.BACK: { if (cache.dss.stencilWriteMaskBack !== cmd2.stencilWriteMask.writeMask) { - gl.stencilMaskSeparate(WebGLRenderingContext.BACK, cmd2.stencilWriteMask.writeMask); + gl.stencilMaskSeparate(gl.BACK, cmd2.stencilWriteMask.writeMask); cache.dss.stencilWriteMaskBack = cmd2.stencilWriteMask.writeMask; } break; @@ -2384,7 +2388,7 @@ export function WebGLCmdFuncExecuteCmds (device: WebGLGFXDevice, cmdPackage: Web if (cache.dss.stencilRefFront !== cmd2.stencilCompareMask.reference || cache.dss.stencilReadMaskFront !== cmd2.stencilCompareMask.compareMask) { gl.stencilFuncSeparate( - WebGLRenderingContext.FRONT, + gl.FRONT, WebGLCmpFuncs[cache.dss.stencilFuncFront], cmd2.stencilCompareMask.reference, cmd2.stencilCompareMask.compareMask); @@ -2397,7 +2401,7 @@ export function WebGLCmdFuncExecuteCmds (device: WebGLGFXDevice, cmdPackage: Web if (cache.dss.stencilRefBack !== cmd2.stencilCompareMask.reference || cache.dss.stencilReadMaskBack !== cmd2.stencilCompareMask.compareMask) { gl.stencilFuncSeparate( - WebGLRenderingContext.BACK, + gl.BACK, WebGLCmpFuncs[cache.dss.stencilFuncBack], cmd2.stencilCompareMask.reference, cmd2.stencilCompareMask.compareMask); @@ -2496,27 +2500,27 @@ export function WebGLCmdFuncCopyTexImagesToTexture ( let f = 0; switch (gpuTexture.glTarget) { - case WebGLRenderingContext.TEXTURE_2D: { + case gl.TEXTURE_2D: { const glTexUnit = device.stateCache.glTex2DUnits[device.stateCache.texUnit]; if (glTexUnit.glTexture !== gpuTexture.glTexture) { - gl.bindTexture(WebGLRenderingContext.TEXTURE_2D, gpuTexture.glTexture); + gl.bindTexture(gl.TEXTURE_2D, gpuTexture.glTexture); glTexUnit.glTexture = gpuTexture.glTexture; } for (const region of regions) { // console.debug('Copying image to texture 2D: ' + region.texExtent.width + ' x ' + region.texExtent.height); for (m = region.texSubres.baseMipLevel; m < region.texSubres.levelCount; ++m) { - gl.texSubImage2D(WebGLRenderingContext.TEXTURE_2D, m, + gl.texSubImage2D(gl.TEXTURE_2D, m, region.texOffset.x, region.texOffset.y, gpuTexture.glFormat, gpuTexture.glType, texImages[n++]); } } break; } - case WebGLRenderingContext.TEXTURE_CUBE_MAP: { + case gl.TEXTURE_CUBE_MAP: { const glTexUnit = device.stateCache.glTexCubeUnits[device.stateCache.texUnit]; if (glTexUnit.glTexture !== gpuTexture.glTexture) { - gl.bindTexture(WebGLRenderingContext.TEXTURE_CUBE_MAP, gpuTexture.glTexture); + gl.bindTexture(gl.TEXTURE_CUBE_MAP, gpuTexture.glTexture); glTexUnit.glTexture = gpuTexture.glTexture; } @@ -2526,7 +2530,7 @@ export function WebGLCmdFuncCopyTexImagesToTexture ( for (f = region.texSubres.baseArrayLayer; f < fcount; ++f) { const mcount = region.texSubres.baseMipLevel + region.texSubres.levelCount; for (m = region.texSubres.baseMipLevel; m < mcount; ++m) { - gl.texSubImage2D(WebGLRenderingContext.TEXTURE_CUBE_MAP_POSITIVE_X + f, m, + gl.texSubImage2D(gl.TEXTURE_CUBE_MAP_POSITIVE_X + f, m, region.texOffset.x, region.texOffset.y, gpuTexture.glFormat, gpuTexture.glType, texImages[n++]); } diff --git a/cocos/gfx/webgl/webgl-device.ts b/cocos/gfx/webgl/webgl-device.ts index 1b51a64dc4..f9e932390c 100644 --- a/cocos/gfx/webgl/webgl-device.ts +++ b/cocos/gfx/webgl/webgl-device.ts @@ -223,8 +223,6 @@ export class WebGLGFXDevice extends GFXDevice { return false; } - // No errors are thrown using try catch - // Tested through ios baidu browser 4.14.1 if (!this._webGLRC) { console.error('This device does not support WebGL.'); return false; @@ -242,18 +240,18 @@ export class WebGLGFXDevice extends GFXDevice { this._renderer = gl.getParameter(this._WEBGL_debug_renderer_info.UNMASKED_RENDERER_WEBGL); this._vendor = gl.getParameter(this._WEBGL_debug_renderer_info.UNMASKED_VENDOR_WEBGL); } else { - this._renderer = gl.getParameter(WebGLRenderingContext.RENDERER); - this._vendor = gl.getParameter(WebGLRenderingContext.VENDOR); + this._renderer = gl.getParameter(gl.RENDERER); + this._vendor = gl.getParameter(gl.VENDOR); } - this._version = gl.getParameter(WebGLRenderingContext.VERSION); - this._maxVertexAttributes = gl.getParameter(WebGLRenderingContext.MAX_VERTEX_ATTRIBS); - this._maxVertexUniformVectors = gl.getParameter(WebGLRenderingContext.MAX_VERTEX_UNIFORM_VECTORS); - this._maxFragmentUniformVectors = gl.getParameter(WebGLRenderingContext.MAX_FRAGMENT_UNIFORM_VECTORS); - this._maxTextureUnits = gl.getParameter(WebGLRenderingContext.MAX_TEXTURE_IMAGE_UNITS); - this._maxVertexTextureUnits = gl.getParameter(WebGLRenderingContext.MAX_VERTEX_TEXTURE_IMAGE_UNITS); - this._depthBits = gl.getParameter(WebGLRenderingContext.DEPTH_BITS); - this._stencilBits = gl.getParameter(WebGLRenderingContext.STENCIL_BITS); + this._version = gl.getParameter(gl.VERSION); + this._maxVertexAttributes = gl.getParameter(gl.MAX_VERTEX_ATTRIBS); + this._maxVertexUniformVectors = gl.getParameter(gl.MAX_VERTEX_UNIFORM_VECTORS); + this._maxFragmentUniformVectors = gl.getParameter(gl.MAX_FRAGMENT_UNIFORM_VECTORS); + this._maxTextureUnits = gl.getParameter(gl.MAX_TEXTURE_IMAGE_UNITS); + this._maxVertexTextureUnits = gl.getParameter(gl.MAX_VERTEX_TEXTURE_IMAGE_UNITS); + this._depthBits = gl.getParameter(gl.DEPTH_BITS); + this._stencilBits = gl.getParameter(gl.STENCIL_BITS); this._devicePixelRatio = info.devicePixelRatio || 1.0; this._width = this._canvas.width; @@ -636,7 +634,7 @@ export class WebGLGFXDevice extends GFXDevice { const curFBO = this.stateCache.glFramebuffer; if (this.stateCache.glFramebuffer !== gpuFramebuffer.glFramebuffer) { - gl.bindFramebuffer(WebGLRenderingContext.FRAMEBUFFER, gpuFramebuffer.glFramebuffer); + gl.bindFramebuffer(gl.FRAMEBUFFER, gpuFramebuffer.glFramebuffer); this.stateCache.glFramebuffer = gpuFramebuffer.glFramebuffer; } @@ -652,11 +650,11 @@ export class WebGLGFXDevice extends GFXDevice { const data = view.subarray(buffOffset, buffOffset + memSize); gl.readPixels(region.texOffset.x, region.texOffset.y, w, h, - WebGLRenderingContext.RGBA, WebGLRenderingContext.UNSIGNED_BYTE, data); + gl.RGBA, gl.UNSIGNED_BYTE, data); } if (this.stateCache.glFramebuffer !== curFBO) { - gl.bindFramebuffer(WebGLRenderingContext.FRAMEBUFFER, curFBO); + gl.bindFramebuffer(gl.FRAMEBUFFER, curFBO); this.stateCache.glFramebuffer = curFBO; } } @@ -664,7 +662,7 @@ export class WebGLGFXDevice extends GFXDevice { public blitFramebuffer (src: GFXFramebuffer, dst: GFXFramebuffer, srcRect: IGFXRect, dstRect: IGFXRect, filter: GFXFilter) { } - private initStates (gl: WebGLRenderingContext) { + private initStates (gl: gl) { gl.activeTexture(gl.TEXTURE0); gl.pixelStorei(gl.PACK_ALIGNMENT, 1); diff --git a/cocos/gfx/webgl/webgl-gpu-objects.ts b/cocos/gfx/webgl/webgl-gpu-objects.ts index 9557422bb7..8fa852a96e 100644 --- a/cocos/gfx/webgl/webgl-gpu-objects.ts +++ b/cocos/gfx/webgl/webgl-gpu-objects.ts @@ -106,11 +106,11 @@ export class WebGLGPUFramebuffer { } export class WebGLGPUSampler { - public glMinFilter: GLenum = WebGLRenderingContext.NONE; - public glMagFilter: GLenum = WebGLRenderingContext.NONE; - public glWrapS: GLenum = WebGLRenderingContext.NONE; - public glWrapT: GLenum = WebGLRenderingContext.NONE; - public glWrapR: GLenum = WebGLRenderingContext.NONE; + public glMinFilter: GLenum = 0; + public glMagFilter: GLenum = 0; + public glWrapS: GLenum = 0; + public glWrapT: GLenum = 0; + public glWrapR: GLenum = 0; } export class WebGLGPUInput { @@ -187,7 +187,7 @@ export class WebGLGPUPipelineLayout { export class WebGLGPUPipelineState { - public glPrimitive: GLenum = WebGLRenderingContext.TRIANGLES; + public glPrimitive: GLenum = 0x0004; // WebGLRenderingContext.TRIANGLES; public gpuShader: WebGLGPUShader | null = null; public rs: GFXRasterizerState = new GFXRasterizerState(); public dss: GFXDepthStencilState = new GFXDepthStencilState(); diff --git a/cocos/gfx/webgl/webgl-input-assembler.ts b/cocos/gfx/webgl/webgl-input-assembler.ts index 02773bfca4..c0e88d955d 100644 --- a/cocos/gfx/webgl/webgl-input-assembler.ts +++ b/cocos/gfx/webgl/webgl-input-assembler.ts @@ -52,9 +52,9 @@ export class WebGLGFXInputAssembler extends GFXInputAssembler { gpuIndexBuffer = (info.indexBuffer as WebGLGFXBuffer).gpuBuffer; if (gpuIndexBuffer) { switch (gpuIndexBuffer.stride) { - case 1: glIndexType = WebGLRenderingContext.UNSIGNED_BYTE; break; - case 2: glIndexType = WebGLRenderingContext.UNSIGNED_SHORT; break; - case 4: glIndexType = WebGLRenderingContext.UNSIGNED_INT; break; + case 1: glIndexType = 0x1401; break; // WebGLRenderingContext.UNSIGNED_BYTE + case 2: glIndexType = 0x1403; break; // WebGLRenderingContext.UNSIGNED_SHORT + case 4: glIndexType = 0x1405; break; // WebGLRenderingContext.UNSIGNED_INT default: { console.error('Error index buffer stride.'); } diff --git a/cocos/gfx/webgl/webgl-pipeline-state.ts b/cocos/gfx/webgl/webgl-pipeline-state.ts index b1431a16cb..72fb9e7865 100644 --- a/cocos/gfx/webgl/webgl-pipeline-state.ts +++ b/cocos/gfx/webgl/webgl-pipeline-state.ts @@ -7,20 +7,20 @@ import { WebGLGFXRenderPass } from './webgl-render-pass'; import { WebGLGFXShader } from './webgl-shader'; const WebGLPrimitives: GLenum[] = [ - WebGLRenderingContext.POINTS, - WebGLRenderingContext.LINES, - WebGLRenderingContext.LINE_STRIP, - WebGLRenderingContext.LINE_LOOP, - WebGLRenderingContext.NONE, - WebGLRenderingContext.NONE, - WebGLRenderingContext.NONE, - WebGLRenderingContext.TRIANGLES, - WebGLRenderingContext.TRIANGLE_STRIP, - WebGLRenderingContext.TRIANGLE_FAN, - WebGLRenderingContext.NONE, - WebGLRenderingContext.NONE, - WebGLRenderingContext.NONE, - WebGLRenderingContext.NONE, + 0x0000, // WebGLRenderingContext.POINTS, + 0x0001, // WebGLRenderingContext.LINES, + 0x0003, // WebGLRenderingContext.LINE_STRIP, + 0x0002, // WebGLRenderingContext.LINE_LOOP, + 0x0000, // WebGLRenderingContext.NONE, + 0x0000, // WebGLRenderingContext.NONE, + 0x0000, // WebGLRenderingContext.NONE, + 0x0004, // WebGLRenderingContext.TRIANGLES, + 0x0005, // WebGLRenderingContext.TRIANGLE_STRIP, + 0x0006, // WebGLRenderingContext.TRIANGLE_FAN, + 0x0000, // WebGLRenderingContext.NONE, + 0x0000, // WebGLRenderingContext.NONE, + 0x0000, // WebGLRenderingContext.NONE, + 0x0000, // WebGLRenderingContext.NONE, ]; export class WebGLGFXPipelineState extends GFXPipelineState { diff --git a/cocos/gfx/webgl/webgl-sampler.ts b/cocos/gfx/webgl/webgl-sampler.ts index 0b3c74c3d7..c73b94777d 100644 --- a/cocos/gfx/webgl/webgl-sampler.ts +++ b/cocos/gfx/webgl/webgl-sampler.ts @@ -4,10 +4,10 @@ import { GFXSampler, GFXSamplerState, IGFXSamplerInfo } from '../sampler'; import { WebGLGPUSampler } from './webgl-gpu-objects'; const WebGLWraps: GLenum[] = [ - WebGLRenderingContext.REPEAT, - WebGLRenderingContext.MIRRORED_REPEAT, - WebGLRenderingContext.CLAMP_TO_EDGE, - WebGLRenderingContext.CLAMP_TO_EDGE, + 0x2901, // WebGLRenderingContext.REPEAT, + 0x8370, // WebGLRenderingContext.MIRRORED_REPEAT, + 0x812F, // WebGLRenderingContext.CLAMP_TO_EDGE, + 0x812F, // WebGLRenderingContext.CLAMP_TO_EDGE, ]; export class WebGLGFXSampler extends GFXSampler { @@ -78,8 +78,8 @@ export class WebGLGFXSampler extends GFXSampler { this._state.mipLODBias = info.mipLODBias; } - let glMinFilter = WebGLRenderingContext.NONE; - let glMagFilter = WebGLRenderingContext.NONE; + let glMinFilter = 0; + let glMagFilter = 0; const minFilter = this._state.minFilter; const magFilter = this._state.magFilter; @@ -87,26 +87,26 @@ export class WebGLGFXSampler extends GFXSampler { if (minFilter === GFXFilter.LINEAR || minFilter === GFXFilter.ANISOTROPIC) { if (mipFilter === GFXFilter.LINEAR || mipFilter === GFXFilter.ANISOTROPIC) { - glMinFilter = WebGLRenderingContext.LINEAR_MIPMAP_LINEAR; + glMinFilter = 0x2703; // WebGLRenderingContext.LINEAR_MIPMAP_LINEAR; } else if (mipFilter === GFXFilter.POINT) { - glMinFilter = WebGLRenderingContext.LINEAR_MIPMAP_NEAREST; + glMinFilter = 0x2701; // WebGLRenderingContext.LINEAR_MIPMAP_NEAREST; } else { - glMinFilter = WebGLRenderingContext.LINEAR; + glMinFilter = 0x2601; // WebGLRenderingContext.LINEAR; } } else { if (mipFilter === GFXFilter.LINEAR || mipFilter === GFXFilter.ANISOTROPIC) { - glMinFilter = WebGLRenderingContext.NEAREST_MIPMAP_LINEAR; + glMinFilter = 0x2702; // WebGLRenderingContext.NEAREST_MIPMAP_LINEAR; } else if (mipFilter === GFXFilter.POINT) { - glMinFilter = WebGLRenderingContext.NEAREST_MIPMAP_NEAREST; + glMinFilter = 0x2700; // WebGLRenderingContext.NEAREST_MIPMAP_NEAREST; } else { - glMinFilter = WebGLRenderingContext.NEAREST; + glMinFilter = 0x2600; // WebGLRenderingContext.NEAREST; } } if (magFilter === GFXFilter.LINEAR || magFilter === GFXFilter.ANISOTROPIC) { - glMagFilter = WebGLRenderingContext.LINEAR; + glMagFilter = 0x2601; // WebGLRenderingContext.LINEAR; } else { - glMagFilter = WebGLRenderingContext.NEAREST; + glMagFilter = 0x2600; // WebGLRenderingContext.NEAREST; } const glWrapS = WebGLWraps[this._state.addressU]; diff --git a/cocos/gfx/webgl2/webgl2-commands.ts b/cocos/gfx/webgl2/webgl2-commands.ts index 5cded506fc..a6c7348357 100644 --- a/cocos/gfx/webgl2/webgl2-commands.ts +++ b/cocos/gfx/webgl2/webgl2-commands.ts @@ -11,6 +11,8 @@ import { GFXFilter, GFXFormat, GFXFormatInfos, + GFXFormatSize, + GFXFormatType, GFXLoadOp, GFXMemoryUsageBit, GFXSampleCount, @@ -24,9 +26,8 @@ import { IGFXFormatInfo, IGFXRect, IGFXViewport, - GFXFormatType, - GFXFormatSize, } from '../define'; +import { WebGLEXT } from '../webgl/webgl-define'; import { WebGL2GFXCommandAllocator } from './webgl2-command-allocator'; import { IWebGL2DepthBias, @@ -51,7 +52,6 @@ import { WebGL2GPUUniformSampler, } from './webgl2-gpu-objects'; import { IWebGL2TexUnit } from './webgl2-state-cache'; -import { WebGLEXT } from '../webgl/webgl-define'; const WebGLWraps: GLenum[] = [ WebGLRenderingContext.REPEAT, @@ -79,166 +79,166 @@ function CmpF32NotEuqal (a: number, b: number): boolean { return (c > 0.000001 || c < -0.000001); } -function GFXFormatToWebGLType (format: GFXFormat, device: WebGL2GFXDevice): GLenum { +function GFXFormatToWebGLType (format: GFXFormat, gl: WebGL2RenderingContext): GLenum { switch (format) { - case GFXFormat.R8: return WebGL2RenderingContext.UNSIGNED_BYTE; - case GFXFormat.R8SN: return WebGL2RenderingContext.BYTE; - case GFXFormat.R8UI: return WebGL2RenderingContext.UNSIGNED_BYTE; - case GFXFormat.R8I: return WebGL2RenderingContext.BYTE; - case GFXFormat.R16F: return WebGL2RenderingContext.HALF_FLOAT; - case GFXFormat.R16UI: return WebGL2RenderingContext.UNSIGNED_SHORT; - case GFXFormat.R16I: return WebGL2RenderingContext.SHORT; - case GFXFormat.R32F: return WebGL2RenderingContext.FLOAT; - case GFXFormat.R32UI: return WebGL2RenderingContext.UNSIGNED_INT; - case GFXFormat.R32I: return WebGL2RenderingContext.INT; + case GFXFormat.R8: return gl.UNSIGNED_BYTE; + case GFXFormat.R8SN: return gl.BYTE; + case GFXFormat.R8UI: return gl.UNSIGNED_BYTE; + case GFXFormat.R8I: return gl.BYTE; + case GFXFormat.R16F: return gl.HALF_FLOAT; + case GFXFormat.R16UI: return gl.UNSIGNED_SHORT; + case GFXFormat.R16I: return gl.SHORT; + case GFXFormat.R32F: return gl.FLOAT; + case GFXFormat.R32UI: return gl.UNSIGNED_INT; + case GFXFormat.R32I: return gl.INT; - case GFXFormat.RG8: return WebGL2RenderingContext.UNSIGNED_BYTE; - case GFXFormat.RG8SN: return WebGL2RenderingContext.BYTE; - case GFXFormat.RG8UI: return WebGL2RenderingContext.UNSIGNED_BYTE; - case GFXFormat.RG8I: return WebGL2RenderingContext.BYTE; - case GFXFormat.RG16F: return WebGL2RenderingContext.HALF_FLOAT; - case GFXFormat.RG16UI: return WebGL2RenderingContext.UNSIGNED_SHORT; - case GFXFormat.RG16I: return WebGL2RenderingContext.SHORT; - case GFXFormat.RG32F: return WebGL2RenderingContext.FLOAT; - case GFXFormat.RG32UI: return WebGL2RenderingContext.UNSIGNED_INT; - case GFXFormat.RG32I: return WebGL2RenderingContext.INT; + case GFXFormat.RG8: return gl.UNSIGNED_BYTE; + case GFXFormat.RG8SN: return gl.BYTE; + case GFXFormat.RG8UI: return gl.UNSIGNED_BYTE; + case GFXFormat.RG8I: return gl.BYTE; + case GFXFormat.RG16F: return gl.HALF_FLOAT; + case GFXFormat.RG16UI: return gl.UNSIGNED_SHORT; + case GFXFormat.RG16I: return gl.SHORT; + case GFXFormat.RG32F: return gl.FLOAT; + case GFXFormat.RG32UI: return gl.UNSIGNED_INT; + case GFXFormat.RG32I: return gl.INT; - case GFXFormat.RGB8: return WebGL2RenderingContext.UNSIGNED_BYTE; - case GFXFormat.SRGB8: return WebGL2RenderingContext.UNSIGNED_BYTE; - case GFXFormat.RGB8SN: return WebGL2RenderingContext.BYTE; - case GFXFormat.RGB8UI: return WebGL2RenderingContext.UNSIGNED_BYTE; - case GFXFormat.RGB8I: return WebGL2RenderingContext.BYTE; - case GFXFormat.RGB16F: return WebGL2RenderingContext.HALF_FLOAT; - case GFXFormat.RGB16UI: return WebGL2RenderingContext.UNSIGNED_SHORT; - case GFXFormat.RGB16I: return WebGL2RenderingContext.SHORT; - case GFXFormat.RGB32F: return WebGL2RenderingContext.FLOAT; - case GFXFormat.RGB32UI: return WebGL2RenderingContext.UNSIGNED_INT; - case GFXFormat.RGB32I: return WebGL2RenderingContext.INT; + case GFXFormat.RGB8: return gl.UNSIGNED_BYTE; + case GFXFormat.SRGB8: return gl.UNSIGNED_BYTE; + case GFXFormat.RGB8SN: return gl.BYTE; + case GFXFormat.RGB8UI: return gl.UNSIGNED_BYTE; + case GFXFormat.RGB8I: return gl.BYTE; + case GFXFormat.RGB16F: return gl.HALF_FLOAT; + case GFXFormat.RGB16UI: return gl.UNSIGNED_SHORT; + case GFXFormat.RGB16I: return gl.SHORT; + case GFXFormat.RGB32F: return gl.FLOAT; + case GFXFormat.RGB32UI: return gl.UNSIGNED_INT; + case GFXFormat.RGB32I: return gl.INT; - case GFXFormat.RGBA8: return WebGL2RenderingContext.UNSIGNED_BYTE; - case GFXFormat.SRGB8_A8: return WebGL2RenderingContext.UNSIGNED_BYTE; - case GFXFormat.RGBA8SN: return WebGL2RenderingContext.BYTE; - case GFXFormat.RGBA8UI: return WebGL2RenderingContext.UNSIGNED_BYTE; - case GFXFormat.RGBA8I: return WebGL2RenderingContext.BYTE; - case GFXFormat.RGBA16F: return WebGL2RenderingContext.HALF_FLOAT; - case GFXFormat.RGBA16UI: return WebGL2RenderingContext.UNSIGNED_SHORT; - case GFXFormat.RGBA16I: return WebGL2RenderingContext.SHORT; - case GFXFormat.RGBA32F: return WebGL2RenderingContext.FLOAT; - case GFXFormat.RGBA32UI: return WebGL2RenderingContext.UNSIGNED_INT; - case GFXFormat.RGBA32I: return WebGL2RenderingContext.INT; + case GFXFormat.RGBA8: return gl.UNSIGNED_BYTE; + case GFXFormat.SRGB8_A8: return gl.UNSIGNED_BYTE; + case GFXFormat.RGBA8SN: return gl.BYTE; + case GFXFormat.RGBA8UI: return gl.UNSIGNED_BYTE; + case GFXFormat.RGBA8I: return gl.BYTE; + case GFXFormat.RGBA16F: return gl.HALF_FLOAT; + case GFXFormat.RGBA16UI: return gl.UNSIGNED_SHORT; + case GFXFormat.RGBA16I: return gl.SHORT; + case GFXFormat.RGBA32F: return gl.FLOAT; + case GFXFormat.RGBA32UI: return gl.UNSIGNED_INT; + case GFXFormat.RGBA32I: return gl.INT; - case GFXFormat.R5G6B5: return WebGL2RenderingContext.UNSIGNED_SHORT_5_6_5; - case GFXFormat.R11G11B10F: return WebGL2RenderingContext.UNSIGNED_INT_10F_11F_11F_REV; - case GFXFormat.RGB5A1: return WebGL2RenderingContext.UNSIGNED_SHORT_5_5_5_1; - case GFXFormat.RGBA4: return WebGL2RenderingContext.UNSIGNED_SHORT_4_4_4_4; - case GFXFormat.RGB10A2: return WebGL2RenderingContext.UNSIGNED_INT_2_10_10_10_REV; - case GFXFormat.RGB10A2UI: return WebGL2RenderingContext.UNSIGNED_INT_2_10_10_10_REV; - case GFXFormat.RGB9E5: return WebGL2RenderingContext.FLOAT; + case GFXFormat.R5G6B5: return gl.UNSIGNED_SHORT_5_6_5; + case GFXFormat.R11G11B10F: return gl.UNSIGNED_INT_10F_11F_11F_REV; + case GFXFormat.RGB5A1: return gl.UNSIGNED_SHORT_5_5_5_1; + case GFXFormat.RGBA4: return gl.UNSIGNED_SHORT_4_4_4_4; + case GFXFormat.RGB10A2: return gl.UNSIGNED_INT_2_10_10_10_REV; + case GFXFormat.RGB10A2UI: return gl.UNSIGNED_INT_2_10_10_10_REV; + case GFXFormat.RGB9E5: return gl.FLOAT; - case GFXFormat.D16: return WebGL2RenderingContext.UNSIGNED_SHORT; - case GFXFormat.D16S8: return WebGL2RenderingContext.UNSIGNED_SHORT; - case GFXFormat.D24: return WebGL2RenderingContext.UNSIGNED_INT; - case GFXFormat.D24S8: return WebGL2RenderingContext.UNSIGNED_INT_24_8; - case GFXFormat.D32F: return WebGL2RenderingContext.FLOAT; - case GFXFormat.D32F_S8: return WebGL2RenderingContext.FLOAT_32_UNSIGNED_INT_24_8_REV; + case GFXFormat.D16: return gl.UNSIGNED_SHORT; + case GFXFormat.D16S8: return gl.UNSIGNED_SHORT; + case GFXFormat.D24: return gl.UNSIGNED_INT; + case GFXFormat.D24S8: return gl.UNSIGNED_INT_24_8; + case GFXFormat.D32F: return gl.FLOAT; + case GFXFormat.D32F_S8: return gl.FLOAT_32_UNSIGNED_INT_24_8_REV; - case GFXFormat.BC1: return WebGL2RenderingContext.UNSIGNED_BYTE; - case GFXFormat.BC1_SRGB: return WebGL2RenderingContext.UNSIGNED_BYTE; - case GFXFormat.BC2: return WebGL2RenderingContext.UNSIGNED_BYTE; - case GFXFormat.BC2_SRGB: return WebGL2RenderingContext.UNSIGNED_BYTE; - case GFXFormat.BC3: return WebGL2RenderingContext.UNSIGNED_BYTE; - case GFXFormat.BC3_SRGB: return WebGL2RenderingContext.UNSIGNED_BYTE; - case GFXFormat.BC4: return WebGL2RenderingContext.UNSIGNED_BYTE; - case GFXFormat.BC4_SNORM: return WebGL2RenderingContext.BYTE; - case GFXFormat.BC5: return WebGL2RenderingContext.UNSIGNED_BYTE; - case GFXFormat.BC5_SNORM: return WebGL2RenderingContext.BYTE; - case GFXFormat.BC6H_SF16: return WebGL2RenderingContext.FLOAT; - case GFXFormat.BC6H_UF16: return WebGL2RenderingContext.FLOAT; - case GFXFormat.BC7: return WebGL2RenderingContext.UNSIGNED_BYTE; - case GFXFormat.BC7_SRGB: return WebGL2RenderingContext.UNSIGNED_BYTE; + case GFXFormat.BC1: return gl.UNSIGNED_BYTE; + case GFXFormat.BC1_SRGB: return gl.UNSIGNED_BYTE; + case GFXFormat.BC2: return gl.UNSIGNED_BYTE; + case GFXFormat.BC2_SRGB: return gl.UNSIGNED_BYTE; + case GFXFormat.BC3: return gl.UNSIGNED_BYTE; + case GFXFormat.BC3_SRGB: return gl.UNSIGNED_BYTE; + case GFXFormat.BC4: return gl.UNSIGNED_BYTE; + case GFXFormat.BC4_SNORM: return gl.BYTE; + case GFXFormat.BC5: return gl.UNSIGNED_BYTE; + case GFXFormat.BC5_SNORM: return gl.BYTE; + case GFXFormat.BC6H_SF16: return gl.FLOAT; + case GFXFormat.BC6H_UF16: return gl.FLOAT; + case GFXFormat.BC7: return gl.UNSIGNED_BYTE; + case GFXFormat.BC7_SRGB: return gl.UNSIGNED_BYTE; - case GFXFormat.ETC_RGB8: return WebGL2RenderingContext.UNSIGNED_BYTE; - case GFXFormat.ETC2_RGB8: return WebGL2RenderingContext.UNSIGNED_BYTE; - case GFXFormat.ETC2_SRGB8: return WebGL2RenderingContext.UNSIGNED_BYTE; - case GFXFormat.ETC2_RGB8_A1: return WebGL2RenderingContext.UNSIGNED_BYTE; - case GFXFormat.ETC2_SRGB8_A1: return WebGL2RenderingContext.UNSIGNED_BYTE; - case GFXFormat.ETC2_RGB8: return WebGL2RenderingContext.UNSIGNED_BYTE; - case GFXFormat.ETC2_SRGB8: return WebGL2RenderingContext.UNSIGNED_BYTE; - case GFXFormat.EAC_R11: return WebGL2RenderingContext.UNSIGNED_BYTE; - case GFXFormat.EAC_R11SN: return WebGL2RenderingContext.BYTE; - case GFXFormat.EAC_RG11: return WebGL2RenderingContext.UNSIGNED_BYTE; - case GFXFormat.EAC_RG11SN: return WebGL2RenderingContext.BYTE; + case GFXFormat.ETC_RGB8: return gl.UNSIGNED_BYTE; + case GFXFormat.ETC2_RGB8: return gl.UNSIGNED_BYTE; + case GFXFormat.ETC2_SRGB8: return gl.UNSIGNED_BYTE; + case GFXFormat.ETC2_RGB8_A1: return gl.UNSIGNED_BYTE; + case GFXFormat.ETC2_SRGB8_A1: return gl.UNSIGNED_BYTE; + case GFXFormat.ETC2_RGB8: return gl.UNSIGNED_BYTE; + case GFXFormat.ETC2_SRGB8: return gl.UNSIGNED_BYTE; + case GFXFormat.EAC_R11: return gl.UNSIGNED_BYTE; + case GFXFormat.EAC_R11SN: return gl.BYTE; + case GFXFormat.EAC_RG11: return gl.UNSIGNED_BYTE; + case GFXFormat.EAC_RG11SN: return gl.BYTE; - case GFXFormat.PVRTC_RGB2: return WebGL2RenderingContext.UNSIGNED_BYTE; - case GFXFormat.PVRTC_RGBA2: return WebGL2RenderingContext.UNSIGNED_BYTE; - case GFXFormat.PVRTC_RGB4: return WebGL2RenderingContext.UNSIGNED_BYTE; - case GFXFormat.PVRTC_RGBA4: return WebGL2RenderingContext.UNSIGNED_BYTE; - case GFXFormat.PVRTC2_2BPP: return WebGL2RenderingContext.UNSIGNED_BYTE; - case GFXFormat.PVRTC2_4BPP: return WebGL2RenderingContext.UNSIGNED_BYTE; + case GFXFormat.PVRTC_RGB2: return gl.UNSIGNED_BYTE; + case GFXFormat.PVRTC_RGBA2: return gl.UNSIGNED_BYTE; + case GFXFormat.PVRTC_RGB4: return gl.UNSIGNED_BYTE; + case GFXFormat.PVRTC_RGBA4: return gl.UNSIGNED_BYTE; + case GFXFormat.PVRTC2_2BPP: return gl.UNSIGNED_BYTE; + case GFXFormat.PVRTC2_4BPP: return gl.UNSIGNED_BYTE; default: { - return WebGL2RenderingContext.UNSIGNED_BYTE; + return gl.UNSIGNED_BYTE; } } } -function GFXFormatToWebGLInternalFormat (format: GFXFormat): GLenum { +function GFXFormatToWebGLInternalFormat (format: GFXFormat, gl: WebGL2RenderingContext): GLenum { switch (format) { - case GFXFormat.A8: return WebGL2RenderingContext.ALPHA; - case GFXFormat.L8: return WebGL2RenderingContext.LUMINANCE; - case GFXFormat.LA8: return WebGL2RenderingContext.LUMINANCE_ALPHA; - case GFXFormat.R8: return WebGL2RenderingContext.R8; - case GFXFormat.R8SN: return WebGL2RenderingContext.R8_SNORM; - case GFXFormat.R8UI: return WebGL2RenderingContext.R8UI; - case GFXFormat.R8I: return WebGL2RenderingContext.R8I; - case GFXFormat.RG8: return WebGL2RenderingContext.RG8; - case GFXFormat.RG8SN: return WebGL2RenderingContext.RG8_SNORM; - case GFXFormat.RG8UI: return WebGL2RenderingContext.RG8UI; - case GFXFormat.RG8I: return WebGL2RenderingContext.RG8I; - case GFXFormat.RGB8: return WebGL2RenderingContext.RGB8; - case GFXFormat.RGB8SN: return WebGL2RenderingContext.RGB8_SNORM; - case GFXFormat.RGB8UI: return WebGL2RenderingContext.RGB8UI; - case GFXFormat.RGB8I: return WebGL2RenderingContext.RGB8I; - case GFXFormat.RGBA8: return WebGL2RenderingContext.RGBA8; - case GFXFormat.RGBA8SN: return WebGL2RenderingContext.RGBA8_SNORM; - case GFXFormat.RGBA8UI: return WebGL2RenderingContext.RGBA8UI; - case GFXFormat.RGBA8I: return WebGL2RenderingContext.RGBA8I; - case GFXFormat.R16I: return WebGL2RenderingContext.R16I; - case GFXFormat.R16UI: return WebGL2RenderingContext.R16UI; - case GFXFormat.R16F: return WebGL2RenderingContext.R16F; - case GFXFormat.RG16I: return WebGL2RenderingContext.RG16I; - case GFXFormat.RG16UI: return WebGL2RenderingContext.RG16UI; - case GFXFormat.RG16F: return WebGL2RenderingContext.RG16F; - case GFXFormat.RGB16I: return WebGL2RenderingContext.RGB16I; - case GFXFormat.RGB16UI: return WebGL2RenderingContext.RGB16UI; - case GFXFormat.RGB16F: return WebGL2RenderingContext.RGB16F; - case GFXFormat.RGBA16I: return WebGL2RenderingContext.RGBA16I; - case GFXFormat.RGBA16UI: return WebGL2RenderingContext.RGBA16UI; - case GFXFormat.RGBA16F: return WebGL2RenderingContext.RGBA16F; - case GFXFormat.R32I: return WebGL2RenderingContext.R32I; - case GFXFormat.R32UI: return WebGL2RenderingContext.R32UI; - case GFXFormat.R32F: return WebGL2RenderingContext.R32F; - case GFXFormat.RG32I: return WebGL2RenderingContext.RG32I; - case GFXFormat.RG32UI: return WebGL2RenderingContext.RG32UI; - case GFXFormat.RG32F: return WebGL2RenderingContext.RG32F; - case GFXFormat.RGB32I: return WebGL2RenderingContext.RGB32I; - case GFXFormat.RGB32UI: return WebGL2RenderingContext.RGB32UI; - case GFXFormat.RGB32F: return WebGL2RenderingContext.RGB32F; - case GFXFormat.RGBA32I: return WebGL2RenderingContext.RGBA32I; - case GFXFormat.RGBA32UI: return WebGL2RenderingContext.RGBA32UI; - case GFXFormat.RGBA32F: return WebGL2RenderingContext.RGBA32F; - case GFXFormat.R5G6B5: return WebGL2RenderingContext.RGB565; - case GFXFormat.RGB5A1: return WebGL2RenderingContext.RGB5_A1; - case GFXFormat.RGBA4: return WebGL2RenderingContext.RGBA4; - case GFXFormat.RGB10A2: return WebGL2RenderingContext.RGB10_A2; - case GFXFormat.RGB10A2UI: return WebGL2RenderingContext.RGB10_A2UI; - case GFXFormat.R11G11B10F: return WebGL2RenderingContext.R11F_G11F_B10F; - case GFXFormat.D16: return WebGL2RenderingContext.DEPTH_COMPONENT16; - case GFXFormat.D16S8: return WebGL2RenderingContext.DEPTH_STENCIL; - case GFXFormat.D24: return WebGL2RenderingContext.DEPTH_COMPONENT24; - case GFXFormat.D24S8: return WebGL2RenderingContext.DEPTH24_STENCIL8; - case GFXFormat.D32F: return WebGL2RenderingContext.DEPTH_COMPONENT32F; - case GFXFormat.D32F_S8: return WebGL2RenderingContext.DEPTH32F_STENCIL8; + case GFXFormat.A8: return gl.ALPHA; + case GFXFormat.L8: return gl.LUMINANCE; + case GFXFormat.LA8: return gl.LUMINANCE_ALPHA; + case GFXFormat.R8: return gl.R8; + case GFXFormat.R8SN: return gl.R8_SNORM; + case GFXFormat.R8UI: return gl.R8UI; + case GFXFormat.R8I: return gl.R8I; + case GFXFormat.RG8: return gl.RG8; + case GFXFormat.RG8SN: return gl.RG8_SNORM; + case GFXFormat.RG8UI: return gl.RG8UI; + case GFXFormat.RG8I: return gl.RG8I; + case GFXFormat.RGB8: return gl.RGB8; + case GFXFormat.RGB8SN: return gl.RGB8_SNORM; + case GFXFormat.RGB8UI: return gl.RGB8UI; + case GFXFormat.RGB8I: return gl.RGB8I; + case GFXFormat.RGBA8: return gl.RGBA8; + case GFXFormat.RGBA8SN: return gl.RGBA8_SNORM; + case GFXFormat.RGBA8UI: return gl.RGBA8UI; + case GFXFormat.RGBA8I: return gl.RGBA8I; + case GFXFormat.R16I: return gl.R16I; + case GFXFormat.R16UI: return gl.R16UI; + case GFXFormat.R16F: return gl.R16F; + case GFXFormat.RG16I: return gl.RG16I; + case GFXFormat.RG16UI: return gl.RG16UI; + case GFXFormat.RG16F: return gl.RG16F; + case GFXFormat.RGB16I: return gl.RGB16I; + case GFXFormat.RGB16UI: return gl.RGB16UI; + case GFXFormat.RGB16F: return gl.RGB16F; + case GFXFormat.RGBA16I: return gl.RGBA16I; + case GFXFormat.RGBA16UI: return gl.RGBA16UI; + case GFXFormat.RGBA16F: return gl.RGBA16F; + case GFXFormat.R32I: return gl.R32I; + case GFXFormat.R32UI: return gl.R32UI; + case GFXFormat.R32F: return gl.R32F; + case GFXFormat.RG32I: return gl.RG32I; + case GFXFormat.RG32UI: return gl.RG32UI; + case GFXFormat.RG32F: return gl.RG32F; + case GFXFormat.RGB32I: return gl.RGB32I; + case GFXFormat.RGB32UI: return gl.RGB32UI; + case GFXFormat.RGB32F: return gl.RGB32F; + case GFXFormat.RGBA32I: return gl.RGBA32I; + case GFXFormat.RGBA32UI: return gl.RGBA32UI; + case GFXFormat.RGBA32F: return gl.RGBA32F; + case GFXFormat.R5G6B5: return gl.RGB565; + case GFXFormat.RGB5A1: return gl.RGB5_A1; + case GFXFormat.RGBA4: return gl.RGBA4; + case GFXFormat.RGB10A2: return gl.RGB10_A2; + case GFXFormat.RGB10A2UI: return gl.RGB10_A2UI; + case GFXFormat.R11G11B10F: return gl.R11F_G11F_B10F; + case GFXFormat.D16: return gl.DEPTH_COMPONENT16; + case GFXFormat.D16S8: return gl.DEPTH_STENCIL; + case GFXFormat.D24: return gl.DEPTH_COMPONENT24; + case GFXFormat.D24S8: return gl.DEPTH24_STENCIL8; + case GFXFormat.D32F: return gl.DEPTH_COMPONENT32F; + case GFXFormat.D32F_S8: return gl.DEPTH32F_STENCIL8; case GFXFormat.BC1: return WebGLEXT.COMPRESSED_RGB_S3TC_DXT1_EXT; case GFXFormat.BC1_ALPHA: return WebGLEXT.COMPRESSED_RGBA_S3TC_DXT1_EXT; @@ -268,67 +268,67 @@ function GFXFormatToWebGLInternalFormat (format: GFXFormat): GLenum { default: { console.error('Unsupported GFXFormat, convert to WebGL internal format failed.'); - return WebGL2RenderingContext.RGBA; + return gl.RGBA; } } } -function GFXFormatToWebGLFormat (format: GFXFormat): GLenum { +function GFXFormatToWebGLFormat (format: GFXFormat, gl: WebGL2RenderingContext): GLenum { switch (format) { - case GFXFormat.A8: return WebGL2RenderingContext.ALPHA; - case GFXFormat.L8: return WebGL2RenderingContext.LUMINANCE; - case GFXFormat.LA8: return WebGL2RenderingContext.LUMINANCE_ALPHA; + case GFXFormat.A8: return gl.ALPHA; + case GFXFormat.L8: return gl.LUMINANCE; + case GFXFormat.LA8: return gl.LUMINANCE_ALPHA; case GFXFormat.R8: - case GFXFormat.R8SN: return WebGL2RenderingContext.RED; + case GFXFormat.R8SN: return gl.RED; case GFXFormat.R8UI: - case GFXFormat.R8I: return WebGL2RenderingContext.RED; + case GFXFormat.R8I: return gl.RED; case GFXFormat.RG8: case GFXFormat.RG8SN: case GFXFormat.RG8UI: - case GFXFormat.RG8I: return WebGL2RenderingContext.RG; + case GFXFormat.RG8I: return gl.RG; case GFXFormat.RGB8: case GFXFormat.RGB8SN: case GFXFormat.RGB8UI: - case GFXFormat.RGB8I: return WebGL2RenderingContext.RGB; + case GFXFormat.RGB8I: return gl.RGB; case GFXFormat.RGBA8: case GFXFormat.RGBA8SN: case GFXFormat.RGBA8UI: - case GFXFormat.RGBA8I: return WebGL2RenderingContext.RGBA; + case GFXFormat.RGBA8I: return gl.RGBA; case GFXFormat.R16UI: case GFXFormat.R16I: - case GFXFormat.R16F: return WebGL2RenderingContext.RED; + case GFXFormat.R16F: return gl.RED; case GFXFormat.RG16UI: case GFXFormat.RG16I: - case GFXFormat.RG16F: return WebGL2RenderingContext.RG; + case GFXFormat.RG16F: return gl.RG; case GFXFormat.RGB16UI: case GFXFormat.RGB16I: - case GFXFormat.RGB16F: return WebGL2RenderingContext.RGB; + case GFXFormat.RGB16F: return gl.RGB; case GFXFormat.RGBA16UI: case GFXFormat.RGBA16I: - case GFXFormat.RGBA16F: return WebGL2RenderingContext.RGBA; + case GFXFormat.RGBA16F: return gl.RGBA; case GFXFormat.R32UI: case GFXFormat.R32I: - case GFXFormat.R32F: return WebGL2RenderingContext.RED; + case GFXFormat.R32F: return gl.RED; case GFXFormat.RG32UI: case GFXFormat.RG32I: - case GFXFormat.RG32F: return WebGL2RenderingContext.RG; + case GFXFormat.RG32F: return gl.RG; case GFXFormat.RGB32UI: case GFXFormat.RGB32I: - case GFXFormat.RGB32F: return WebGL2RenderingContext.RGB; + case GFXFormat.RGB32F: return gl.RGB; case GFXFormat.RGBA32UI: case GFXFormat.RGBA32I: - case GFXFormat.RGBA32F: return WebGL2RenderingContext.RGBA; - case GFXFormat.RGB10A2: return WebGL2RenderingContext.RGBA; - case GFXFormat.R11G11B10F: return WebGL2RenderingContext.RGB; - case GFXFormat.R5G6B5: return WebGL2RenderingContext.RGB; - case GFXFormat.RGB5A1: return WebGL2RenderingContext.RGBA; - case GFXFormat.RGBA4: return WebGL2RenderingContext.RGBA; - case GFXFormat.D16: return WebGL2RenderingContext.DEPTH_COMPONENT; - case GFXFormat.D16S8: return WebGL2RenderingContext.DEPTH_STENCIL; - case GFXFormat.D24: return WebGL2RenderingContext.DEPTH_COMPONENT; - case GFXFormat.D24S8: return WebGL2RenderingContext.DEPTH_STENCIL; - case GFXFormat.D32F: return WebGL2RenderingContext.DEPTH_COMPONENT; - case GFXFormat.D32F_S8: return WebGL2RenderingContext.DEPTH_STENCIL; + case GFXFormat.RGBA32F: return gl.RGBA; + case GFXFormat.RGB10A2: return gl.RGBA; + case GFXFormat.R11G11B10F: return gl.RGB; + case GFXFormat.R5G6B5: return gl.RGB; + case GFXFormat.RGB5A1: return gl.RGBA; + case GFXFormat.RGBA4: return gl.RGBA; + case GFXFormat.D16: return gl.DEPTH_COMPONENT; + case GFXFormat.D16S8: return gl.DEPTH_STENCIL; + case GFXFormat.D24: return gl.DEPTH_COMPONENT; + case GFXFormat.D24S8: return gl.DEPTH_STENCIL; + case GFXFormat.D32F: return gl.DEPTH_COMPONENT; + case GFXFormat.D32F_S8: return gl.DEPTH_STENCIL; case GFXFormat.BC1: return WebGLEXT.COMPRESSED_RGB_S3TC_DXT1_EXT; case GFXFormat.BC1_ALPHA: return WebGLEXT.COMPRESSED_RGBA_S3TC_DXT1_EXT; @@ -348,39 +348,39 @@ function GFXFormatToWebGLFormat (format: GFXFormat): GLenum { default: { console.error('Unsupported GFXFormat, convert to WebGL format failed.'); - return WebGL2RenderingContext.RGBA; + return gl.RGBA; } } } -function GFXTypeToWebGLType (type: GFXType): GLenum { +function GFXTypeToWebGLType (type: GFXType, gl: WebGL2RenderingContext): GLenum { switch (type) { - case GFXType.BOOL: return WebGL2RenderingContext.BOOL; - case GFXType.BOOL2: return WebGL2RenderingContext.BOOL_VEC2; - case GFXType.BOOL3: return WebGL2RenderingContext.BOOL_VEC3; - case GFXType.BOOL4: return WebGL2RenderingContext.BOOL_VEC4; - case GFXType.INT: return WebGL2RenderingContext.INT; - case GFXType.INT2: return WebGL2RenderingContext.INT_VEC2; - case GFXType.INT3: return WebGL2RenderingContext.INT_VEC3; - case GFXType.INT4: return WebGL2RenderingContext.INT_VEC4; - case GFXType.UINT: return WebGL2RenderingContext.UNSIGNED_INT; - case GFXType.FLOAT: return WebGL2RenderingContext.FLOAT; - case GFXType.FLOAT2: return WebGL2RenderingContext.FLOAT_VEC2; - case GFXType.FLOAT3: return WebGL2RenderingContext.FLOAT_VEC3; - case GFXType.FLOAT4: return WebGL2RenderingContext.FLOAT_VEC4; - case GFXType.MAT2: return WebGL2RenderingContext.FLOAT_MAT2; - case GFXType.MAT2X3: return WebGL2RenderingContext.FLOAT_MAT2x3; - case GFXType.MAT2X4: return WebGL2RenderingContext.FLOAT_MAT2x4; - case GFXType.MAT3X2: return WebGL2RenderingContext.FLOAT_MAT3x2; - case GFXType.MAT3: return WebGL2RenderingContext.FLOAT_MAT3; - case GFXType.MAT3X4: return WebGL2RenderingContext.FLOAT_MAT3x4; - case GFXType.MAT4X2: return WebGL2RenderingContext.FLOAT_MAT4x2; - case GFXType.MAT4X3: return WebGL2RenderingContext.FLOAT_MAT4x3; - case GFXType.MAT4: return WebGL2RenderingContext.FLOAT_MAT4; - case GFXType.SAMPLER2D: return WebGL2RenderingContext.SAMPLER_2D; - case GFXType.SAMPLER2D_ARRAY: return WebGL2RenderingContext.SAMPLER_2D_ARRAY; - case GFXType.SAMPLER3D: return WebGL2RenderingContext.SAMPLER_3D; - case GFXType.SAMPLER_CUBE: return WebGL2RenderingContext.SAMPLER_CUBE; + case GFXType.BOOL: return gl.BOOL; + case GFXType.BOOL2: return gl.BOOL_VEC2; + case GFXType.BOOL3: return gl.BOOL_VEC3; + case GFXType.BOOL4: return gl.BOOL_VEC4; + case GFXType.INT: return gl.INT; + case GFXType.INT2: return gl.INT_VEC2; + case GFXType.INT3: return gl.INT_VEC3; + case GFXType.INT4: return gl.INT_VEC4; + case GFXType.UINT: return gl.UNSIGNED_INT; + case GFXType.FLOAT: return gl.FLOAT; + case GFXType.FLOAT2: return gl.FLOAT_VEC2; + case GFXType.FLOAT3: return gl.FLOAT_VEC3; + case GFXType.FLOAT4: return gl.FLOAT_VEC4; + case GFXType.MAT2: return gl.FLOAT_MAT2; + case GFXType.MAT2X3: return gl.FLOAT_MAT2x3; + case GFXType.MAT2X4: return gl.FLOAT_MAT2x4; + case GFXType.MAT3X2: return gl.FLOAT_MAT3x2; + case GFXType.MAT3: return gl.FLOAT_MAT3; + case GFXType.MAT3X4: return gl.FLOAT_MAT3x4; + case GFXType.MAT4X2: return gl.FLOAT_MAT4x2; + case GFXType.MAT4X3: return gl.FLOAT_MAT4x3; + case GFXType.MAT4: return gl.FLOAT_MAT4; + case GFXType.SAMPLER2D: return gl.SAMPLER_2D; + case GFXType.SAMPLER2D_ARRAY: return gl.SAMPLER_2D_ARRAY; + case GFXType.SAMPLER3D: return gl.SAMPLER_3D; + case GFXType.SAMPLER_CUBE: return gl.SAMPLER_CUBE; default: { console.error('Unsupported GLType, convert to GL type failed.'); return GFXType.UNKNOWN; @@ -388,38 +388,38 @@ function GFXTypeToWebGLType (type: GFXType): GLenum { } } -function WebGLTypeToGFXType (glType: GLenum): GFXType { +function WebGLTypeToGFXType (glType: GLenum, gl: WebGL2RenderingContext): GFXType { switch (glType) { - case WebGL2RenderingContext.BOOL: return GFXType.BOOL; - case WebGL2RenderingContext.BOOL_VEC2: return GFXType.BOOL2; - case WebGL2RenderingContext.BOOL_VEC3: return GFXType.BOOL3; - case WebGL2RenderingContext.BOOL_VEC4: return GFXType.BOOL4; - case WebGL2RenderingContext.INT: return GFXType.INT; - case WebGL2RenderingContext.INT_VEC2: return GFXType.INT2; - case WebGL2RenderingContext.INT_VEC3: return GFXType.INT3; - case WebGL2RenderingContext.INT_VEC4: return GFXType.INT4; - case WebGL2RenderingContext.UNSIGNED_INT: return GFXType.UINT; - case WebGL2RenderingContext.UNSIGNED_INT_VEC2: return GFXType.UINT2; - case WebGL2RenderingContext.UNSIGNED_INT_VEC3: return GFXType.UINT3; - case WebGL2RenderingContext.UNSIGNED_INT_VEC4: return GFXType.UINT4; - case WebGL2RenderingContext.UNSIGNED_INT: return GFXType.UINT; - case WebGL2RenderingContext.FLOAT: return GFXType.FLOAT; - case WebGL2RenderingContext.FLOAT_VEC2: return GFXType.FLOAT2; - case WebGL2RenderingContext.FLOAT_VEC3: return GFXType.FLOAT3; - case WebGL2RenderingContext.FLOAT_VEC4: return GFXType.FLOAT4; - case WebGL2RenderingContext.FLOAT_MAT2: return GFXType.MAT2; - case WebGL2RenderingContext.FLOAT_MAT2x3: return GFXType.MAT2X3; - case WebGL2RenderingContext.FLOAT_MAT2x4: return GFXType.MAT2X4; - case WebGL2RenderingContext.FLOAT_MAT3x2: return GFXType.MAT3X2; - case WebGL2RenderingContext.FLOAT_MAT3: return GFXType.MAT3; - case WebGL2RenderingContext.FLOAT_MAT3x4: return GFXType.MAT3X4; - case WebGL2RenderingContext.FLOAT_MAT4x2: return GFXType.MAT4X2; - case WebGL2RenderingContext.FLOAT_MAT4x3: return GFXType.MAT4X3; - case WebGL2RenderingContext.FLOAT_MAT4: return GFXType.MAT4; - case WebGL2RenderingContext.SAMPLER_2D: return GFXType.SAMPLER2D; - case WebGL2RenderingContext.SAMPLER_2D_ARRAY: return GFXType.SAMPLER2D_ARRAY; - case WebGL2RenderingContext.SAMPLER_3D: return GFXType.SAMPLER3D; - case WebGL2RenderingContext.SAMPLER_CUBE: return GFXType.SAMPLER_CUBE; + case gl.BOOL: return GFXType.BOOL; + case gl.BOOL_VEC2: return GFXType.BOOL2; + case gl.BOOL_VEC3: return GFXType.BOOL3; + case gl.BOOL_VEC4: return GFXType.BOOL4; + case gl.INT: return GFXType.INT; + case gl.INT_VEC2: return GFXType.INT2; + case gl.INT_VEC3: return GFXType.INT3; + case gl.INT_VEC4: return GFXType.INT4; + case gl.UNSIGNED_INT: return GFXType.UINT; + case gl.UNSIGNED_INT_VEC2: return GFXType.UINT2; + case gl.UNSIGNED_INT_VEC3: return GFXType.UINT3; + case gl.UNSIGNED_INT_VEC4: return GFXType.UINT4; + case gl.UNSIGNED_INT: return GFXType.UINT; + case gl.FLOAT: return GFXType.FLOAT; + case gl.FLOAT_VEC2: return GFXType.FLOAT2; + case gl.FLOAT_VEC3: return GFXType.FLOAT3; + case gl.FLOAT_VEC4: return GFXType.FLOAT4; + case gl.FLOAT_MAT2: return GFXType.MAT2; + case gl.FLOAT_MAT2x3: return GFXType.MAT2X3; + case gl.FLOAT_MAT2x4: return GFXType.MAT2X4; + case gl.FLOAT_MAT3x2: return GFXType.MAT3X2; + case gl.FLOAT_MAT3: return GFXType.MAT3; + case gl.FLOAT_MAT3x4: return GFXType.MAT3X4; + case gl.FLOAT_MAT4x2: return GFXType.MAT4X2; + case gl.FLOAT_MAT4x3: return GFXType.MAT4X3; + case gl.FLOAT_MAT4: return GFXType.MAT4; + case gl.SAMPLER_2D: return GFXType.SAMPLER2D; + case gl.SAMPLER_2D_ARRAY: return GFXType.SAMPLER2D_ARRAY; + case gl.SAMPLER_3D: return GFXType.SAMPLER3D; + case gl.SAMPLER_CUBE: return GFXType.SAMPLER_CUBE; default: { console.error('Unsupported GLType, convert to GFXType failed.'); return GFXType.UNKNOWN; @@ -427,46 +427,46 @@ function WebGLTypeToGFXType (glType: GLenum): GFXType { } } -function WebGLGetTypeSize (glType: GLenum): GFXType { +function WebGLGetTypeSize (glType: GLenum, gl: WebGL2RenderingContext): GFXType { switch (glType) { - case WebGL2RenderingContext.BOOL: return 4; - case WebGL2RenderingContext.BOOL_VEC2: return 8; - case WebGL2RenderingContext.BOOL_VEC3: return 12; - case WebGL2RenderingContext.BOOL_VEC4: return 16; - case WebGL2RenderingContext.INT: return 4; - case WebGL2RenderingContext.INT_VEC2: return 8; - case WebGL2RenderingContext.INT_VEC3: return 12; - case WebGL2RenderingContext.INT_VEC4: return 16; - case WebGL2RenderingContext.UNSIGNED_INT: return 4; - case WebGL2RenderingContext.UNSIGNED_INT_VEC2: return 8; - case WebGL2RenderingContext.UNSIGNED_INT_VEC3: return 12; - case WebGL2RenderingContext.UNSIGNED_INT_VEC4: return 16; - case WebGL2RenderingContext.FLOAT: return 4; - case WebGL2RenderingContext.FLOAT_VEC2: return 8; - case WebGL2RenderingContext.FLOAT_VEC3: return 12; - case WebGL2RenderingContext.FLOAT_VEC4: return 16; - case WebGL2RenderingContext.FLOAT_MAT2: return 16; - case WebGL2RenderingContext.FLOAT_MAT2x3: return 24; - case WebGL2RenderingContext.FLOAT_MAT2x4: return 32; - case WebGL2RenderingContext.FLOAT_MAT3x2: return 24; - case WebGL2RenderingContext.FLOAT_MAT3: return 36; - case WebGL2RenderingContext.FLOAT_MAT3x4: return 48; - case WebGL2RenderingContext.FLOAT_MAT4x2: return 32; - case WebGL2RenderingContext.FLOAT_MAT4x3: return 48; - case WebGL2RenderingContext.FLOAT_MAT4: return 64; - case WebGL2RenderingContext.SAMPLER_2D: return 4; - case WebGL2RenderingContext.SAMPLER_2D_ARRAY: return 4; - case WebGL2RenderingContext.SAMPLER_2D_ARRAY_SHADOW: return 4; - case WebGL2RenderingContext.SAMPLER_3D: return 4; - case WebGL2RenderingContext.SAMPLER_CUBE: return 4; - case WebGL2RenderingContext.INT_SAMPLER_2D: return 4; - case WebGL2RenderingContext.INT_SAMPLER_2D_ARRAY: return 4; - case WebGL2RenderingContext.INT_SAMPLER_3D: return 4; - case WebGL2RenderingContext.INT_SAMPLER_CUBE: return 4; - case WebGL2RenderingContext.UNSIGNED_INT_SAMPLER_2D: return 4; - case WebGL2RenderingContext.UNSIGNED_INT_SAMPLER_2D_ARRAY: return 4; - case WebGL2RenderingContext.UNSIGNED_INT_SAMPLER_3D: return 4; - case WebGL2RenderingContext.UNSIGNED_INT_SAMPLER_CUBE: return 4; + case gl.BOOL: return 4; + case gl.BOOL_VEC2: return 8; + case gl.BOOL_VEC3: return 12; + case gl.BOOL_VEC4: return 16; + case gl.INT: return 4; + case gl.INT_VEC2: return 8; + case gl.INT_VEC3: return 12; + case gl.INT_VEC4: return 16; + case gl.UNSIGNED_INT: return 4; + case gl.UNSIGNED_INT_VEC2: return 8; + case gl.UNSIGNED_INT_VEC3: return 12; + case gl.UNSIGNED_INT_VEC4: return 16; + case gl.FLOAT: return 4; + case gl.FLOAT_VEC2: return 8; + case gl.FLOAT_VEC3: return 12; + case gl.FLOAT_VEC4: return 16; + case gl.FLOAT_MAT2: return 16; + case gl.FLOAT_MAT2x3: return 24; + case gl.FLOAT_MAT2x4: return 32; + case gl.FLOAT_MAT3x2: return 24; + case gl.FLOAT_MAT3: return 36; + case gl.FLOAT_MAT3x4: return 48; + case gl.FLOAT_MAT4x2: return 32; + case gl.FLOAT_MAT4x3: return 48; + case gl.FLOAT_MAT4: return 64; + case gl.SAMPLER_2D: return 4; + case gl.SAMPLER_2D_ARRAY: return 4; + case gl.SAMPLER_2D_ARRAY_SHADOW: return 4; + case gl.SAMPLER_3D: return 4; + case gl.SAMPLER_CUBE: return 4; + case gl.INT_SAMPLER_2D: return 4; + case gl.INT_SAMPLER_2D_ARRAY: return 4; + case gl.INT_SAMPLER_3D: return 4; + case gl.INT_SAMPLER_CUBE: return 4; + case gl.UNSIGNED_INT_SAMPLER_2D: return 4; + case gl.UNSIGNED_INT_SAMPLER_2D_ARRAY: return 4; + case gl.UNSIGNED_INT_SAMPLER_3D: return 4; + case gl.UNSIGNED_INT_SAMPLER_CUBE: return 4; default: { console.error('Unsupported GLType, get type failed.'); return 0; @@ -474,17 +474,17 @@ function WebGLGetTypeSize (glType: GLenum): GFXType { } } -function WebGLGetComponentCount (glType: GLenum): GFXType { +function WebGLGetComponentCount (glType: GLenum, gl: WebGL2RenderingContext): GFXType { switch (glType) { - case WebGL2RenderingContext.FLOAT_MAT2: return 2; - case WebGL2RenderingContext.FLOAT_MAT2x3: return 2; - case WebGL2RenderingContext.FLOAT_MAT2x4: return 2; - case WebGL2RenderingContext.FLOAT_MAT3x2: return 3; - case WebGL2RenderingContext.FLOAT_MAT3: return 3; - case WebGL2RenderingContext.FLOAT_MAT3x4: return 3; - case WebGL2RenderingContext.FLOAT_MAT4x2: return 4; - case WebGL2RenderingContext.FLOAT_MAT4x3: return 4; - case WebGL2RenderingContext.FLOAT_MAT4: return 4; + case gl.FLOAT_MAT2: return 2; + case gl.FLOAT_MAT2x3: return 2; + case gl.FLOAT_MAT2x4: return 2; + case gl.FLOAT_MAT3x2: return 3; + case gl.FLOAT_MAT3: return 3; + case gl.FLOAT_MAT3x4: return 3; + case gl.FLOAT_MAT4x2: return 4; + case gl.FLOAT_MAT4x3: return 4; + case gl.FLOAT_MAT4: return 4; default: { return 1; } @@ -492,51 +492,51 @@ function WebGLGetComponentCount (glType: GLenum): GFXType { } const WebGLCmpFuncs: GLenum[] = [ - WebGLRenderingContext.NEVER, - WebGLRenderingContext.LESS, - WebGLRenderingContext.EQUAL, - WebGLRenderingContext.LEQUAL, - WebGLRenderingContext.GREATER, - WebGLRenderingContext.NOTEQUAL, - WebGLRenderingContext.GEQUAL, - WebGLRenderingContext.ALWAYS, + 0x0200, // WebGLRenderingContext.NEVER, + 0x0201, // WebGLRenderingContext.LESS, + 0x0202, // WebGLRenderingContext.EQUAL, + 0x0203, // WebGLRenderingContext.LEQUAL, + 0x0204, // WebGLRenderingContext.GREATER, + 0x0205, // WebGLRenderingContext.NOTEQUAL, + 0x0206, // WebGLRenderingContext.GEQUAL, + 0x0207, // WebGLRenderingContext.ALWAYS, ]; const WebGLStencilOps: GLenum[] = [ - WebGLRenderingContext.ZERO, - WebGLRenderingContext.KEEP, - WebGLRenderingContext.REPLACE, - WebGLRenderingContext.INCR, - WebGLRenderingContext.DECR, - WebGLRenderingContext.INVERT, - WebGLRenderingContext.INCR_WRAP, - WebGLRenderingContext.DECR_WRAP, + 0x0000, // WebGLRenderingContext.ZERO, + 0x1E00, // WebGLRenderingContext.KEEP, + 0x1E01, // WebGLRenderingContext.REPLACE, + 0x1E02, // WebGLRenderingContext.INCR, + 0x1E03, // WebGLRenderingContext.DECR, + 0x150A, // WebGLRenderingContext.INVERT, + 0x8507, // WebGLRenderingContext.INCR_WRAP, + 0x8508, // WebGLRenderingContext.DECR_WRAP, ]; const WebGLBlendOps: GLenum[] = [ - WebGLRenderingContext.FUNC_ADD, - WebGLRenderingContext.FUNC_SUBTRACT, - WebGLRenderingContext.FUNC_REVERSE_SUBTRACT, - WebGLRenderingContext.FUNC_ADD, - WebGLRenderingContext.FUNC_ADD, + 0x8006, // WebGLRenderingContext.FUNC_ADD, + 0x800A, // WebGLRenderingContext.FUNC_SUBTRACT, + 0x800B, // WebGLRenderingContext.FUNC_REVERSE_SUBTRACT, + 0x8006, // WebGLRenderingContext.FUNC_ADD, + 0x8006, // WebGLRenderingContext.FUNC_ADD, ]; const WebGLBlendFactors: GLenum[] = [ - WebGLRenderingContext.ZERO, - WebGLRenderingContext.ONE, - WebGLRenderingContext.SRC_ALPHA, - WebGLRenderingContext.DST_ALPHA, - WebGLRenderingContext.ONE_MINUS_SRC_ALPHA, - WebGLRenderingContext.ONE_MINUS_DST_ALPHA, - WebGLRenderingContext.SRC_COLOR, - WebGLRenderingContext.DST_COLOR, - WebGLRenderingContext.ONE_MINUS_SRC_COLOR, - WebGLRenderingContext.ONE_MINUS_DST_COLOR, - WebGLRenderingContext.SRC_ALPHA_SATURATE, - WebGLRenderingContext.CONSTANT_COLOR, - WebGLRenderingContext.ONE_MINUS_CONSTANT_COLOR, - WebGLRenderingContext.CONSTANT_ALPHA, - WebGLRenderingContext.ONE_MINUS_CONSTANT_ALPHA, + 0x0000, // WebGLRenderingContext.ZERO, + 0x0001, // WebGLRenderingContext.ONE, + 0x0302, // WebGLRenderingContext.SRC_ALPHA, + 0x0304, // WebGLRenderingContext.DST_ALPHA, + 0x0303, // WebGLRenderingContext.ONE_MINUS_SRC_ALPHA, + 0x0305, // WebGLRenderingContext.ONE_MINUS_DST_ALPHA, + 0x0300, // WebGLRenderingContext.SRC_COLOR, + 0x0306, // WebGLRenderingContext.DST_COLOR, + 0x0301, // WebGLRenderingContext.ONE_MINUS_SRC_COLOR, + 0x0307, // WebGLRenderingContext.ONE_MINUS_DST_COLOR, + 0x0308, // WebGLRenderingContext.SRC_ALPHA_SATURATE, + 0x8001, // WebGLRenderingContext.CONSTANT_COLOR, + 0x8002, // WebGLRenderingContext.ONE_MINUS_CONSTANT_COLOR, + 0x8003, // WebGLRenderingContext.CONSTANT_ALPHA, + 0x8004, // WebGLRenderingContext.ONE_MINUS_CONSTANT_ALPHA, ]; export enum WebGL2Cmd { @@ -727,11 +727,11 @@ export function WebGL2CmdFuncCreateBuffer (device: WebGL2GFXDevice, gpuBuffer: W const gl = device.gl; const cache = device.stateCache; - const glUsage: GLenum = gpuBuffer.memUsage & GFXMemoryUsageBit.HOST ? WebGL2RenderingContext.DYNAMIC_DRAW : WebGL2RenderingContext.STATIC_DRAW; + const glUsage: GLenum = gpuBuffer.memUsage & GFXMemoryUsageBit.HOST ? gl.DYNAMIC_DRAW : gl.STATIC_DRAW; if (gpuBuffer.usage & GFXBufferUsageBit.VERTEX) { - gpuBuffer.glTarget = WebGL2RenderingContext.ARRAY_BUFFER; + gpuBuffer.glTarget = gl.ARRAY_BUFFER; const glBuffer = gl.createBuffer(); if (glBuffer) { @@ -743,19 +743,19 @@ export function WebGL2CmdFuncCreateBuffer (device: WebGL2GFXDevice, gpuBuffer: W } if (device.stateCache.glArrayBuffer !== gpuBuffer.glBuffer) { - gl.bindBuffer(WebGL2RenderingContext.ARRAY_BUFFER, gpuBuffer.glBuffer); + gl.bindBuffer(gl.ARRAY_BUFFER, gpuBuffer.glBuffer); device.stateCache.glArrayBuffer = gpuBuffer.glBuffer; } - gl.bufferData(WebGL2RenderingContext.ARRAY_BUFFER, gpuBuffer.size, glUsage); + gl.bufferData(gl.ARRAY_BUFFER, gpuBuffer.size, glUsage); - gl.bindBuffer(WebGL2RenderingContext.ARRAY_BUFFER, null); + gl.bindBuffer(gl.ARRAY_BUFFER, null); device.stateCache.glArrayBuffer = null; } } } else if (gpuBuffer.usage & GFXBufferUsageBit.INDEX) { - gpuBuffer.glTarget = WebGL2RenderingContext.ELEMENT_ARRAY_BUFFER; + gpuBuffer.glTarget = gl.ELEMENT_ARRAY_BUFFER; const glBuffer = gl.createBuffer(); if (glBuffer) { gpuBuffer.glBuffer = glBuffer; @@ -766,41 +766,41 @@ export function WebGL2CmdFuncCreateBuffer (device: WebGL2GFXDevice, gpuBuffer: W } if (device.stateCache.glElementArrayBuffer !== gpuBuffer.glBuffer) { - gl.bindBuffer(WebGL2RenderingContext.ELEMENT_ARRAY_BUFFER, gpuBuffer.glBuffer); + gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, gpuBuffer.glBuffer); device.stateCache.glElementArrayBuffer = gpuBuffer.glBuffer; } - gl.bufferData(WebGL2RenderingContext.ELEMENT_ARRAY_BUFFER, gpuBuffer.size, glUsage); + gl.bufferData(gl.ELEMENT_ARRAY_BUFFER, gpuBuffer.size, glUsage); - gl.bindBuffer(WebGL2RenderingContext.ELEMENT_ARRAY_BUFFER, null); + gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, null); device.stateCache.glElementArrayBuffer = null; } } } else if (gpuBuffer.usage & GFXBufferUsageBit.UNIFORM) { - gpuBuffer.glTarget = WebGL2RenderingContext.UNIFORM_BUFFER; + gpuBuffer.glTarget = gl.UNIFORM_BUFFER; const glBuffer = gl.createBuffer(); if (glBuffer && gpuBuffer.size > 0) { gpuBuffer.glBuffer = glBuffer; if (device.stateCache.glUniformBuffer !== gpuBuffer.glBuffer) { - gl.bindBuffer(WebGL2RenderingContext.UNIFORM_BUFFER, gpuBuffer.glBuffer); + gl.bindBuffer(gl.UNIFORM_BUFFER, gpuBuffer.glBuffer); device.stateCache.glUniformBuffer = gpuBuffer.glBuffer; } - gl.bufferData(WebGL2RenderingContext.UNIFORM_BUFFER, gpuBuffer.size, glUsage); + gl.bufferData(gl.UNIFORM_BUFFER, gpuBuffer.size, glUsage); - gl.bindBuffer(WebGL2RenderingContext.UNIFORM_BUFFER, null); + gl.bindBuffer(gl.UNIFORM_BUFFER, null); device.stateCache.glUniformBuffer = null; } } else if (gpuBuffer.usage & GFXBufferUsageBit.INDIRECT) { - gpuBuffer.glTarget = WebGL2RenderingContext.NONE; + gpuBuffer.glTarget = gl.NONE; } else if (gpuBuffer.usage & GFXBufferUsageBit.TRANSFER_DST) { - gpuBuffer.glTarget = WebGL2RenderingContext.NONE; + gpuBuffer.glTarget = gl.NONE; } else if (gpuBuffer.usage & GFXBufferUsageBit.TRANSFER_SRC) { - gpuBuffer.glTarget = WebGL2RenderingContext.NONE; + gpuBuffer.glTarget = gl.NONE; } else { console.error('Unsupported GFXBufferType, create buffer failed.'); - gpuBuffer.glTarget = WebGL2RenderingContext.NONE; + gpuBuffer.glTarget = gl.NONE; } } @@ -815,7 +815,7 @@ export function WebGL2CmdFuncResizeBuffer (device: WebGL2GFXDevice, gpuBuffer: W const gl = device.gl; const cache = device.stateCache; - const glUsage: GLenum = gpuBuffer.memUsage & GFXMemoryUsageBit.HOST ? WebGL2RenderingContext.DYNAMIC_DRAW : WebGL2RenderingContext.STATIC_DRAW; + const glUsage: GLenum = gpuBuffer.memUsage & GFXMemoryUsageBit.HOST ? gl.DYNAMIC_DRAW : gl.STATIC_DRAW; if (gpuBuffer.usage & GFXBufferUsageBit.VERTEX) { if (cache.glVAO) { @@ -824,11 +824,11 @@ export function WebGL2CmdFuncResizeBuffer (device: WebGL2GFXDevice, gpuBuffer: W } if (cache.glArrayBuffer !== gpuBuffer.glBuffer) { - gl.bindBuffer(WebGL2RenderingContext.ARRAY_BUFFER, gpuBuffer.glBuffer); + gl.bindBuffer(gl.ARRAY_BUFFER, gpuBuffer.glBuffer); } - gl.bufferData(WebGL2RenderingContext.ARRAY_BUFFER, gpuBuffer.size, glUsage); - gl.bindBuffer(WebGL2RenderingContext.ARRAY_BUFFER, null); + gl.bufferData(gl.ARRAY_BUFFER, gpuBuffer.size, glUsage); + gl.bindBuffer(gl.ARRAY_BUFFER, null); cache.glArrayBuffer = null; } else if (gpuBuffer.usage & GFXBufferUsageBit.INDEX) { @@ -838,27 +838,27 @@ export function WebGL2CmdFuncResizeBuffer (device: WebGL2GFXDevice, gpuBuffer: W } if (device.stateCache.glElementArrayBuffer !== gpuBuffer.glBuffer) { - gl.bindBuffer(WebGL2RenderingContext.ELEMENT_ARRAY_BUFFER, gpuBuffer.glBuffer); + gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, gpuBuffer.glBuffer); } - gl.bufferData(WebGL2RenderingContext.ELEMENT_ARRAY_BUFFER, gpuBuffer.size, glUsage); - gl.bindBuffer(WebGL2RenderingContext.ELEMENT_ARRAY_BUFFER, null); + gl.bufferData(gl.ELEMENT_ARRAY_BUFFER, gpuBuffer.size, glUsage); + gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, null); device.stateCache.glElementArrayBuffer = null; } else if (gpuBuffer.usage & GFXBufferUsageBit.UNIFORM) { if (device.stateCache.glUniformBuffer !== gpuBuffer.glBuffer) { - gl.bindBuffer(WebGL2RenderingContext.UNIFORM_BUFFER, gpuBuffer.glBuffer); + gl.bindBuffer(gl.UNIFORM_BUFFER, gpuBuffer.glBuffer); } - gl.bufferData(WebGL2RenderingContext.UNIFORM_BUFFER, gpuBuffer.size, glUsage); - gl.bindBuffer(WebGL2RenderingContext.UNIFORM_BUFFER, null); + gl.bufferData(gl.UNIFORM_BUFFER, gpuBuffer.size, glUsage); + gl.bindBuffer(gl.UNIFORM_BUFFER, null); device.stateCache.glUniformBuffer = null; } else if ((gpuBuffer.usage & GFXBufferUsageBit.INDIRECT) || (gpuBuffer.usage & GFXBufferUsageBit.TRANSFER_DST) || (gpuBuffer.usage & GFXBufferUsageBit.TRANSFER_SRC)) { - gpuBuffer.glTarget = WebGL2RenderingContext.NONE; + gpuBuffer.glTarget = gl.NONE; } else { console.error('Unsupported GFXBufferType, create buffer failed.'); - gpuBuffer.glTarget = WebGL2RenderingContext.NONE; + gpuBuffer.glTarget = gl.NONE; } } @@ -872,14 +872,14 @@ export function WebGL2CmdFuncUpdateBuffer (device: WebGL2GFXDevice, gpuBuffer: W const cache = device.stateCache; switch (gpuBuffer.glTarget) { - case WebGL2RenderingContext.ARRAY_BUFFER: { + case gl.ARRAY_BUFFER: { if (cache.glVAO) { gl.bindVertexArray(null); cache.glVAO = null; } if (cache.glArrayBuffer !== gpuBuffer.glBuffer) { - gl.bindBuffer(WebGL2RenderingContext.ARRAY_BUFFER, gpuBuffer.glBuffer); + gl.bindBuffer(gl.ARRAY_BUFFER, gpuBuffer.glBuffer); cache.glArrayBuffer = gpuBuffer.glBuffer; } @@ -890,14 +890,14 @@ export function WebGL2CmdFuncUpdateBuffer (device: WebGL2GFXDevice, gpuBuffer: W } break; } - case WebGL2RenderingContext.ELEMENT_ARRAY_BUFFER: { + case gl.ELEMENT_ARRAY_BUFFER: { if (cache.glVAO) { gl.bindVertexArray(null); cache.glVAO = null; } if (cache.glElementArrayBuffer !== gpuBuffer.glBuffer) { - gl.bindBuffer(WebGL2RenderingContext.ELEMENT_ARRAY_BUFFER, gpuBuffer.glBuffer); + gl.bindBuffer(gl.ELEMENT_ARRAY_BUFFER, gpuBuffer.glBuffer); cache.glElementArrayBuffer = gpuBuffer.glBuffer; } @@ -908,9 +908,9 @@ export function WebGL2CmdFuncUpdateBuffer (device: WebGL2GFXDevice, gpuBuffer: W } break; } - case WebGL2RenderingContext.UNIFORM_BUFFER: { + case gl.UNIFORM_BUFFER: { if (cache.glUniformBuffer !== gpuBuffer.glBuffer) { - gl.bindBuffer(WebGL2RenderingContext.UNIFORM_BUFFER, gpuBuffer.glBuffer); + gl.bindBuffer(gl.UNIFORM_BUFFER, gpuBuffer.glBuffer); cache.glUniformBuffer = gpuBuffer.glBuffer; } @@ -941,14 +941,14 @@ export function WebGL2CmdFuncCreateTexture (device: WebGL2GFXDevice, gpuTexture: const gl = device.gl; - gpuTexture.glInternelFmt = GFXFormatToWebGLInternalFormat(gpuTexture.format); - gpuTexture.glFormat = GFXFormatToWebGLFormat(gpuTexture.format); - gpuTexture.glType = GFXFormatToWebGLType(gpuTexture.format, device); + gpuTexture.glInternelFmt = GFXFormatToWebGLInternalFormat(gpuTexture.format, gl); + gpuTexture.glFormat = GFXFormatToWebGLFormat(gpuTexture.format, gl); + gpuTexture.glType = GFXFormatToWebGLType(gpuTexture.format, gl); switch (gpuTexture.viewType) { case GFXTextureViewType.TV2D: { gpuTexture.viewType = GFXTextureViewType.TV2D; - gpuTexture.glTarget = WebGL2RenderingContext.TEXTURE_2D; + gpuTexture.glTarget = gl.TEXTURE_2D; if (gpuTexture.samples === GFXSampleCount.X1) { const glTexture = gl.createTexture(); @@ -957,7 +957,7 @@ export function WebGL2CmdFuncCreateTexture (device: WebGL2GFXDevice, gpuTexture: const glTexUnit = device.stateCache.glTex2DUnits[device.stateCache.texUnit]; if (glTexUnit.glTexture !== gpuTexture.glTexture) { - gl.bindTexture(WebGL2RenderingContext.TEXTURE_2D, gpuTexture.glTexture); + gl.bindTexture(gl.TEXTURE_2D, gpuTexture.glTexture); glTexUnit.glTexture = gpuTexture.glTexture; } @@ -966,7 +966,7 @@ export function WebGL2CmdFuncCreateTexture (device: WebGL2GFXDevice, gpuTexture: if (!GFXFormatInfos[gpuTexture.format].isCompressed) { for (let i = 0; i < gpuTexture.mipLevel; ++i) { - gl.texImage2D(WebGL2RenderingContext.TEXTURE_2D, i, gpuTexture.glInternelFmt, w, h, 0, gpuTexture.glFormat, gpuTexture.glType, null); + gl.texImage2D(gl.TEXTURE_2D, i, gpuTexture.glInternelFmt, w, h, 0, gpuTexture.glFormat, gpuTexture.glType, null); w = Math.max(1, w >> 1); h = Math.max(1, h >> 1); } @@ -975,7 +975,7 @@ export function WebGL2CmdFuncCreateTexture (device: WebGL2GFXDevice, gpuTexture: for (let i = 0; i < gpuTexture.mipLevel; ++i) { const imgSize = GFXFormatSize(gpuTexture.format, w, h, 1); const view: Uint8Array = new Uint8Array(imgSize); - gl.compressedTexImage2D(WebGL2RenderingContext.TEXTURE_2D, i, gpuTexture.glInternelFmt, w, h, 0, view); + gl.compressedTexImage2D(gl.TEXTURE_2D, i, gpuTexture.glInternelFmt, w, h, 0, view); w = Math.max(1, w >> 1); h = Math.max(1, h >> 1); } @@ -984,23 +984,23 @@ export function WebGL2CmdFuncCreateTexture (device: WebGL2GFXDevice, gpuTexture: // init 2 x 2 texture const imgSize = GFXFormatSize(gpuTexture.format, 2, 2, 1); const view: Uint8Array = new Uint8Array(imgSize); - gl.compressedTexImage2D(WebGL2RenderingContext.TEXTURE_2D, 0, gpuTexture.glInternelFmt, 2, 2, 0, view); + gl.compressedTexImage2D(gl.TEXTURE_2D, 0, gpuTexture.glInternelFmt, 2, 2, 0, view); } } /* if (gpuTexture.isPowerOf2) { - gpuTexture.glWrapS = WebGL2RenderingContext.REPEAT; - gpuTexture.glWrapT = WebGL2RenderingContext.REPEAT; + gpuTexture.glWrapS = gl.REPEAT; + gpuTexture.glWrapT = gl.REPEAT; } else { - gpuTexture.glWrapS = WebGL2RenderingContext.CLAMP_TO_EDGE; - gpuTexture.glWrapT = WebGL2RenderingContext.CLAMP_TO_EDGE; + gpuTexture.glWrapS = gl.CLAMP_TO_EDGE; + gpuTexture.glWrapT = gl.CLAMP_TO_EDGE; } - gpuTexture.glMinFilter = WebGL2RenderingContext.LINEAR; - gpuTexture.glMagFilter = WebGL2RenderingContext.LINEAR; - gl.texParameteri(gpuTexture.glTarget, WebGL2RenderingContext.TEXTURE_WRAP_S, gpuTexture.glWrapS); - gl.texParameteri(gpuTexture.glTarget, WebGL2RenderingContext.TEXTURE_WRAP_T, gpuTexture.glWrapT); - gl.texParameteri(gpuTexture.glTarget, WebGL2RenderingContext.TEXTURE_MIN_FILTER, gpuTexture.glMinFilter); - gl.texParameteri(gpuTexture.glTarget, WebGL2RenderingContext.TEXTURE_MAG_FILTER, gpuTexture.glMagFilter); + gpuTexture.glMinFilter = gl.LINEAR; + gpuTexture.glMagFilter = gl.LINEAR; + gl.texParameteri(gpuTexture.glTarget, gl.TEXTURE_WRAP_S, gpuTexture.glWrapS); + gl.texParameteri(gpuTexture.glTarget, gl.TEXTURE_WRAP_T, gpuTexture.glWrapT); + gl.texParameteri(gpuTexture.glTarget, gl.TEXTURE_MIN_FILTER, gpuTexture.glMinFilter); + gl.texParameteri(gpuTexture.glTarget, gl.TEXTURE_MAG_FILTER, gpuTexture.glMagFilter); */ } } else { @@ -1008,7 +1008,7 @@ export function WebGL2CmdFuncCreateTexture (device: WebGL2GFXDevice, gpuTexture: if (glRenderbuffer && gpuTexture.size > 0) { gpuTexture.glRenderbuffer = glRenderbuffer; if (device.stateCache.glRenderbuffer !== gpuTexture.glRenderbuffer) { - gl.bindRenderbuffer(WebGL2RenderingContext.RENDERBUFFER, gpuTexture.glRenderbuffer); + gl.bindRenderbuffer(gl.RENDERBUFFER, gpuTexture.glRenderbuffer); device.stateCache.glRenderbuffer = gpuTexture.glRenderbuffer; } @@ -1019,7 +1019,7 @@ export function WebGL2CmdFuncCreateTexture (device: WebGL2GFXDevice, gpuTexture: } case GFXTextureViewType.CUBE: { gpuTexture.viewType = GFXTextureViewType.CUBE; - gpuTexture.glTarget = WebGL2RenderingContext.TEXTURE_CUBE_MAP; + gpuTexture.glTarget = gl.TEXTURE_CUBE_MAP; const glTexture = gl.createTexture(); if (glTexture && gpuTexture.size > 0) { @@ -1027,7 +1027,7 @@ export function WebGL2CmdFuncCreateTexture (device: WebGL2GFXDevice, gpuTexture: const glTexUnit = device.stateCache.glTexCubeUnits[device.stateCache.texUnit]; if (glTexUnit.glTexture !== gpuTexture.glTexture) { - gl.bindTexture(WebGL2RenderingContext.TEXTURE_CUBE_MAP, gpuTexture.glTexture); + gl.bindTexture(gl.TEXTURE_CUBE_MAP, gpuTexture.glTexture); glTexUnit.glTexture = gpuTexture.glTexture; } @@ -1036,7 +1036,7 @@ export function WebGL2CmdFuncCreateTexture (device: WebGL2GFXDevice, gpuTexture: let w = gpuTexture.width; let h = gpuTexture.height; for (let i = 0; i < gpuTexture.mipLevel; ++i) { - gl.texImage2D(WebGL2RenderingContext.TEXTURE_CUBE_MAP_POSITIVE_X + f, i, gpuTexture.glInternelFmt, w, h, 0, gpuTexture.glFormat, gpuTexture.glType, null); + gl.texImage2D(gl.TEXTURE_CUBE_MAP_POSITIVE_X + f, i, gpuTexture.glInternelFmt, w, h, 0, gpuTexture.glFormat, gpuTexture.glType, null); w = Math.max(1, w >> 1); h = Math.max(1, h >> 1); } @@ -1049,7 +1049,7 @@ export function WebGL2CmdFuncCreateTexture (device: WebGL2GFXDevice, gpuTexture: for (let i = 0; i < gpuTexture.mipLevel; ++i) { const imgSize = GFXFormatSize(gpuTexture.format, w, h, 1); const view: Uint8Array = new Uint8Array(imgSize); - gl.compressedTexImage2D(WebGL2RenderingContext.TEXTURE_CUBE_MAP_POSITIVE_X + f, i, gpuTexture.glInternelFmt, w, h, 0, view); + gl.compressedTexImage2D(gl.TEXTURE_CUBE_MAP_POSITIVE_X + f, i, gpuTexture.glInternelFmt, w, h, 0, view); w = Math.max(1, w >> 1); h = Math.max(1, h >> 1); } @@ -1059,26 +1059,26 @@ export function WebGL2CmdFuncCreateTexture (device: WebGL2GFXDevice, gpuTexture: for (let f = 0; f < 6; ++f) { const imgSize = GFXFormatSize(gpuTexture.format, 2, 2, 1); const view: Uint8Array = new Uint8Array(imgSize); - gl.compressedTexImage2D(WebGL2RenderingContext.TEXTURE_CUBE_MAP_POSITIVE_X + f, 0, gpuTexture.glInternelFmt, 2, 2, 0, view); + gl.compressedTexImage2D(gl.TEXTURE_CUBE_MAP_POSITIVE_X + f, 0, gpuTexture.glInternelFmt, 2, 2, 0, view); } } } /* if (gpuTexture.isPowerOf2) { - gpuTexture.glWrapS = WebGL2RenderingContext.REPEAT; - gpuTexture.glWrapT = WebGL2RenderingContext.REPEAT; + gpuTexture.glWrapS = gl.REPEAT; + gpuTexture.glWrapT = gl.REPEAT; } else { - gpuTexture.glWrapS = WebGL2RenderingContext.CLAMP_TO_EDGE; - gpuTexture.glWrapT = WebGL2RenderingContext.CLAMP_TO_EDGE; + gpuTexture.glWrapS = gl.CLAMP_TO_EDGE; + gpuTexture.glWrapT = gl.CLAMP_TO_EDGE; } - gpuTexture.glMinFilter = WebGL2RenderingContext.LINEAR; - gpuTexture.glMagFilter = WebGL2RenderingContext.LINEAR; + gpuTexture.glMinFilter = gl.LINEAR; + gpuTexture.glMagFilter = gl.LINEAR; - gl.texParameteri(gpuTexture.glTarget, WebGL2RenderingContext.TEXTURE_WRAP_S, gpuTexture.glWrapS); - gl.texParameteri(gpuTexture.glTarget, WebGL2RenderingContext.TEXTURE_WRAP_T, gpuTexture.glWrapT); - gl.texParameteri(gpuTexture.glTarget, WebGL2RenderingContext.TEXTURE_MIN_FILTER, gpuTexture.glMinFilter); - gl.texParameteri(gpuTexture.glTarget, WebGL2RenderingContext.TEXTURE_MAG_FILTER, gpuTexture.glMagFilter); + gl.texParameteri(gpuTexture.glTarget, gl.TEXTURE_WRAP_S, gpuTexture.glWrapS); + gl.texParameteri(gpuTexture.glTarget, gl.TEXTURE_WRAP_T, gpuTexture.glWrapT); + gl.texParameteri(gpuTexture.glTarget, gl.TEXTURE_MIN_FILTER, gpuTexture.glMinFilter); + gl.texParameteri(gpuTexture.glTarget, gl.TEXTURE_MAG_FILTER, gpuTexture.glMagFilter); */ } break; @@ -1086,7 +1086,7 @@ export function WebGL2CmdFuncCreateTexture (device: WebGL2GFXDevice, gpuTexture: default: { console.error('Unsupported GFXTextureType, create texture failed.'); gpuTexture.viewType = GFXTextureViewType.TV2D; - gpuTexture.glTarget = WebGL2RenderingContext.TEXTURE_2D; + gpuTexture.glTarget = gl.TEXTURE_2D; } } } @@ -1107,20 +1107,20 @@ export function WebGL2CmdFuncResizeTexture (device: WebGL2GFXDevice, gpuTexture: const gl = device.gl; - gpuTexture.glInternelFmt = GFXFormatToWebGLInternalFormat(gpuTexture.format); - gpuTexture.glFormat = GFXFormatToWebGLFormat(gpuTexture.format); - gpuTexture.glType = GFXFormatToWebGLType(gpuTexture.format, device); + gpuTexture.glInternelFmt = GFXFormatToWebGLInternalFormat(gpuTexture.format, gl); + gpuTexture.glFormat = GFXFormatToWebGLFormat(gpuTexture.format, gl); + gpuTexture.glType = GFXFormatToWebGLType(gpuTexture.format, gl); switch (gpuTexture.viewType) { case GFXTextureViewType.TV2D: { gpuTexture.viewType = GFXTextureViewType.TV2D; - gpuTexture.glTarget = WebGL2RenderingContext.TEXTURE_2D; + gpuTexture.glTarget = gl.TEXTURE_2D; if (gpuTexture.samples === GFXSampleCount.X1) { const glTexUnit = device.stateCache.glTex2DUnits[device.stateCache.texUnit]; if (glTexUnit.glTexture !== gpuTexture.glTexture) { - gl.bindTexture(WebGL2RenderingContext.TEXTURE_2D, gpuTexture.glTexture); + gl.bindTexture(gl.TEXTURE_2D, gpuTexture.glTexture); glTexUnit.glTexture = gpuTexture.glTexture; } @@ -1129,7 +1129,7 @@ export function WebGL2CmdFuncResizeTexture (device: WebGL2GFXDevice, gpuTexture: if (!GFXFormatInfos[gpuTexture.format].isCompressed) { for (let i = 0; i < gpuTexture.mipLevel; ++i) { - gl.texImage2D(WebGL2RenderingContext.TEXTURE_2D, i, gpuTexture.glInternelFmt, w, h, 0, gpuTexture.glFormat, gpuTexture.glType, null); + gl.texImage2D(gl.TEXTURE_2D, i, gpuTexture.glInternelFmt, w, h, 0, gpuTexture.glFormat, gpuTexture.glType, null); w = Math.max(1, w >> 1); h = Math.max(1, h >> 1); } @@ -1138,7 +1138,7 @@ export function WebGL2CmdFuncResizeTexture (device: WebGL2GFXDevice, gpuTexture: for (let i = 0; i < gpuTexture.mipLevel; ++i) { const imgSize = GFXFormatSize(gpuTexture.format, w, h, 1); const view: Uint8Array = new Uint8Array(imgSize); - gl.compressedTexImage2D(WebGL2RenderingContext.TEXTURE_2D, i, gpuTexture.glInternelFmt, w, h, 0, view); + gl.compressedTexImage2D(gl.TEXTURE_2D, i, gpuTexture.glInternelFmt, w, h, 0, view); w = Math.max(1, w >> 1); h = Math.max(1, h >> 1); } @@ -1149,7 +1149,7 @@ export function WebGL2CmdFuncResizeTexture (device: WebGL2GFXDevice, gpuTexture: if (glRenderbuffer && gpuTexture.size > 0) { gpuTexture.glRenderbuffer = glRenderbuffer; if (device.stateCache.glRenderbuffer !== gpuTexture.glRenderbuffer) { - gl.bindRenderbuffer(WebGL2RenderingContext.RENDERBUFFER, gpuTexture.glRenderbuffer); + gl.bindRenderbuffer(gl.RENDERBUFFER, gpuTexture.glRenderbuffer); device.stateCache.glRenderbuffer = gpuTexture.glRenderbuffer; } @@ -1160,12 +1160,12 @@ export function WebGL2CmdFuncResizeTexture (device: WebGL2GFXDevice, gpuTexture: } case GFXTextureViewType.CUBE: { gpuTexture.viewType = GFXTextureViewType.CUBE; - gpuTexture.glTarget = WebGL2RenderingContext.TEXTURE_CUBE_MAP; + gpuTexture.glTarget = gl.TEXTURE_CUBE_MAP; const glTexUnit = device.stateCache.glTexCubeUnits[device.stateCache.texUnit]; if (glTexUnit.glTexture !== gpuTexture.glTexture) { - gl.bindTexture(WebGL2RenderingContext.TEXTURE_CUBE_MAP, gpuTexture.glTexture); + gl.bindTexture(gl.TEXTURE_CUBE_MAP, gpuTexture.glTexture); glTexUnit.glTexture = gpuTexture.glTexture; } @@ -1174,7 +1174,7 @@ export function WebGL2CmdFuncResizeTexture (device: WebGL2GFXDevice, gpuTexture: let w = gpuTexture.width; let h = gpuTexture.height; for (let i = 0; i < gpuTexture.mipLevel; ++i) { - gl.texImage2D(WebGL2RenderingContext.TEXTURE_CUBE_MAP_POSITIVE_X + f, i, gpuTexture.glInternelFmt, w, h, 0, gpuTexture.glFormat, gpuTexture.glType, null); + gl.texImage2D(gl.TEXTURE_CUBE_MAP_POSITIVE_X + f, i, gpuTexture.glInternelFmt, w, h, 0, gpuTexture.glFormat, gpuTexture.glType, null); w = Math.max(1, w >> 1); h = Math.max(1, h >> 1); } @@ -1187,7 +1187,7 @@ export function WebGL2CmdFuncResizeTexture (device: WebGL2GFXDevice, gpuTexture: for (let i = 0; i < gpuTexture.mipLevel; ++i) { const imgSize = GFXFormatSize(gpuTexture.format, w, h, 1); const view: Uint8Array = new Uint8Array(imgSize); - gl.compressedTexImage2D(WebGL2RenderingContext.TEXTURE_CUBE_MAP_POSITIVE_X + f, i, gpuTexture.glInternelFmt, w, h, 0, view); + gl.compressedTexImage2D(gl.TEXTURE_CUBE_MAP_POSITIVE_X + f, i, gpuTexture.glInternelFmt, w, h, 0, view); w = Math.max(1, w >> 1); h = Math.max(1, h >> 1); } @@ -1199,7 +1199,7 @@ export function WebGL2CmdFuncResizeTexture (device: WebGL2GFXDevice, gpuTexture: default: { console.error('Unsupported GFXTextureType, create texture failed.'); gpuTexture.viewType = GFXTextureViewType.TV2D; - gpuTexture.glTarget = WebGL2RenderingContext.TEXTURE_2D; + gpuTexture.glTarget = gl.TEXTURE_2D; } } } @@ -1362,12 +1362,12 @@ export function WebGL2CmdFuncCreateShader (device: WebGL2GFXDevice, gpuShader: W switch (gpuStage.type) { case GFXShaderType.VERTEX: { shaderTypeStr = 'VertexShader'; - glShaderType = WebGL2RenderingContext.VERTEX_SHADER; + glShaderType = gl.VERTEX_SHADER; break; } case GFXShaderType.FRAGMENT: { shaderTypeStr = 'FragmentShader'; - glShaderType = WebGL2RenderingContext.FRAGMENT_SHADER; + glShaderType = gl.FRAGMENT_SHADER; break; } default: { @@ -1436,8 +1436,8 @@ export function WebGL2CmdFuncCreateShader (device: WebGL2GFXDevice, gpuShader: W } const glLoc = gl.getAttribLocation(gpuShader.glProgram, varName); - const type = WebGLTypeToGFXType(attribInfo.type); - const stride = WebGLGetTypeSize(attribInfo.type); + const type = WebGLTypeToGFXType(attribInfo.type, gl); + const stride = WebGLGetTypeSize(attribInfo.type, gl); gpuShader.glInputs[i] = { binding: glLoc, @@ -1523,7 +1523,7 @@ export function WebGL2CmdFuncCreateShader (device: WebGL2GFXDevice, gpuShader: W for (let u = 0; u < blockUniformCount; ++u) { glUniformInfo = gl.getActiveUniform(gpuShader.glProgram, uIndices[u]); if (glUniformInfo) { - const stride = WebGLGetTypeSize(glUniformInfo.type); + const stride = WebGLGetTypeSize(glUniformInfo.type, gl); const size = glUniformSizes[u] * stride; const begin = glUniformOffsets[u] / 4; const count = size / 4; @@ -1533,7 +1533,7 @@ export function WebGL2CmdFuncCreateShader (device: WebGL2GFXDevice, gpuShader: W glBlock.glUniforms[u] = { binding: -1, name: glUniformInfo.name, - type: WebGLTypeToGFXType(glUniformInfo.type), + type: WebGLTypeToGFXType(glUniformInfo.type, gl), stride, count: glUniformInfo.size, size, @@ -1561,7 +1561,7 @@ export function WebGL2CmdFuncCreateShader (device: WebGL2GFXDevice, gpuShader: W name: sampler.name, type: sampler.type, units: [], - glType: GFXTypeToWebGLType(sampler.type), + glType: GFXTypeToWebGLType(sampler.type, gl), glLoc: -1, }; } @@ -1586,8 +1586,8 @@ export function WebGL2CmdFuncCreateShader (device: WebGL2GFXDevice, gpuShader: W varName = uniformInfo.name; } - const isSampler = (uniformInfo.type === WebGL2RenderingContext.SAMPLER_2D) || - (uniformInfo.type === WebGL2RenderingContext.SAMPLER_CUBE); + const isSampler = (uniformInfo.type === gl.SAMPLER_2D) || + (uniformInfo.type === gl.SAMPLER_CUBE); if (isSampler) { for (const glSampler of gpuShader.glSamplers) { @@ -1640,6 +1640,8 @@ export function WebGL2CmdFuncDestroyShader (device: WebGL2GFXDevice, gpuShader: export function WebGL2CmdFuncCreateInputAssember (device: WebGL2GFXDevice, gpuInputAssembler: IWebGL2GPUInputAssembler) { + const gl = device.gl; + gpuInputAssembler.glAttribs = new Array(gpuInputAssembler.attributes.length); const offsets = [0, 0, 0, 0, 0, 0, 0, 0]; @@ -1652,7 +1654,7 @@ export function WebGL2CmdFuncCreateInputAssember (device: WebGL2GFXDevice, gpuIn const gpuBuffer = gpuInputAssembler.gpuVertexBuffers[stream]; - const glType = GFXFormatToWebGLType(attrib.format, device); + const glType = GFXFormatToWebGLType(attrib.format, gl); const size = GFXFormatInfos[attrib.format].size; gpuInputAssembler.glAttribs[i] = { @@ -1662,7 +1664,7 @@ export function WebGL2CmdFuncCreateInputAssember (device: WebGL2GFXDevice, gpuIn size, count: GFXFormatInfos[attrib.format].count, stride: gpuBuffer.stride, - componentCount: WebGLGetComponentCount(glType), + componentCount: WebGLGetComponentCount(glType, gl), isNormalized: (attrib.isNormalized !== undefined ? attrib.isNormalized : false), isInstanced: (attrib.isInstanced !== undefined ? attrib.isInstanced : false), offset: offsets[stream], @@ -1689,7 +1691,7 @@ export function WebGL2CmdFuncExecuteCmds (device: WebGL2GFXDevice, cmdPackage: W let gpuPipelineState: WebGL2GPUPipelineState | null = null; let gpuShader: WebGL2GPUShader | null = null; let gpuInputAssembler: IWebGL2GPUInputAssembler | null = null; - let glPrimitive = WebGL2RenderingContext.TRIANGLES; + let glPrimitive = gl.TRIANGLES; for (let i = 0; i < cmdPackage.cmds.length; ++i) { const cmd = cmdPackage.cmds.array[i]; @@ -1703,7 +1705,7 @@ export function WebGL2CmdFuncExecuteCmds (device: WebGL2GFXDevice, cmdPackage: W if (cmd0.gpuFramebuffer) { if (cache.glFramebuffer !== cmd0.gpuFramebuffer.glFramebuffer) { - gl.bindFramebuffer(WebGL2RenderingContext.FRAMEBUFFER, cmd0.gpuFramebuffer.glFramebuffer); + gl.bindFramebuffer(gl.FRAMEBUFFER, cmd0.gpuFramebuffer.glFramebuffer); cache.glFramebuffer = cmd0.gpuFramebuffer.glFramebuffer; } @@ -1751,7 +1753,7 @@ export function WebGL2CmdFuncExecuteCmds (device: WebGL2GFXDevice, cmdPackage: W if (!cmd0.gpuFramebuffer.isOffscreen) { const clearColor = cmd0.clearColors[0]; gl.clearColor(clearColor.r, clearColor.g, clearColor.b, clearColor.a); - clears |= WebGL2RenderingContext.COLOR_BUFFER_BIT; + clears |= gl.COLOR_BUFFER_BIT; } else { _f32v4[0] = cmd0.clearColors[j].r; _f32v4[1] = cmd0.clearColors[j].g; @@ -1764,7 +1766,7 @@ export function WebGL2CmdFuncExecuteCmds (device: WebGL2GFXDevice, cmdPackage: W } case GFXLoadOp.DISCARD: { // invalidate the framebuffer - invalidateAttachments.push(WebGL2RenderingContext.COLOR_ATTACHMENT0 + j); + invalidateAttachments.push(gl.COLOR_ATTACHMENT0 + j); break; } default: @@ -1785,13 +1787,13 @@ export function WebGL2CmdFuncExecuteCmds (device: WebGL2GFXDevice, cmdPackage: W gl.clearDepth(cmd0.clearDepth); - clears |= WebGL2RenderingContext.DEPTH_BUFFER_BIT; + clears |= gl.DEPTH_BUFFER_BIT; } break; } case GFXLoadOp.DISCARD: { // invalidate the framebuffer - invalidateAttachments.push(WebGL2RenderingContext.DEPTH_ATTACHMENT); + invalidateAttachments.push(gl.DEPTH_ATTACHMENT); break; } default: @@ -1803,21 +1805,21 @@ export function WebGL2CmdFuncExecuteCmds (device: WebGL2GFXDevice, cmdPackage: W case GFXLoadOp.CLEAR: { if (cmd0.clearFlag & GFXClearFlag.STENCIL) { if (!cache.dss.stencilWriteMaskFront) { - gl.stencilMaskSeparate(WebGL2RenderingContext.FRONT, 0xFFFFFFFF); + gl.stencilMaskSeparate(gl.FRONT, 0xFFFFFFFF); } if (!cache.dss.stencilWriteMaskBack) { - gl.stencilMaskSeparate(WebGL2RenderingContext.BACK, 0xFFFFFFFF); + gl.stencilMaskSeparate(gl.BACK, 0xFFFFFFFF); } gl.clearStencil(cmd0.clearStencil); - clears |= WebGL2RenderingContext.STENCIL_BUFFER_BIT; + clears |= gl.STENCIL_BUFFER_BIT; } break; } case GFXLoadOp.DISCARD: { // invalidate the framebuffer - invalidateAttachments.push(WebGL2RenderingContext.STENCIL_ATTACHMENT); + invalidateAttachments.push(gl.STENCIL_ATTACHMENT); break; } default: @@ -1827,7 +1829,7 @@ export function WebGL2CmdFuncExecuteCmds (device: WebGL2GFXDevice, cmdPackage: W } // if (curGPURenderPass.depthStencilAttachment) if (invalidateAttachments.length) { - gl.invalidateFramebuffer(WebGL2RenderingContext.FRAMEBUFFER, invalidateAttachments); + gl.invalidateFramebuffer(gl.FRAMEBUFFER, invalidateAttachments); } if (clears) { @@ -1835,7 +1837,7 @@ export function WebGL2CmdFuncExecuteCmds (device: WebGL2GFXDevice, cmdPackage: W } // restore states - if (clears & WebGL2RenderingContext.COLOR_BUFFER_BIT) { + if (clears & gl.COLOR_BUFFER_BIT) { const colorMask = cache.bs.targets[0].blendColorMask; if (colorMask !== GFXColorMask.ALL) { @@ -1847,18 +1849,18 @@ export function WebGL2CmdFuncExecuteCmds (device: WebGL2GFXDevice, cmdPackage: W } } - if ((clears & WebGL2RenderingContext.DEPTH_BUFFER_BIT) && + if ((clears & gl.DEPTH_BUFFER_BIT) && !cache.dss.depthWrite) { gl.depthMask(false); } - if (clears & WebGL2RenderingContext.STENCIL_BUFFER_BIT) { + if (clears & gl.STENCIL_BUFFER_BIT) { if (!cache.dss.stencilWriteMaskFront) { - gl.stencilMaskSeparate(WebGL2RenderingContext.FRONT, 0); + gl.stencilMaskSeparate(gl.FRONT, 0); } if (!cache.dss.stencilWriteMaskBack) { - gl.stencilMaskSeparate(WebGL2RenderingContext.BACK, 0); + gl.stencilMaskSeparate(gl.BACK, 0); } } } // if (curGPURenderPass) @@ -1895,17 +1897,17 @@ export function WebGL2CmdFuncExecuteCmds (device: WebGL2GFXDevice, cmdPackage: W if (cache.rs.cullMode !== rs.cullMode) { switch (rs.cullMode) { case GFXCullMode.NONE: { - gl.disable(WebGL2RenderingContext.CULL_FACE); + gl.disable(gl.CULL_FACE); break; } case GFXCullMode.FRONT: { - gl.enable(WebGL2RenderingContext.CULL_FACE); - gl.cullFace(WebGL2RenderingContext.FRONT); + gl.enable(gl.CULL_FACE); + gl.cullFace(gl.FRONT); break; } case GFXCullMode.BACK: { - gl.enable(WebGL2RenderingContext.CULL_FACE); - gl.cullFace(WebGL2RenderingContext.BACK); + gl.enable(gl.CULL_FACE); + gl.cullFace(gl.BACK); break; } default: @@ -1915,7 +1917,7 @@ export function WebGL2CmdFuncExecuteCmds (device: WebGL2GFXDevice, cmdPackage: W } if (device.stateCache.rs.isFrontFaceCCW !== rs.isFrontFaceCCW) { - gl.frontFace(rs.isFrontFaceCCW ? WebGL2RenderingContext.CCW : WebGL2RenderingContext.CW); + gl.frontFace(rs.isFrontFaceCCW ? gl.CCW : gl.CW); device.stateCache.rs.isFrontFaceCCW = rs.isFrontFaceCCW; } @@ -1939,9 +1941,9 @@ export function WebGL2CmdFuncExecuteCmds (device: WebGL2GFXDevice, cmdPackage: W if (cache.dss.depthTest !== dss.depthTest) { if (dss.depthTest) { - gl.enable(WebGL2RenderingContext.DEPTH_TEST); + gl.enable(gl.DEPTH_TEST); } else { - gl.disable(WebGL2RenderingContext.DEPTH_TEST); + gl.disable(gl.DEPTH_TEST); } cache.dss.depthTest = dss.depthTest; } @@ -1960,9 +1962,9 @@ export function WebGL2CmdFuncExecuteCmds (device: WebGL2GFXDevice, cmdPackage: W if ((cache.dss.stencilTestFront !== dss.stencilTestFront) || (cache.dss.stencilTestBack !== dss.stencilTestBack)) { if (dss.stencilTestFront || dss.stencilTestBack) { - gl.enable(WebGL2RenderingContext.STENCIL_TEST); + gl.enable(gl.STENCIL_TEST); } else { - gl.disable(WebGL2RenderingContext.STENCIL_TEST); + gl.disable(gl.STENCIL_TEST); } cache.dss.stencilTestFront = dss.stencilTestFront; cache.dss.stencilTestBack = dss.stencilTestBack; @@ -1973,7 +1975,7 @@ export function WebGL2CmdFuncExecuteCmds (device: WebGL2GFXDevice, cmdPackage: W (cache.dss.stencilReadMaskFront !== dss.stencilReadMaskFront)) { gl.stencilFuncSeparate( - WebGL2RenderingContext.FRONT, + gl.FRONT, WebGLCmpFuncs[dss.stencilFuncFront], dss.stencilRefFront, dss.stencilReadMaskFront); @@ -1988,7 +1990,7 @@ export function WebGL2CmdFuncExecuteCmds (device: WebGL2GFXDevice, cmdPackage: W (cache.dss.stencilPassOpFront !== dss.stencilPassOpFront)) { gl.stencilOpSeparate( - WebGL2RenderingContext.FRONT, + gl.FRONT, WebGLStencilOps[dss.stencilFailOpFront], WebGLStencilOps[dss.stencilZFailOpFront], WebGLStencilOps[dss.stencilPassOpFront]); @@ -1999,7 +2001,7 @@ export function WebGL2CmdFuncExecuteCmds (device: WebGL2GFXDevice, cmdPackage: W } if (cache.dss.stencilWriteMaskFront !== dss.stencilWriteMaskFront) { - gl.stencilMaskSeparate(WebGL2RenderingContext.FRONT, dss.stencilWriteMaskFront); + gl.stencilMaskSeparate(gl.FRONT, dss.stencilWriteMaskFront); cache.dss.stencilWriteMaskFront = dss.stencilWriteMaskFront; } @@ -2009,7 +2011,7 @@ export function WebGL2CmdFuncExecuteCmds (device: WebGL2GFXDevice, cmdPackage: W (cache.dss.stencilReadMaskBack !== dss.stencilReadMaskBack)) { gl.stencilFuncSeparate( - WebGL2RenderingContext.BACK, + gl.BACK, WebGLCmpFuncs[dss.stencilFuncBack], dss.stencilRefBack, dss.stencilReadMaskBack); @@ -2024,7 +2026,7 @@ export function WebGL2CmdFuncExecuteCmds (device: WebGL2GFXDevice, cmdPackage: W (cache.dss.stencilPassOpBack !== dss.stencilPassOpBack)) { gl.stencilOpSeparate( - WebGL2RenderingContext.BACK, + gl.BACK, WebGLStencilOps[dss.stencilFailOpBack], WebGLStencilOps[dss.stencilZFailOpBack], WebGLStencilOps[dss.stencilPassOpBack]); @@ -2035,7 +2037,7 @@ export function WebGL2CmdFuncExecuteCmds (device: WebGL2GFXDevice, cmdPackage: W } if (cache.dss.stencilWriteMaskBack !== dss.stencilWriteMaskBack) { - gl.stencilMaskSeparate(WebGL2RenderingContext.BACK, dss.stencilWriteMaskBack); + gl.stencilMaskSeparate(gl.BACK, dss.stencilWriteMaskBack); cache.dss.stencilWriteMaskBack = dss.stencilWriteMaskBack; } } // depth-stencil state @@ -2046,9 +2048,9 @@ export function WebGL2CmdFuncExecuteCmds (device: WebGL2GFXDevice, cmdPackage: W if (cache.bs.isA2C !== bs.isA2C) { if (bs.isA2C) { - gl.enable(WebGL2RenderingContext.SAMPLE_ALPHA_TO_COVERAGE); + gl.enable(gl.SAMPLE_ALPHA_TO_COVERAGE); } else { - gl.disable(WebGL2RenderingContext.SAMPLE_ALPHA_TO_COVERAGE); + gl.disable(gl.SAMPLE_ALPHA_TO_COVERAGE); } cache.bs.isA2C = bs.isA2C; } @@ -2071,9 +2073,9 @@ export function WebGL2CmdFuncExecuteCmds (device: WebGL2GFXDevice, cmdPackage: W if (target0Cache.blend !== target0.blend) { if (target0.blend) { - gl.enable(WebGL2RenderingContext.BLEND); + gl.enable(gl.BLEND); } else { - gl.disable(WebGL2RenderingContext.BLEND); + gl.disable(gl.BLEND); } target0Cache.blend = target0.blend; } @@ -2128,7 +2130,7 @@ export function WebGL2CmdFuncExecuteCmds (device: WebGL2GFXDevice, cmdPackage: W if (glBlock.binding === gpuBinding.binding) { if (cache.glBindUBOs[glBlock.binding] !== gpuBinding.gpuBuffer.glBuffer) { gl.bindBufferBase(gl.UNIFORM_BUFFER, glBlock.binding, gpuBinding.gpuBuffer.glBuffer); - // gl.bindBufferRange(WebGL2RenderingContext.UNIFORM_BUFFER, glBlock.binding, gpuBinding.gpuBuffer.glBuffer, 0, gpuBinding.gpuBuffer.size); + // gl.bindBufferRange(gl.UNIFORM_BUFFER, glBlock.binding, gpuBinding.gpuBuffer.glBuffer, 0, gpuBinding.gpuBuffer.size); cache.glBindUBOs[glBlock.binding] = gpuBinding.gpuBuffer.glBuffer; cache.glUniformBuffer = gpuBinding.gpuBuffer.glBuffer; } @@ -2356,14 +2358,14 @@ export function WebGL2CmdFuncExecuteCmds (device: WebGL2GFXDevice, cmdPackage: W switch (cmd2.stencilWriteMask.face) { case GFXStencilFace.FRONT: { if (cache.dss.stencilWriteMaskFront !== cmd2.stencilWriteMask.writeMask) { - gl.stencilMaskSeparate(WebGL2RenderingContext.FRONT, cmd2.stencilWriteMask.writeMask); + gl.stencilMaskSeparate(gl.FRONT, cmd2.stencilWriteMask.writeMask); cache.dss.stencilWriteMaskFront = cmd2.stencilWriteMask.writeMask; } break; } case GFXStencilFace.BACK: { if (cache.dss.stencilWriteMaskBack !== cmd2.stencilWriteMask.writeMask) { - gl.stencilMaskSeparate(WebGL2RenderingContext.BACK, cmd2.stencilWriteMask.writeMask); + gl.stencilMaskSeparate(gl.BACK, cmd2.stencilWriteMask.writeMask); cache.dss.stencilWriteMaskBack = cmd2.stencilWriteMask.writeMask; } break; @@ -2388,7 +2390,7 @@ export function WebGL2CmdFuncExecuteCmds (device: WebGL2GFXDevice, cmdPackage: W if (cache.dss.stencilRefFront !== cmd2.stencilCompareMask.reference || cache.dss.stencilReadMaskFront !== cmd2.stencilCompareMask.compareMask) { gl.stencilFuncSeparate( - WebGL2RenderingContext.FRONT, + gl.FRONT, WebGLCmpFuncs[cache.dss.stencilFuncFront], cmd2.stencilCompareMask.reference, cmd2.stencilCompareMask.compareMask); @@ -2401,7 +2403,7 @@ export function WebGL2CmdFuncExecuteCmds (device: WebGL2GFXDevice, cmdPackage: W if (cache.dss.stencilRefBack !== cmd2.stencilCompareMask.reference || cache.dss.stencilReadMaskBack !== cmd2.stencilCompareMask.compareMask) { gl.stencilFuncSeparate( - WebGL2RenderingContext.BACK, + gl.BACK, WebGLCmpFuncs[cache.dss.stencilFuncBack], cmd2.stencilCompareMask.reference, cmd2.stencilCompareMask.compareMask); @@ -2499,26 +2501,26 @@ export function WebGL2CmdFuncCopyTexImagesToTexture ( let n = 0; let f = 0; switch (gpuTexture.glTarget) { - case WebGL2RenderingContext.TEXTURE_2D: { + case gl.TEXTURE_2D: { const glTexUnit = device.stateCache.glTex2DUnits[device.stateCache.texUnit]; if (glTexUnit.glTexture !== gpuTexture.glTexture) { - gl.bindTexture(WebGL2RenderingContext.TEXTURE_2D, gpuTexture.glTexture); + gl.bindTexture(gl.TEXTURE_2D, gpuTexture.glTexture); glTexUnit.glTexture = gpuTexture.glTexture; } for (const region of regions) { for (m = region.texSubres.baseMipLevel; m < region.texSubres.levelCount; ++m) { - gl.texSubImage2D(WebGL2RenderingContext.TEXTURE_2D, m, + gl.texSubImage2D(gl.TEXTURE_2D, m, region.texOffset.x, region.texOffset.y, gpuTexture.glFormat, gpuTexture.glType, texImages[n++]); } } break; } - case WebGL2RenderingContext.TEXTURE_CUBE_MAP: { + case gl.TEXTURE_CUBE_MAP: { const glTexUnit = device.stateCache.glTexCubeUnits[device.stateCache.texUnit]; if (glTexUnit.glTexture !== gpuTexture.glTexture) { - gl.bindTexture(WebGL2RenderingContext.TEXTURE_CUBE_MAP, gpuTexture.glTexture); + gl.bindTexture(gl.TEXTURE_CUBE_MAP, gpuTexture.glTexture); glTexUnit.glTexture = gpuTexture.glTexture; } @@ -2527,7 +2529,7 @@ export function WebGL2CmdFuncCopyTexImagesToTexture ( for (f = region.texSubres.baseArrayLayer; f < fcount; ++f) { const mcount = region.texSubres.baseMipLevel + region.texSubres.levelCount; for (m = region.texSubres.baseMipLevel; m < mcount; ++m) { - gl.texSubImage2D(WebGL2RenderingContext.TEXTURE_CUBE_MAP_POSITIVE_X + f, m, + gl.texSubImage2D(gl.TEXTURE_CUBE_MAP_POSITIVE_X + f, m, region.texOffset.x, region.texOffset.y, gpuTexture.glFormat, gpuTexture.glType, texImages[n++]); } diff --git a/cocos/gfx/webgl2/webgl2-device.ts b/cocos/gfx/webgl2/webgl2-device.ts index 3669bd2046..2b24566798 100644 --- a/cocos/gfx/webgl2/webgl2-device.ts +++ b/cocos/gfx/webgl2/webgl2-device.ts @@ -150,8 +150,6 @@ export class WebGL2GFXDevice extends GFXDevice { return false; } - // No errors are thrown using try catch - // Tested through ios baidu browser 4.14.1 if (!this._webGL2RC) { console.error('This device does not support WebGL2.'); return false; @@ -170,23 +168,23 @@ export class WebGL2GFXDevice extends GFXDevice { this._renderer = gl.getParameter(this._WEBGL_debug_renderer_info.UNMASKED_RENDERER_WEBGL); this._vendor = gl.getParameter(this._WEBGL_debug_renderer_info.UNMASKED_VENDOR_WEBGL); } else { - this._renderer = gl.getParameter(WebGL2RenderingContext.RENDERER); - this._vendor = gl.getParameter(WebGL2RenderingContext.VENDOR); + this._renderer = gl.getParameter(gl.RENDERER); + this._vendor = gl.getParameter(gl.VENDOR); } - this._version = gl.getParameter(WebGL2RenderingContext.VERSION); - this._maxVertexAttributes = gl.getParameter(WebGL2RenderingContext.MAX_VERTEX_ATTRIBS); - this._maxVertexUniformVectors = gl.getParameter(WebGL2RenderingContext.MAX_VERTEX_UNIFORM_VECTORS); - this._maxFragmentUniformVectors = gl.getParameter(WebGL2RenderingContext.MAX_FRAGMENT_UNIFORM_VECTORS); - this._maxTextureUnits = gl.getParameter(WebGL2RenderingContext.MAX_TEXTURE_IMAGE_UNITS); - this._maxVertexTextureUnits = gl.getParameter(WebGL2RenderingContext.MAX_VERTEX_TEXTURE_IMAGE_UNITS); - this._maxUniformBufferBindings = gl.getParameter(WebGL2RenderingContext.MAX_UNIFORM_BUFFER_BINDINGS); - this._maxUniformBlockSize = gl.getParameter(WebGL2RenderingContext.MAX_UNIFORM_BLOCK_SIZE); - this._depthBits = gl.getParameter(WebGL2RenderingContext.DEPTH_BITS); - this._stencilBits = gl.getParameter(WebGL2RenderingContext.STENCIL_BITS); - // let maxVertexUniformBlocks = gl.getParameter(WebGL2RenderingContext.MAX_VERTEX_UNIFORM_BLOCKS); - // let maxFragmentUniformBlocks = gl.getParameter(WebGL2RenderingContext.MAX_FRAGMENT_UNIFORM_BLOCKS); - // let uboOffsetAlignment = gl.getParameter(WebGL2RenderingContext.UNIFORM_BUFFER_OFFSET_ALIGNMENT); + this._version = gl.getParameter(gl.VERSION); + this._maxVertexAttributes = gl.getParameter(gl.MAX_VERTEX_ATTRIBS); + this._maxVertexUniformVectors = gl.getParameter(gl.MAX_VERTEX_UNIFORM_VECTORS); + this._maxFragmentUniformVectors = gl.getParameter(gl.MAX_FRAGMENT_UNIFORM_VECTORS); + this._maxTextureUnits = gl.getParameter(gl.MAX_TEXTURE_IMAGE_UNITS); + this._maxVertexTextureUnits = gl.getParameter(gl.MAX_VERTEX_TEXTURE_IMAGE_UNITS); + this._maxUniformBufferBindings = gl.getParameter(gl.MAX_UNIFORM_BUFFER_BINDINGS); + this._maxUniformBlockSize = gl.getParameter(gl.MAX_UNIFORM_BLOCK_SIZE); + this._depthBits = gl.getParameter(gl.DEPTH_BITS); + this._stencilBits = gl.getParameter(gl.STENCIL_BITS); + // let maxVertexUniformBlocks = gl.getParameter(gl.MAX_VERTEX_UNIFORM_BLOCKS); + // let maxFragmentUniformBlocks = gl.getParameter(gl.MAX_FRAGMENT_UNIFORM_BLOCKS); + // let uboOffsetAlignment = gl.getParameter(gl.UNIFORM_BUFFER_OFFSET_ALIGNMENT); this._devicePixelRatio = info.devicePixelRatio || 1.0; this._width = this._canvas.width; @@ -551,7 +549,7 @@ export class WebGL2GFXDevice extends GFXDevice { const curFBO = this.stateCache.glFramebuffer; if (this.stateCache.glFramebuffer !== gpuFramebuffer.glFramebuffer) { - gl.bindFramebuffer(WebGL2RenderingContext.FRAMEBUFFER, gpuFramebuffer.glFramebuffer); + gl.bindFramebuffer(gl.FRAMEBUFFER, gpuFramebuffer.glFramebuffer); this.stateCache.glFramebuffer = gpuFramebuffer.glFramebuffer; } @@ -567,11 +565,11 @@ export class WebGL2GFXDevice extends GFXDevice { const data = view.subarray(buffOffset, buffOffset + memSize); gl.readPixels(region.texOffset.x, region.texOffset.y, w, h, - WebGL2RenderingContext.RGBA, WebGL2RenderingContext.UNSIGNED_BYTE, data); + gl.RGBA, gl.UNSIGNED_BYTE, data); } if (this.stateCache.glFramebuffer !== curFBO) { - gl.bindFramebuffer(WebGL2RenderingContext.FRAMEBUFFER, curFBO); + gl.bindFramebuffer(gl.FRAMEBUFFER, curFBO); this.stateCache.glFramebuffer = curFBO; } } diff --git a/cocos/gfx/webgl2/webgl2-input-assembler.ts b/cocos/gfx/webgl2/webgl2-input-assembler.ts index 6defafbb03..76ae6d4cf1 100644 --- a/cocos/gfx/webgl2/webgl2-input-assembler.ts +++ b/cocos/gfx/webgl2/webgl2-input-assembler.ts @@ -52,9 +52,9 @@ export class WebGL2GFXInputAssembler extends GFXInputAssembler { gpuIndexBuffer = (info.indexBuffer as WebGL2GFXBuffer).gpuBuffer; if (gpuIndexBuffer) { switch (gpuIndexBuffer.stride) { - case 1: glIndexType = WebGLRenderingContext.UNSIGNED_BYTE; break; - case 2: glIndexType = WebGLRenderingContext.UNSIGNED_SHORT; break; - case 4: glIndexType = WebGLRenderingContext.UNSIGNED_INT; break; + case 1: glIndexType = 0x1401; break; // WebGLRenderingContext.UNSIGNED_BYTE + case 2: glIndexType = 0x1403; break; // WebGLRenderingContext.UNSIGNED_SHORT + case 4: glIndexType = 0x1405; break; // WebGLRenderingContext.UNSIGNED_INT default: { console.error('Illegal index buffer stride.'); } diff --git a/cocos/gfx/webgl2/webgl2-pipeline-state.ts b/cocos/gfx/webgl2/webgl2-pipeline-state.ts index 4d45cbd523..0bedf804b4 100644 --- a/cocos/gfx/webgl2/webgl2-pipeline-state.ts +++ b/cocos/gfx/webgl2/webgl2-pipeline-state.ts @@ -7,20 +7,20 @@ import { WebGL2GFXRenderPass } from './webgl2-render-pass'; import { WebGL2GFXShader } from './webgl2-shader'; const WebGLPrimitives: GLenum[] = [ - WebGLRenderingContext.POINTS, - WebGLRenderingContext.LINES, - WebGLRenderingContext.LINE_STRIP, - WebGLRenderingContext.LINE_LOOP, - WebGLRenderingContext.NONE, - WebGLRenderingContext.NONE, - WebGLRenderingContext.NONE, - WebGLRenderingContext.TRIANGLES, - WebGLRenderingContext.TRIANGLE_STRIP, - WebGLRenderingContext.TRIANGLE_FAN, - WebGLRenderingContext.NONE, - WebGLRenderingContext.NONE, - WebGLRenderingContext.NONE, - WebGLRenderingContext.NONE, + 0x0000, // WebGLRenderingContext.POINTS, + 0x0001, // WebGLRenderingContext.LINES, + 0x0003, // WebGLRenderingContext.LINE_STRIP, + 0x0002, // WebGLRenderingContext.LINE_LOOP, + 0x0000, // WebGLRenderingContext.NONE, + 0x0000, // WebGLRenderingContext.NONE, + 0x0000, // WebGLRenderingContext.NONE, + 0x0004, // WebGLRenderingContext.TRIANGLES, + 0x0005, // WebGLRenderingContext.TRIANGLE_STRIP, + 0x0006, // WebGLRenderingContext.TRIANGLE_FAN, + 0x0000, // WebGLRenderingContext.NONE, + 0x0000, // WebGLRenderingContext.NONE, + 0x0000, // WebGLRenderingContext.NONE, + 0x0000, // WebGLRenderingContext.NONE, ]; export class WebGL2GFXPipelineState extends GFXPipelineState { diff --git a/cocos/renderer/models/skinning-model.ts b/cocos/renderer/models/skinning-model.ts index 15924c2db9..a527240c44 100644 --- a/cocos/renderer/models/skinning-model.ts +++ b/cocos/renderer/models/skinning-model.ts @@ -160,7 +160,7 @@ export class SkinningModel extends Model { if (!super.updateUBOs() || !this._skeleton) { return false; } const len = this._joints.length; - if (this._skeleton.bindTRS) { // TODO: pre-apply this into animation clip + if (this._skeleton.bindTRS.length) { // TODO: pre-apply this into animation clip for (let i = 0; i < len; ++i) { const cur = this._joints[i]; cur.update(); const bindpose = this._skeleton.bindTRS[i];