Skip to content

Vertex skinning compatible with old GLSL #498

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

Merged
slipher merged 2 commits into from
Jul 6, 2021
Merged

Vertex skinning compatible with old GLSL #498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b983a94
Pass vertex skinning weights yet another way
slipher Jul 4, 2021
10e1b31
Check GL errors only on debug build by default
illwieckz Jul 5, 2021
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
11 changes: 9 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 @@ -39,10 +39,17 @@ void VertexFetch(out vec4 position,
out vec2 lmCoord)
{
const float scale = 1.0 / 256.0;
const float weightScale = 1.0 / 255.0;
localBasis inLB;

ivec4 idx = 2 * ( ivec4(attr_BoneFactors) >> 8 );
vec4 weights = ( ivec4(attr_BoneFactors) & 0xFF ) / 255.0;
// Unpack data from "bone factors". This used to have the index in the high byte and the weight
// in the low byte, which may seem a bit more logical, but it triggered issues with some
// Nvidia shader compilers (https://github.com/DaemonEngine/Daemon/issues/472).
vec4 ipart = floor( attr_BoneFactors * scale );
vec4 fpart = attr_BoneFactors * scale - ipart;
// idx = 2 times the original bone index (the index input to boneFactor)
ivec4 idx = ivec4( fpart * 512.0 );
vec4 weights = ipart * weightScale;

vec4 quat = u_Bones[ idx.x ];
vec4 trans = u_Bones[ idx.x + 1 ];
Expand Down
8 changes: 4 additions & 4 deletions src/engine/renderer/tr_backend.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1368,7 +1368,7 @@ static void RB_SetupLightForShadowing( trRefLight_t *light, int index,
tr.shadowCubeFBOImage[ light->shadowLOD ]->texnum, 0 );
}

if ( !r_ignoreGLErrors->integer )
if ( checkGLErrors() )
{
R_CheckFBO( tr.shadowMapFBO[ light->shadowLOD ] );
}
Expand Down Expand Up @@ -1488,7 +1488,7 @@ static void RB_SetupLightForShadowing( trRefLight_t *light, int index,
R_AttachFBOTexture2D( GL_TEXTURE_2D, tr.shadowMapFBOImage[ light->shadowLOD ]->texnum, 0 );
}

if ( !r_ignoreGLErrors->integer )
if ( checkGLErrors() )
{
R_CheckFBO( tr.shadowMapFBO[ light->shadowLOD ] );
}
Expand Down Expand Up @@ -1540,7 +1540,7 @@ static void RB_SetupLightForShadowing( trRefLight_t *light, int index,
R_AttachFBOTextureDepth( tr.sunShadowMapFBOImage[ splitFrustumIndex ]->texnum );
}

if ( !r_ignoreGLErrors->integer )
if ( checkGLErrors() )
{
R_CheckFBO( tr.sunShadowMapFBO[ splitFrustumIndex ] );
}
Expand Down Expand Up @@ -1983,7 +1983,7 @@ static void RB_BlurShadowMap( const trRefLight_t *light, int i )
R_BindFBO( fbos[ index ] );
R_AttachFBOTexture2D( images[ index + MAX_SHADOWMAPS ]->type, images[ index + MAX_SHADOWMAPS ]->texnum, 0 );

if ( !r_ignoreGLErrors->integer )
if ( checkGLErrors() )
{
R_CheckFBO( fbos[ index ] );
}
Expand Down
2 changes: 1 addition & 1 deletion src/engine/renderer/tr_cmds.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -811,7 +811,7 @@ void RE_BeginFrame()
}

// check for errors
if ( !r_ignoreGLErrors->integer )
if ( checkGLErrors() )
{
R_SyncRenderThread();
GL_CheckErrors_( __FILE__, __LINE__ );
Expand Down
6 changes: 3 additions & 3 deletions src/engine/renderer/tr_init.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
cvar_t *r_arb_texture_gather;
cvar_t *r_arb_gpu_shader5;

cvar_t *r_ignoreGLErrors;
cvar_t *r_checkGLErrors;
cvar_t *r_logFile;

cvar_t *r_stencilbits;
Expand Down Expand Up @@ -379,7 +379,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
int err;
char s[ 128 ];

if ( r_ignoreGLErrors->integer )
if ( !checkGLErrors() )
{
return;
}
Expand Down Expand Up @@ -1106,7 +1106,7 @@ ScreenshotCmd screenshotPNGRegistration("screenshotPNG", ssFormat_t::SSF_PNG, "p
r_lodBias = ri.Cvar_Get( "r_lodBias", "0", 0 );
r_znear = ri.Cvar_Get( "r_znear", "3", CVAR_CHEAT );
r_zfar = ri.Cvar_Get( "r_zfar", "0", CVAR_CHEAT );
r_ignoreGLErrors = ri.Cvar_Get( "r_ignoreGLErrors", "0", 0 );
r_checkGLErrors = ri.Cvar_Get( "r_checkGLErrors", "-1", 0 );
r_fastsky = ri.Cvar_Get( "r_fastsky", "0", CVAR_ARCHIVE );
r_drawSun = ri.Cvar_Get( "r_drawSun", "0", 0 );
r_finish = ri.Cvar_Get( "r_finish", "0", CVAR_CHEAT );
Expand Down
15 changes: 14 additions & 1 deletion src/engine/renderer/tr_local.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2973,7 +2973,7 @@ static inline void halfToFloat( const f16vec4_t in, vec4_t out )
extern cvar_t *r_skipBackEnd;
extern cvar_t *r_skipLightBuffer;

extern cvar_t *r_ignoreGLErrors;
extern cvar_t *r_checkGLErrors;

extern cvar_t *r_debugSurface;
extern cvar_t *r_simpleMipMaps;
Expand Down Expand Up @@ -3033,6 +3033,19 @@ static inline void halfToFloat( const f16vec4_t in, vec4_t out )

//====================================================================

/* r_checkGLErrors values:
- -1: check for GL errors on debug build only
- 0: never check for GL errors
- 1: always check for GL errors */
inline bool checkGLErrors()
{
#ifdef DEBUG_BUILD
return r_checkGLErrors->integer != 0;
#else
return r_checkGLErrors->integer > 0;
#endif
}

#define IMAGE_FILE_HASH_SIZE 4096
extern image_t *r_imageHashTable[ IMAGE_FILE_HASH_SIZE ];

Expand Down
4 changes: 2 additions & 2 deletions src/engine/renderer/tr_vbo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,10 +305,10 @@ 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
static unsigned short
boneFactor( int index, float weight ) {
int scaledWeight = lrintf( weight * 255.0 );
return (unsigned short)( ( index << 8 ) | scaledWeight );
return (unsigned short)( ( scaledWeight << 8 ) | index );
}

static void R_CopyVertexData( VBO_t *vbo, byte *outData, vboData_t inData )
Expand Down