diff --git a/native/cocos/base/CCGLUtils.cpp b/native/cocos/base/CCGLUtils.cpp index d0816789ed..991b624620 100644 --- a/native/cocos/base/CCGLUtils.cpp +++ b/native/cocos/base/CCGLUtils.cpp @@ -34,8 +34,9 @@ NS_CC_BEGIN #define MAX_ATTRIBUTE_UNIT 16 //FIXME: Consider to use variable to enable/disable cache state since using macro will not be able to close it if there're serious bugs. -// #undef CC_ENABLE_GL_STATE_CACHE -// #define CC_ENABLE_GL_STATE_CACHE 0 +//#undef CC_ENABLE_GL_STATE_CACHE +//#define CC_ENABLE_GL_STATE_CACHE 0 + namespace { @@ -45,8 +46,14 @@ namespace uint32_t __enabledVertexAttribArrayFlag = 0; VertexAttributePointerInfo __enabledVertexAttribArrayInfo[MAX_ATTRIBUTE_UNIT]; + + GLint _currentUnpackAlignment = -1; + + bool __unpackFlipY = false; + bool __premultiplyAlpha = false; } + //FIXME: need to consider invoking this after restarting game. void ccInvalidateStateCache() { @@ -57,6 +64,10 @@ void ccInvalidateStateCache() __enabledVertexAttribArrayFlag = 0; for (int i = 0; i < MAX_ATTRIBUTE_UNIT; ++i) __enabledVertexAttribArrayInfo[i] = VertexAttributePointerInfo(); + + _currentUnpackAlignment = -1; + __unpackFlipY = false; + __premultiplyAlpha = false; } /**************************************************************************************** @@ -246,4 +257,187 @@ void ccScissor(GLint x, GLint y, GLsizei width, GLsizei height) glScissor(x, y, width, height); } +//FIXME:cjh: ONLY SUPPORT RGBA format now. +static void flipPixelsY(GLubyte *pixels, int bytesPerRow, int rows) +{ + if( !pixels ) { return; } + + GLuint middle = rows/2; + GLuint intsPerRow = bytesPerRow / sizeof(GLuint); + GLuint remainingBytes = bytesPerRow - intsPerRow * sizeof(GLuint); + + for( GLuint rowTop = 0, rowBottom = rows-1; rowTop < middle; rowTop++, rowBottom-- ) { + + // Swap bytes in packs of sizeof(GLuint) bytes + GLuint *iTop = (GLuint *)(pixels + rowTop * bytesPerRow); + GLuint *iBottom = (GLuint *)(pixels + rowBottom * bytesPerRow); + + GLuint itmp; + GLint n = intsPerRow; + do { + itmp = *iTop; + *iTop++ = *iBottom; + *iBottom++ = itmp; + } while(--n > 0); + + // Swap the remaining bytes + GLubyte *bTop = (GLubyte *)iTop; + GLubyte *bBottom = (GLubyte *)iBottom; + + GLubyte btmp; + switch( remainingBytes ) { + case 3: btmp = *bTop; *bTop++ = *bBottom; *bBottom++ = btmp; + case 2: btmp = *bTop; *bTop++ = *bBottom; *bBottom++ = btmp; + case 1: btmp = *bTop; *bTop = *bBottom; *bBottom = btmp; + } + } +} + +static void flipPixelsYByFormat(GLubyte *pixels, GLenum format, uint32_t width, uint32_t height, uint32_t expectedTotalBytes) +{ + bool isSupportFlipY = true; + GLsizei bytesPerRow = 0; + switch (format) { + case GL_RGBA: + bytesPerRow = width * 4; + break; + case GL_RGB: + bytesPerRow = width * 3; + break; + case GL_LUMINANCE_ALPHA: + bytesPerRow = width * 2; + break; + case GL_LUMINANCE: + bytesPerRow = width; + break; + default: + isSupportFlipY = false; + break; + } + + if (isSupportFlipY) + { + assert(expectedTotalBytes == bytesPerRow * height); + flipPixelsY((GLubyte*)pixels, bytesPerRow, height); + } + else + { + CCLOGERROR("flipPixelsYByFormat: format: 0x%X doesn't support upackFlipY!\n", format); + } +} + +// Lookup tables for fast [un]premultiplied alpha color values +// From https://bugzilla.mozilla.org/show_bug.cgi?id=662130 +static GLubyte* __premultiplyTable = nullptr; + +static const GLubyte* premultiplyTable() +{ + if( !__premultiplyTable ) { + __premultiplyTable = (GLubyte*)malloc(256*256); + + unsigned char *data = __premultiplyTable; + for( int a = 0; a <= 255; a++ ) { + for( int c = 0; c <= 255; c++ ) { + data[a*256+c] = (a * c + 254) / 255; + } + } + } + + return __premultiplyTable; +} + +void premultiplyPixels(const GLubyte *inPixels, GLubyte *outPixels, GLenum format, uint32_t width, uint32_t height, uint32_t expectedTotalBytes) +{ + const GLubyte *table = premultiplyTable(); + int byteLength = 0; + if( format == GL_RGBA ) + { + byteLength = width * height * 4; + assert(byteLength == expectedTotalBytes); + for( int i = 0; i < byteLength; i += 4 ) { + unsigned short a = inPixels[i+3] * 256; + outPixels[i+0] = table[ a + inPixels[i+0] ]; + outPixels[i+1] = table[ a + inPixels[i+1] ]; + outPixels[i+2] = table[ a + inPixels[i+2] ]; + outPixels[i+3] = inPixels[i+3]; + } + } + else if ( format == GL_LUMINANCE_ALPHA ) + { + byteLength = width * height * 2; + assert(byteLength == expectedTotalBytes); + for( int i = 0; i < byteLength; i += 2 ) { + unsigned short a = inPixels[i+1] * 256; + outPixels[i+0] = table[ a + inPixels[i+0] ]; + outPixels[i+1] = inPixels[i+1]; + } + } + else + { + CCLOGERROR("premultiplyPixels: format: 0x%X doesn't support upackFlipY!\n", format); + } +} + +bool ccIsUnpackFlipY() +{ + return __unpackFlipY; +} + +bool ccIsPremultiplyAlpha() +{ + return __premultiplyAlpha; +} + +void ccPixelStorei(GLenum pname, GLint param) +{ + if (pname == GL_UNPACK_FLIP_Y_WEBGL) + { + __unpackFlipY = param == 0 ? false : true; + return; + } + else if (pname == GL_UNPACK_PREMULTIPLY_ALPHA_WEBGL) + { + __premultiplyAlpha = param == 0 ? false : true; + return; + } + else if (pname == GL_UNPACK_COLORSPACE_CONVERSION_WEBGL) + { + CCLOGERROR("Warning: UNPACK_COLORSPACE_CONVERSION_WEBGL is unsupported\n"); + return; + } + else if (pname == GL_UNPACK_ALIGNMENT) + { +#if CC_ENABLE_GL_STATE_CACHE + if (_currentUnpackAlignment != param) + { + glPixelStorei(pname, param); + _currentUnpackAlignment = param; + CCLOG("pixel store changed: %d", param); + } +#else + glPixelStorei(pname, param); +#endif + } + else + { + glPixelStorei(pname, param); + } +} + +void ccFlipYOrPremultiptyAlphaIfNeeded(GLenum format, GLsizei width, GLsizei height, uint32_t pixelBytes, GLvoid* pixels) +{ + if (pixels != nullptr) + { + if (__unpackFlipY) + { + flipPixelsYByFormat((GLubyte*)pixels, format, width, height, pixelBytes); + } + + if (__premultiplyAlpha) + { + premultiplyPixels((GLubyte*)pixels, (GLubyte*)pixels, format, width, height, pixelBytes); + } + } +} + NS_CC_END diff --git a/native/cocos/base/CCGLUtils.h b/native/cocos/base/CCGLUtils.h index 8ee04d2fc6..e8e9efcfc1 100644 --- a/native/cocos/base/CCGLUtils.h +++ b/native/cocos/base/CCGLUtils.h @@ -69,4 +69,11 @@ void ccDisableVertexAttribArray(GLuint index); void ccVertexAttribPointer(GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid*); const VertexAttributePointerInfo* getVertexAttribPointerInfo(GLuint index); +// Converts pixel if unpackFlipY or premultiplyAlpha is true. +void ccFlipYOrPremultiptyAlphaIfNeeded(GLenum format, GLsizei width, GLsizei height, uint32_t pixelBytes, GLvoid* pixels); + +bool ccIsUnpackFlipY(); +bool ccIsPremultiplyAlpha(); +void ccPixelStorei(GLenum pname, GLint param); + NS_CC_END diff --git a/native/cocos/base/CCRenderTexture.cpp b/native/cocos/base/CCRenderTexture.cpp index 26575b8a66..158dbb2d3d 100644 --- a/native/cocos/base/CCRenderTexture.cpp +++ b/native/cocos/base/CCRenderTexture.cpp @@ -340,6 +340,17 @@ void RenderTexture::initTexture() glBindTexture(GL_TEXTURE_2D, _texture); unsigned char* texData = (unsigned char*)malloc(_width * _height * 3); memset(texData, 0, _width * _height * 3); + + GLint alignment = 1; + int bytesPerRow = _width * 3; + if (bytesPerRow % 8 == 0) + alignment = 8; + else if (bytesPerRow % 4 == 0) + alignment = 4; + else if (bytesPerRow % 2 == 0) + alignment = 2; + + glPixelStorei(GL_UNPACK_ALIGNMENT, alignment); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, diff --git a/native/cocos/renderer/gfx/Texture.h b/native/cocos/renderer/gfx/Texture.h index 873ae3fe55..f43ac400d6 100644 --- a/native/cocos/renderer/gfx/Texture.h +++ b/native/cocos/renderer/gfx/Texture.h @@ -148,12 +148,12 @@ public: {} SubImageOption() {} - + + uint32_t imageDataLength = 0; uint16_t x = 0; uint16_t y = 0; uint16_t width = 0; uint16_t height = 0; - uint16_t imageDataLength = 0; uint8_t* imageData = nullptr; uint8_t level = 0; bool flipY = false; diff --git a/native/cocos/renderer/gfx/Texture2D.cpp b/native/cocos/renderer/gfx/Texture2D.cpp index ecd6ceec9b..cac8409800 100644 --- a/native/cocos/renderer/gfx/Texture2D.cpp +++ b/native/cocos/renderer/gfx/Texture2D.cpp @@ -126,6 +126,9 @@ void Texture2D::updateImage(const ImageOption& option) void Texture2D::setSubImage(const SubImageOption& option) { + bool flipY = option.flipY; + bool premultiplyAlpha = option.premultiplyAlpha; + //Set the row align only when mipmapsNum == 1 and the data is uncompressed GLint aligment = 1; if (!_hasMipmap && !_compressed && _bpp > 0) @@ -142,7 +145,13 @@ void Texture2D::setSubImage(const SubImageOption& option) aligment = 1; } - GL_CHECK(glPixelStorei(GL_UNPACK_ALIGNMENT, aligment)); + GL_CHECK(ccPixelStorei(GL_UNPACK_ALIGNMENT, aligment)); + + GL_CHECK(ccPixelStorei(GL_UNPACK_FLIP_Y_WEBGL, flipY)); + GL_CHECK(ccPixelStorei(GL_UNPACK_PREMULTIPLY_ALPHA_WEBGL, premultiplyAlpha)); + + ccFlipYOrPremultiptyAlphaIfNeeded(_glFormat, option.width, option.height, (uint32_t)option.imageDataLength, option.imageData); + if (_compressed) { glCompressedTexSubImage2D(GL_TEXTURE_2D, @@ -172,12 +181,14 @@ void Texture2D::setImage(const ImageOption& option) { const auto& img = option.image; + bool flipY = option.flipY; + bool premultiplyAlpha = option.premultiplyAlpha; + //Set the row align only when mipmapsNum == 1 and the data is uncompressed GLint aligment = 1; + unsigned int bytesPerRow = option.width * _bpp / 8; if (_hasMipmap && !_compressed && _bpp > 0) { - unsigned int bytesPerRow = option.width * _bpp / 8; - if (bytesPerRow % 8 == 0) aligment = 8; else if (bytesPerRow % 4 == 0) @@ -188,7 +199,12 @@ void Texture2D::setImage(const ImageOption& option) aligment = 1; } - GL_CHECK(glPixelStorei(GL_UNPACK_ALIGNMENT, aligment)); + GL_CHECK(ccPixelStorei(GL_UNPACK_ALIGNMENT, aligment)); + GL_CHECK(ccPixelStorei(GL_UNPACK_FLIP_Y_WEBGL, flipY)); + GL_CHECK(ccPixelStorei(GL_UNPACK_PREMULTIPLY_ALPHA_WEBGL, premultiplyAlpha)); + + ccFlipYOrPremultiptyAlphaIfNeeded(_glFormat, option.width, option.height, (uint32_t)img.length, img.data); + if (_compressed) { glCompressedTexImage2D(GL_TEXTURE_2D, diff --git a/native/cocos/scripting/js-bindings/manual/jsb_conversions.cpp b/native/cocos/scripting/js-bindings/manual/jsb_conversions.cpp index 33881029fe..fd67164703 100644 --- a/native/cocos/scripting/js-bindings/manual/jsb_conversions.cpp +++ b/native/cocos/scripting/js-bindings/manual/jsb_conversions.cpp @@ -1503,7 +1503,7 @@ bool seval_to_TextureSubImageOption(const se::Value& v, cocos2d::renderer::Textu assert(v.isObject()); se::Object* obj = v.toObject(); - uint16_t* ptr = nullptr; + uint32_t* ptr = nullptr; size_t length = 0; obj->getTypedArrayData((uint8_t**)(&ptr), &length); @@ -1517,8 +1517,8 @@ bool seval_to_TextureSubImageOption(const se::Value& v, cocos2d::renderer::Textu *(ptr + 6) // premultiplyAlpha ); - uint16_t imageDataLength = *(ptr + 7); - ret->imageData = (uint8_t*)(ptr) + 16; + uint32_t imageDataLength = *(ptr + 7); + ret->imageData = (uint8_t*)(ptr + 8); ret->imageDataLength = imageDataLength; return true; } @@ -1735,7 +1735,7 @@ bool seval_to_TechniqueParameter_not_constructor(const se::Value& v, cocos2d::re cocos2d::Color4F color; seval_to_Color4F(v, &color); float data[4] = {color.r, color.g, color.b, color.a}; - cocos2d::renderer::Technique::Parameter param(ret->getName(), paramType, data, 4); + cocos2d::renderer::Technique::Parameter param(ret->getName(), paramType, data, 1); *ret = std::move(param); break; break; diff --git a/native/cocos/scripting/js-bindings/manual/jsb_opengl_manual.cpp b/native/cocos/scripting/js-bindings/manual/jsb_opengl_manual.cpp index 87c6c769f0..e29964f6e8 100644 --- a/native/cocos/scripting/js-bindings/manual/jsb_opengl_manual.cpp +++ b/native/cocos/scripting/js-bindings/manual/jsb_opengl_manual.cpp @@ -45,7 +45,7 @@ namespace { const uint32_t GL_COMMAND_ACTIVE_TEXTURE = 0; const uint32_t GL_COMMAND_ATTACH_SHADER = 1; - const uint32_t GL_COMMAND_BIND_ATTRIB_LOCATION = 2; +// const uint32_t GL_COMMAND_BIND_ATTRIB_LOCATION = 2; const uint32_t GL_COMMAND_BIND_BUFFER = 3; const uint32_t GL_COMMAND_BIND_FRAME_BUFFER = 4; const uint32_t GL_COMMAND_BIND_RENDER_BUFFER = 5; @@ -55,17 +55,17 @@ namespace { const uint32_t GL_COMMAND_BLEND_EQUATION_SEPARATE = 9; const uint32_t GL_COMMAND_BLEND_FUNC = 10; const uint32_t GL_COMMAND_BLEND_FUNC_SEPARATE = 11; - const uint32_t GL_COMMAND_BUFFER_DATA = 12; - const uint32_t GL_COMMAND_BUFFER_SUB_DATA = 13; +// const uint32_t GL_COMMAND_BUFFER_DATA = 12; +// const uint32_t GL_COMMAND_BUFFER_SUB_DATA = 13; const uint32_t GL_COMMAND_CLEAR = 14; const uint32_t GL_COMMAND_CLEAR_COLOR = 15; const uint32_t GL_COMMAND_CLEAR_DEPTH = 16; const uint32_t GL_COMMAND_CLEAR_STENCIL = 17; const uint32_t GL_COMMAND_COLOR_MASK = 18; - const uint32_t GL_COMMAND_COMMIT = 19; +// const uint32_t GL_COMMAND_COMMIT = 19; const uint32_t GL_COMMAND_COMPILE_SHADER = 20; - const uint32_t GL_COMMAND_COMPRESSED_TEX_IMAGE_2D = 21; - const uint32_t GL_COMMAND_COMPRESSED_TEX_SUB_IMAGE_2D = 22; +// const uint32_t GL_COMMAND_COMPRESSED_TEX_IMAGE_2D = 21; +// const uint32_t GL_COMMAND_COMPRESSED_TEX_SUB_IMAGE_2D = 22; const uint32_t GL_COMMAND_COPY_TEX_IMAGE_2D = 23; const uint32_t GL_COMMAND_COPY_TEX_SUB_IMAGE_2D = 24; const uint32_t GL_COMMAND_CULL_FACE = 25; @@ -99,17 +99,17 @@ namespace { const uint32_t GL_COMMAND_RENDER_BUFFER_STORAGE = 53; const uint32_t GL_COMMAND_SAMPLE_COVERAGE = 54; const uint32_t GL_COMMAND_SCISSOR = 55; - const uint32_t GL_COMMAND_SHADER_SOURCE = 56; +// const uint32_t GL_COMMAND_SHADER_SOURCE = 56; const uint32_t GL_COMMAND_STENCIL_FUNC = 57; const uint32_t GL_COMMAND_STENCIL_FUNC_SEPARATE = 58; const uint32_t GL_COMMAND_STENCIL_MASK = 59; const uint32_t GL_COMMAND_STENCIL_MASK_SEPARATE = 60; const uint32_t GL_COMMAND_STENCIL_OP = 61; const uint32_t GL_COMMAND_STENCIL_OP_SEPARATE = 62; - const uint32_t GL_COMMAND_TEX_IMAGE_2D = 63; +// const uint32_t GL_COMMAND_TEX_IMAGE_2D = 63; const uint32_t GL_COMMAND_TEX_PARAMETER_F = 64; const uint32_t GL_COMMAND_TEX_PARAMETER_I = 65; - const uint32_t GL_COMMAND_TEX_SUB_IMAGE_2D = 66; +// const uint32_t GL_COMMAND_TEX_SUB_IMAGE_2D = 66; const uint32_t GL_COMMAND_UNIFORM_1F = 67; const uint32_t GL_COMMAND_UNIFORM_1FV = 68; const uint32_t GL_COMMAND_UNIFORM_1I = 69; @@ -152,7 +152,7 @@ namespace { se::Class* __jsb_WebGLProgram_class = nullptr; se::Class* __jsb_WebGLShader_class = nullptr; se::Class* __jsb_WebGLActiveInfo_class = nullptr; - se::Class* __jsb_WebGLUniformLocation_class = nullptr; +// se::Class* __jsb_WebGLUniformLocation_class = nullptr; std::unordered_map __shaders; @@ -166,9 +166,6 @@ namespace { WebGLObjectMap __webglProgramMap; WebGLObjectMap __webglShaderMap; - bool __unpackFlipY = false; - bool __premultiplyAlpha = false; - inline void WEBGL_framebufferRenderbuffer(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer) { if (attachment == GL_DEPTH_STENCIL_ATTACHMENT) @@ -190,27 +187,6 @@ namespace { glRenderbufferStorage(target, internalformat, width, height); } - inline void WEBGL_pixelStorei(GLenum pname, GLint param) - { - if (pname == GL_UNPACK_FLIP_Y_WEBGL) - { - __unpackFlipY = param == 0 ? false : true; - return; - } - else if (pname == GL_UNPACK_PREMULTIPLY_ALPHA_WEBGL) - { - __premultiplyAlpha = param == 0 ? false : true; - return; - } - else if (pname == GL_UNPACK_COLORSPACE_CONVERSION_WEBGL) - { - SE_LOGE("Warning: UNPACK_COLORSPACE_CONVERSION_WEBGL is unsupported\n"); - return; - } - - glPixelStorei(pname, param); - } - class WebGLObject : public cocos2d::Ref { public: @@ -363,128 +339,6 @@ namespace { } }; - //FIXME:cjh: ONLY SUPPORT RGBA format now. - void flipPixelsY(GLubyte *pixels, int bytesPerRow, int rows) - { - if( !pixels ) { return; } - - GLuint middle = rows/2; - GLuint intsPerRow = bytesPerRow / sizeof(GLuint); - GLuint remainingBytes = bytesPerRow - intsPerRow * sizeof(GLuint); - - for( GLuint rowTop = 0, rowBottom = rows-1; rowTop < middle; rowTop++, rowBottom-- ) { - - // Swap bytes in packs of sizeof(GLuint) bytes - GLuint *iTop = (GLuint *)(pixels + rowTop * bytesPerRow); - GLuint *iBottom = (GLuint *)(pixels + rowBottom * bytesPerRow); - - GLuint itmp; - GLint n = intsPerRow; - do { - itmp = *iTop; - *iTop++ = *iBottom; - *iBottom++ = itmp; - } while(--n > 0); - - // Swap the remaining bytes - GLubyte *bTop = (GLubyte *)iTop; - GLubyte *bBottom = (GLubyte *)iBottom; - - GLubyte btmp; - switch( remainingBytes ) { - case 3: btmp = *bTop; *bTop++ = *bBottom; *bBottom++ = btmp; - case 2: btmp = *bTop; *bTop++ = *bBottom; *bBottom++ = btmp; - case 1: btmp = *bTop; *bTop = *bBottom; *bBottom = btmp; - } - } - } - - void flipPixelsYByFormat(GLubyte *pixels, GLenum format, uint32_t width, uint32_t height, uint32_t expectedTotalBytes) - { - bool isSupportFlipY = true; - GLsizei bytesPerRow = 0; - switch (format) { - case GL_RGBA: - bytesPerRow = width * 4; - break; - case GL_RGB: - bytesPerRow = width * 3; - break; - case GL_LUMINANCE_ALPHA: - bytesPerRow = width * 2; - break; - case GL_LUMINANCE: - bytesPerRow = width; - break; - default: - isSupportFlipY = false; - break; - } - - if (isSupportFlipY) - { - assert(expectedTotalBytes == bytesPerRow * height); - flipPixelsY((GLubyte*)pixels, bytesPerRow, height); - } - else - { - SE_LOGE("flipPixelsYByFormat: format: 0x%X doesn't support upackFlipY!\n", format); - } - } - - // Lookup tables for fast [un]premultiplied alpha color values - // From https://bugzilla.mozilla.org/show_bug.cgi?id=662130 - - GLubyte* __premultiplyTable = nullptr; - - const GLubyte* premultiplyTable() - { - if( !__premultiplyTable ) { - __premultiplyTable = (GLubyte*)malloc(256*256); - - unsigned char *data = __premultiplyTable; - for( int a = 0; a <= 255; a++ ) { - for( int c = 0; c <= 255; c++ ) { - data[a*256+c] = (a * c + 254) / 255; - } - } - } - - return __premultiplyTable; - } - - void premultiplyPixels(const GLubyte *inPixels, GLubyte *outPixels, GLenum format, uint32_t width, uint32_t height, uint32_t expectedTotalBytes) - { - const GLubyte *table = premultiplyTable(); - int byteLength = 0; - if( format == GL_RGBA ) - { - byteLength = width * height * 4; - assert(byteLength == expectedTotalBytes); - for( int i = 0; i < byteLength; i += 4 ) { - unsigned short a = inPixels[i+3] * 256; - outPixels[i+0] = table[ a + inPixels[i+0] ]; - outPixels[i+1] = table[ a + inPixels[i+1] ]; - outPixels[i+2] = table[ a + inPixels[i+2] ]; - outPixels[i+3] = inPixels[i+3]; - } - } - else if ( format == GL_LUMINANCE_ALPHA ) - { - byteLength = width * height * 2; - assert(byteLength == expectedTotalBytes); - for( int i = 0; i < byteLength; i += 2 ) { - unsigned short a = inPixels[i+1] * 256; - outPixels[i+0] = table[ a + inPixels[i+0] ]; - outPixels[i+1] = inPixels[i+1]; - } - } - else - { - SE_LOGE("premultiplyPixels: format: 0x%X doesn't support upackFlipY!\n", format); - } - } - template class GLData { @@ -1867,7 +1721,7 @@ static bool JSB_glPixelStorei(se::State& s) { ok &= seval_to_int32(args[1], &arg1 ); SE_PRECONDITION2(ok, false, "Error processing arguments"); - JSB_GL_CHECK(WEBGL_pixelStorei((GLenum)arg0 , (GLint)arg1 )); + JSB_GL_CHECK(ccPixelStorei((GLenum)arg0 , (GLint)arg1)); return true; } SE_BIND_FUNC(JSB_glPixelStorei) @@ -2108,15 +1962,47 @@ static bool JSB_glStencilOpSeparate(se::State& s) { } SE_BIND_FUNC(JSB_glStencilOpSeparate) +static void setUnpackAlignmentByWidthAndFormat(uint32_t width, GLenum format) +{ + int32_t bytesPerPixel = 0; + if (format == GL_RGBA) { + bytesPerPixel = 4; + } + else if (format == GL_RGB) { + bytesPerPixel = 3; + } + else if (format == GL_LUMINANCE_ALPHA) { + bytesPerPixel = 2; + } + + int32_t factor; + GLint alignment = 1; + if (bytesPerPixel > 0) { + factor = bytesPerPixel * width; + } + else { + factor = width; + } + + if (factor % 8 == 0) + alignment = 8; + else if (factor % 4 == 0) + alignment = 4; + else if (factor % 2 == 0) + alignment = 2; + + ccPixelStorei(GL_UNPACK_ALIGNMENT, alignment); +} + // Arguments: GLenum, GLint, GLint, GLsizei, GLsizei, GLint, GLenum, GLenum, ArrayBufferView // Ret value: void static bool JSB_glTexImage2D(se::State& s) { const auto& args = s.args(); int argc = (int)args.size(); - SE_PRECONDITION2( argc == 9, false, "Invalid number of arguments" ); + SE_PRECONDITION2( argc == 10, false, "Invalid number of arguments" ); bool ok = true; - uint32_t target; int32_t level; int32_t internalformat; int32_t width; int32_t height; int32_t border; uint32_t format; uint32_t type; void* pixels; + uint32_t target; int32_t level; int32_t internalformat; int32_t width; int32_t height; int32_t border; uint32_t format; uint32_t type; void* pixels; uint32_t alignment; ok &= seval_to_uint32(args[0], &target ); ok &= seval_to_int32(args[1], &level ); @@ -2129,21 +2015,14 @@ static bool JSB_glTexImage2D(se::State& s) { GLsizei count; ok &= JSB_get_arraybufferview_dataptr(args[8], &count, &pixels); - + ok &= seval_to_uint32(args[9], &alignment); SE_PRECONDITION2(ok, false, "Error processing arguments"); - if (pixels != nullptr) - { - if (__unpackFlipY) - { - flipPixelsYByFormat((GLubyte*)pixels, format, width, height, count); - } - - if (__premultiplyAlpha) - { - premultiplyPixels((GLubyte*)pixels, (GLubyte*)pixels, format, width, height, count); - } - } + ccFlipYOrPremultiptyAlphaIfNeeded(format, width, height, count, pixels); + if (alignment > 0) + ccPixelStorei(GL_UNPACK_ALIGNMENT, alignment); + else + setUnpackAlignmentByWidthAndFormat(width, format); JSB_GL_CHECK(glTexImage2D((GLenum)target , (GLint)level , (GLint)internalformat , (GLsizei)width , (GLsizei)height , (GLint)border , (GLenum)format , (GLenum)type , (GLvoid*)pixels)); @@ -2194,9 +2073,9 @@ SE_BIND_FUNC(JSB_glTexParameteri) static bool JSB_glTexSubImage2D(se::State& s) { const auto& args = s.args(); int argc = (int)args.size(); - SE_PRECONDITION2( argc == 9, false, "Invalid number of arguments" ); + SE_PRECONDITION2( argc == 10, false, "Invalid number of arguments" ); bool ok = true; - uint32_t target; int32_t level; int32_t xoffset; int32_t yoffset; int32_t width; int32_t height; uint32_t format; uint32_t type; void* pixels; + uint32_t target; int32_t level; int32_t xoffset; int32_t yoffset; int32_t width; int32_t height; uint32_t format; uint32_t type; void* pixels; uint32_t alignment; ok &= seval_to_uint32(args[0], &target ); ok &= seval_to_int32(args[1], &level ); @@ -2208,20 +2087,14 @@ static bool JSB_glTexSubImage2D(se::State& s) { ok &= seval_to_uint32(args[7], &type ); GLsizei count; ok &= JSB_get_arraybufferview_dataptr(args[8], &count, &pixels); + ok &= seval_to_uint32(args[9], &alignment); SE_PRECONDITION2(ok, false, "Error processing arguments"); - if (pixels != nullptr) - { - if (__unpackFlipY) - { - flipPixelsYByFormat((GLubyte*)pixels, format, width, height, count); - } - - if (__premultiplyAlpha) - { - premultiplyPixels((GLubyte*)pixels, (GLubyte*)pixels, format, width, height, count); - } - } + ccFlipYOrPremultiptyAlphaIfNeeded(format, width, height, count, pixels); + if (alignment > 0) + ccPixelStorei(GL_UNPACK_ALIGNMENT, alignment); + else + setUnpackAlignmentByWidthAndFormat(width, format); JSB_GL_CHECK(glTexSubImage2D((GLenum)target , (GLint)level , (GLint)xoffset , (GLint)yoffset , (GLsizei)width , (GLsizei)height , (GLenum)format , (GLenum)type , (GLvoid*)pixels)); @@ -3771,11 +3644,11 @@ static bool JSB_glGetParameter(se::State& s) break; case GL_UNPACK_FLIP_Y_WEBGL: - ret.setBoolean(__unpackFlipY); + ret.setBoolean(ccIsUnpackFlipY()); break; case GL_UNPACK_PREMULTIPLY_ALPHA_WEBGL: - ret.setBoolean(__premultiplyAlpha); + ret.setBoolean(ccIsPremultiplyAlpha()); break; case GL_UNPACK_COLORSPACE_CONVERSION_WEBGL: @@ -4144,7 +4017,7 @@ static bool JSB_glFlushCommand(se::State& s) { } else if (commandID == GL_COMMAND_PIXEL_STOREI) { LOG_GL_COMMAND("Flush: PIXEL_STOREI\n"); - JSB_GL_CHECK_VOID(WEBGL_pixelStorei((GLenum)p[1], (GLint)p[2])); + JSB_GL_CHECK_VOID(ccPixelStorei((GLenum)p[1], (GLint)p[2])); p += 3; } else if (commandID == GL_COMMAND_POLYGON_OFFSET) {