Skip to content

renderer: use legacy weight calculation for GLSL 1.20, fix #490 ref #470 #479 #491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
illwieckz wants to merge 1 commit into from
Closed

renderer: use legacy weight calculation for GLSL 1.20, fix #490 ref #470 #479 #491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions src/engine/renderer/glsl_source/vertexSkinning_vp.glsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,20 @@ void VertexFetch(out vec4 position,
const float scale = 1.0 / 256.0;
localBasis inLB;

ivec4 idx = 2 * ( ivec4(attr_BoneFactors) >> 8 );
vec4 weights = ( ivec4(attr_BoneFactors) & 0xFF ) / 255.0;
#if __VERSION__ > 120
/* This code works on GL 3 GPUs and later including the
Nvidia proprietary driver but does not work on GL 2 GPUs.
See https://github.com/DaemonEngine/Daemon/issues/490 */
ivec4 idx = 2 * ( ivec4(attr_BoneFactors) >> 8 );
vec4 weights = ( ivec4(attr_BoneFactors) & 0xFF ) / 255.0;
#else
/* This code works on GL 2 GPUs and later but the Nvidia
proprietary driver is affected by a bug starting with GL 3 GPUs.
See https://github.com/DaemonEngine/Daemon/issues/472 */
ivec4 idx = 2 * ivec4( floor( attr_BoneFactors * scale ) );
vec4 weights = fract( attr_BoneFactors * scale );
weights.x = 1.0 - weights.x;
#endif

vec4 quat = u_Bones[ idx.x ];
vec4 trans = u_Bones[ idx.x + 1 ];
Expand Down
43 changes: 39 additions & 4 deletions src/engine/renderer/tr_vbo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,11 +304,28 @@ static void R_SetVBOAttributeLayouts( VBO_t *vbo )
}
}

// index has to be in range 0-255, weight has to be >= 0 and <= 1
static inline unsigned short
boneFactor( int index, float weight ) {
int scaledWeight = lrintf( weight * 255.0 );
return (unsigned short)( ( index << 8 ) | scaledWeight );
if ( glConfig.driverType == glDriverType_t::GLDRV_OPENGL3 )
{
/* This code works on GL 3 GPUs and later including the
Nvidia proprietary driver but does not work on GL 2 GPUs.
See https://github.com/DaemonEngine/Daemon/issues/490 */

// index has to be in range 0-255, weight has to be >= 0 and <= 1
int scaledWeight = lrintf( weight * 255.0 );
return (unsigned short)( ( index << 8 ) | scaledWeight );
}
else
{
/* This code works on GL 2 GPUs and later but the Nvidia
proprietary driver is affected by a bug starting with GL 3 GPUs.
See https://github.com/DaemonEngine/Daemon/issues/472 */

// index has to be in range 0-255, weight has to be >= 0 and < 1
int scaledWeight = lrintf( weight * 256.0 );
return (unsigned short)( ( index << 8 ) | std::min( scaledWeight, 255 ) );
}
}

static void R_CopyVertexData( VBO_t *vbo, byte *outData, vboData_t inData )
Expand Down Expand Up @@ -369,8 +386,26 @@ static void R_CopyVertexData( VBO_t *vbo, byte *outData, vboData_t inData )
if ( ( vbo->attribBits & ATTR_BONE_FACTORS ) )
{
uint32_t j;
int start;

if ( glConfig.driverType == glDriverType_t::GLDRV_OPENGL3 )
{
/* This code works on GL 3 GPUs and later including the
Nvidia proprietary driver but does not work on GL 2 GPUs.
See https://github.com/DaemonEngine/Daemon/issues/490 */
start = 0;
}
else
{
/* This code works on GL 2 GPUs and later but the Nvidia
proprietary driver is affected by a bug starting with GL 3 GPUs.
See https://github.com/DaemonEngine/Daemon/issues/472 */
ptr[ v ].boneFactors[ 0 ] = boneFactor( inData.boneIndexes[ v ][ 0 ],
1.0f - inData.boneWeights[ v ][ 0 ]);
start = 1;
}

for ( j = 0; j < 4; j++ ) {
for ( j = start; j < 4; j++ ) {
ptr[ v ].boneFactors[ j ] = boneFactor( inData.boneIndexes[ v ][ j ],
inData.boneWeights[ v ][ j ] );
}
Expand Down