asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Merge pull request #54768 from The-O-King/vertex_attrib_fix

Browse source
This commit is contained in:
Rémi Verschelde 2021-11-08 19:43:58 +01:00 committed by GitHub
commit 2f942ab846
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/gles2/rasterizer_storage_gles2.cpp
View file

@ -2309,7 +2309,7 @@ void RasterizerStorageGLES2::mesh_add_surface(RID p_mesh, uint32_t p_format, VS:
// UNLESS tangent exists and is also compressed // UNLESS tangent exists and is also compressed
// then it will be oct16 encoded along with tangent // then it will be oct16 encoded along with tangent
attribs[i].normalized = GL_TRUE; attribs[i].normalized = GL_TRUE;
attribs[i].size = 4; attribs[i].size = 2;
attribs[i].type = GL_SHORT; attribs[i].type = GL_SHORT;
attributes_stride += 4; attributes_stride += 4;
} else { } else {
@ -2330,6 +2330,7 @@ void RasterizerStorageGLES2::mesh_add_surface(RID p_mesh, uint32_t p_format, VS:
case VS::ARRAY_TANGENT: { case VS::ARRAY_TANGENT: {
if (p_format & VS::ARRAY_FLAG_USE_OCTAHEDRAL_COMPRESSION) { if (p_format & VS::ARRAY_FLAG_USE_OCTAHEDRAL_COMPRESSION) {
attribs[i].enabled = false; attribs[i].enabled = false;
attribs[VS::ARRAY_NORMAL].size = 4;
if (p_format & VS::ARRAY_COMPRESS_TANGENT && p_format & VS::ARRAY_COMPRESS_NORMAL) { if (p_format & VS::ARRAY_COMPRESS_TANGENT && p_format & VS::ARRAY_COMPRESS_NORMAL) {
// normal and tangent will each be oct16 (2 bytes each) // normal and tangent will each be oct16 (2 bytes each)
// pack into single vec4<GL_BYTE> for memory bandwidth // pack into single vec4<GL_BYTE> for memory bandwidth

3
drivers/gles3/rasterizer_storage_gles3.cpp
View file

@ -3404,7 +3404,7 @@ void RasterizerStorageGLES3::mesh_add_surface(RID p_mesh, uint32_t p_format, VS:
// UNLESS tangent exists and is also compressed // UNLESS tangent exists and is also compressed
// then it will be oct16 encoded along with tangent // then it will be oct16 encoded along with tangent
attribs[i].normalized = GL_TRUE; attribs[i].normalized = GL_TRUE;
attribs[i].size = 4; attribs[i].size = 2;
attribs[i].type = GL_SHORT; attribs[i].type = GL_SHORT;
attributes_stride += 4; attributes_stride += 4;
} else { } else {
@ -3425,6 +3425,7 @@ void RasterizerStorageGLES3::mesh_add_surface(RID p_mesh, uint32_t p_format, VS:
case VS::ARRAY_TANGENT: { case VS::ARRAY_TANGENT: {
if (p_format & VS::ARRAY_FLAG_USE_OCTAHEDRAL_COMPRESSION) { if (p_format & VS::ARRAY_FLAG_USE_OCTAHEDRAL_COMPRESSION) {
attribs[i].enabled = false; attribs[i].enabled = false;
attribs[VS::ARRAY_NORMAL].size = 4;
if (p_format & VS::ARRAY_COMPRESS_TANGENT && p_format & VS::ARRAY_COMPRESS_NORMAL) { if (p_format & VS::ARRAY_COMPRESS_TANGENT && p_format & VS::ARRAY_COMPRESS_NORMAL) {
// normal and tangent will each be oct16 (2 bytes each) // normal and tangent will each be oct16 (2 bytes each)
// pack into single vec4<GL_BYTE> for memory bandwidth // pack into single vec4<GL_BYTE> for memory bandwidth