Skip to content
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

Jump to bottom

Compute sprite vertexes on CPU, not with GLSL #1281

Draft
wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

Compute sprite vertexes on CPU, not with GLSL #1281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
40c3fe3
Don't omit light factor when using depth fade
slipher Sep 3, 2024
3ade40a
Tess_SurfacePolychain: don't skip tangents randomly
slipher Sep 5, 2024
0dad856
Do autosprite calcs with CPU, not GLSL
slipher Sep 7, 2024
d440b4f
Make particles face in view direction (not toward viewer)
slipher Sep 7, 2024
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
1 change: 0 additions & 1 deletion src.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,6 @@ set(GLSLSOURCELIST
${ENGINE_DIR}/renderer/glsl_source/vertexAnimation_vp.glsl
${ENGINE_DIR}/renderer/glsl_source/vertexSimple_vp.glsl
${ENGINE_DIR}/renderer/glsl_source/vertexSkinning_vp.glsl
${ENGINE_DIR}/renderer/glsl_source/vertexSprite_vp.glsl
${ENGINE_DIR}/renderer/glsl_source/blurX_fp.glsl
${ENGINE_DIR}/renderer/glsl_source/blurX_vp.glsl
${ENGINE_DIR}/renderer/glsl_source/blurY_fp.glsl
Expand Down
47 changes: 20 additions & 27 deletions src/engine/renderer/Material.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,12 +247,12 @@ void UpdateSurfaceDataGeneric3D( uint32_t* materials, Material& material, drawSu
gl_genericShaderMaterial->SetUniform_ColorMapBindless( BindAnimatedImage( 0, &pStage->bundle[TB_COLORMAP] ) );
}

bool needDepthMap = pStage->hasDepthFade || shader->autoSpriteMode;
bool needDepthMap = pStage->hasDepthFade;
if ( needDepthMap ) {
gl_genericShaderMaterial->SetUniform_DepthMapBindless( GL_BindToTMU( 1, tr.currentDepthImage ) );
}

bool hasDepthFade = pStage->hasDepthFade && !shader->autoSpriteMode;
bool hasDepthFade = pStage->hasDepthFade;
if ( hasDepthFade ) {
gl_genericShaderMaterial->SetUniform_DepthScale( pStage->depthFadeValue );
}
Expand Down Expand Up @@ -959,7 +959,7 @@ void MaterialSystem::GenerateWorldCommandBuffer() {
}

shader = shader->remappedShader ? shader->remappedShader : shader;
if ( shader->isSky || shader->isPortal ) {
if ( shader->isSky || shader->isPortal || shader->autoSpriteMode ) {
continue;
}

Expand Down Expand Up @@ -1067,13 +1067,12 @@ void BindShaderGeneric3D( Material* material ) {
gl_genericShaderMaterial->SetTCGenEnvironment( material->tcGenEnvironment );
gl_genericShaderMaterial->SetTCGenLightmap( material->tcGen_Lightmap );
gl_genericShaderMaterial->SetDepthFade( material->hasDepthFade );
gl_genericShaderMaterial->SetVertexSprite( material->vertexSprite );

// Bind shader program.
gl_genericShaderMaterial->BindProgram( material->deformIndex );

// Set shader uniforms.
if ( material->tcGenEnvironment || material->vertexSprite ) {
if ( material->tcGenEnvironment ) {
gl_genericShaderMaterial->SetUniform_ViewOrigin( backEnd.orientation.viewOrigin );
gl_genericShaderMaterial->SetUniform_ViewUp( backEnd.orientation.axis[2] );
}
Expand Down Expand Up @@ -1146,17 +1145,11 @@ void BindShaderScreen( Material* material ) {
void BindShaderHeatHaze( Material* material ) {
// Select shader permutation.
gl_heatHazeShaderMaterial->SetVertexAnimation( material->vertexAnimation );
gl_heatHazeShaderMaterial->SetVertexSprite( material->vertexSprite );

// Bind shader program.
gl_heatHazeShaderMaterial->BindProgram( material->deformIndex );

// Set shader uniforms.
if ( material->vertexSprite ) {
gl_heatHazeShaderMaterial->SetUniform_ViewOrigin( backEnd.orientation.viewOrigin );
gl_heatHazeShaderMaterial->SetUniform_ViewUp( backEnd.orientation.axis[2] );
}

gl_heatHazeShaderMaterial->SetUniform_ModelMatrix( backEnd.orientation.transformMatrix );
gl_heatHazeShaderMaterial->SetUniform_ModelViewProjectionMatrix( glState.modelViewProjectionMatrix[glState.stackIndex] );
}
Expand Down Expand Up @@ -1184,26 +1177,22 @@ void ProcessMaterialNOP( Material*, shaderStage_t*, drawSurf_t* ) {

// ProcessMaterial*() are essentially same as BindShader*(), but only set the GL program id to the material,
// without actually binding it
void ProcessMaterialGeneric3D( Material* material, shaderStage_t* pStage, drawSurf_t* drawSurf ) {
shader_t* shader = drawSurf->shader;

void ProcessMaterialGeneric3D( Material* material, shaderStage_t* pStage, drawSurf_t* ) {
material->shader = gl_genericShaderMaterial;

material->vertexAnimation = false;
material->tcGenEnvironment = pStage->tcGen_Environment;
material->tcGen_Lightmap = pStage->tcGen_Lightmap;
material->vertexSprite = shader->autoSpriteMode != 0;
material->deformIndex = pStage->deformIndex;

gl_genericShaderMaterial->SetVertexAnimation( false );

gl_genericShaderMaterial->SetTCGenEnvironment( pStage->tcGen_Environment );
gl_genericShaderMaterial->SetTCGenLightmap( pStage->tcGen_Lightmap );

bool hasDepthFade = pStage->hasDepthFade && !shader->autoSpriteMode;
bool hasDepthFade = pStage->hasDepthFade;
material->hasDepthFade = hasDepthFade;
gl_genericShaderMaterial->SetDepthFade( hasDepthFade );
gl_genericShaderMaterial->SetVertexSprite( shader->autoSpriteMode != 0 );

material->program = gl_genericShaderMaterial->GetProgram( pStage->deformIndex );
}
Expand Down Expand Up @@ -1286,21 +1275,13 @@ void ProcessMaterialScreen( Material* material, shaderStage_t* pStage, drawSurf_
material->program = gl_screenShaderMaterial->GetProgram( pStage->deformIndex );
}

void ProcessMaterialHeatHaze( Material* material, shaderStage_t* pStage, drawSurf_t* drawSurf ) {
shader_t* shader = drawSurf->shader;

void ProcessMaterialHeatHaze( Material* material, shaderStage_t* pStage, drawSurf_t* ) {
material->shader = gl_heatHazeShaderMaterial;

material->vertexAnimation = false;
material->deformIndex = pStage->deformIndex;

gl_heatHazeShaderMaterial->SetVertexAnimation( false );
if ( shader->autoSpriteMode ) {
gl_heatHazeShaderMaterial->SetVertexSprite( true );
} else {
gl_heatHazeShaderMaterial->SetVertexSprite( false );
}

material->program = gl_heatHazeShaderMaterial->GetProgram( pStage->deformIndex );
}

Expand Down Expand Up @@ -1447,7 +1428,7 @@ void MaterialSystem::GenerateWorldMaterials() {
}

shader = shader->remappedShader ? shader->remappedShader : shader;
if ( shader->isSky || shader->isPortal ) {
if ( shader->isSky || shader->isPortal || shader->autoSpriteMode ) {
continue;
}

Expand Down Expand Up @@ -1807,6 +1788,7 @@ void MaterialSystem::Free() {
generatedWorldCommandBuffer = false;

dynamicDrawSurfs.clear();
autospriteSurfaces.clear();
portalSurfaces.clear();
portalSurfacesTmp.clear();
portalBounds.clear();
Expand Down Expand Up @@ -1948,6 +1930,17 @@ void MaterialSystem::AddPortalSurfaces() {
portalSurfacesSSBO.AreaIncr();
}

// autosprite[2] is not implemented in material system, draw them old-fashionedly
void MaterialSystem::AddAutospriteSurfaces() {
tr.currentEntity = &tr.worldEntity;

for ( const drawSurf_t &drawSurf : autospriteSurfaces )
{
R_AddDrawSurf( drawSurf.surface, drawSurf.shader,
drawSurf.lightmapNum(), drawSurf.fogNum(), drawSurf.bspSurface );
}
}

void MaterialSystem::RenderMaterials( const shaderSort_t fromSort, const shaderSort_t toSort, const uint32_t viewID ) {
if ( !r_drawworld->integer ) {
return;
Expand Down
3 changes: 2 additions & 1 deletion src/engine/renderer/Material.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ struct Material {
bool tcGenEnvironment;
bool tcGen_Lightmap;
bool hasDepthFade;
bool vertexSprite;
bool alphaTest;

bool bspSurface;
Expand Down Expand Up @@ -217,6 +216,7 @@ class MaterialSystem {

std::vector<drawSurf_t*> portalSurfacesTmp;
std::vector<drawSurf_t> portalSurfaces;
std::vector<drawSurf_t> autospriteSurfaces;
std::vector<PortalSurface> portalBounds;
uint32_t totalPortals;
std::vector<shader_t*> skyShaders;
Expand Down Expand Up @@ -250,6 +250,7 @@ class MaterialSystem {
const GLuint count, const GLuint firstIndex );

void AddPortalSurfaces();
void AddAutospriteSurfaces();
void RenderMaterials( const shaderSort_t fromSort, const shaderSort_t toSort, const uint32_t viewID );
void UpdateDynamicSurfaces();

Expand Down
52 changes: 7 additions & 45 deletions src/engine/renderer/gl_shader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1583,7 +1583,7 @@ bool GLCompileMacro_USE_REFLECTIVE_SPECULAR::HasConflictingMacros( size_t permut
{
for (const GLCompileMacro* macro : macros)
{
if ( ( permutation & macro->GetBit() ) != 0 && (macro->GetType() == USE_PHYSICAL_MAPPING || macro->GetType() == USE_VERTEX_SPRITE) )
if ( ( permutation & macro->GetBit() ) != 0 && macro->GetType() == USE_PHYSICAL_MAPPING )
{
//Log::Notice("conflicting macro! canceling '%s' vs. '%s'", GetName(), macro->GetName());
return true;
Expand All @@ -1598,7 +1598,7 @@ bool GLCompileMacro_USE_VERTEX_SKINNING::HasConflictingMacros( size_t permutatio
for (const GLCompileMacro* macro : macros)
{
//if(GLCompileMacro_USE_VERTEX_ANIMATION* m = dynamic_cast<GLCompileMacro_USE_VERTEX_ANIMATION*>(macro))
if ( ( permutation & macro->GetBit() ) != 0 && (macro->GetType() == USE_VERTEX_ANIMATION || macro->GetType() == USE_VERTEX_SPRITE) )
if ( ( permutation & macro->GetBit() ) != 0 && macro->GetType() == USE_VERTEX_ANIMATION )
{
//Log::Notice("conflicting macro! canceling '%s' vs. '%s'", GetName(), macro->GetName());
return true;
Expand All @@ -1617,7 +1617,7 @@ bool GLCompileMacro_USE_VERTEX_ANIMATION::HasConflictingMacros( size_t permutati
{
for (const GLCompileMacro* macro : macros)
{
if ( ( permutation & macro->GetBit() ) != 0 && (macro->GetType() == USE_VERTEX_SKINNING || macro->GetType() == USE_VERTEX_SPRITE) )
if ( ( permutation & macro->GetBit() ) != 0 && macro->GetType() == USE_VERTEX_SKINNING )
{
//Log::Notice("conflicting macro! canceling '%s' vs. '%s'", GetName(), macro->GetName());
return true;
Expand All @@ -1634,20 +1634,6 @@ uint32_t GLCompileMacro_USE_VERTEX_ANIMATION::GetRequiredVertexAttributes() cons
return attribs;
}

bool GLCompileMacro_USE_VERTEX_SPRITE::HasConflictingMacros( size_t permutation, const std::vector< GLCompileMacro * > &macros ) const
{
for (const GLCompileMacro* macro : macros)
{
if ( ( permutation & macro->GetBit() ) != 0 && (macro->GetType() == USE_VERTEX_SKINNING || macro->GetType() == USE_VERTEX_ANIMATION || macro->GetType() == USE_DEPTH_FADE))
{
//Log::Notice("conflicting macro! canceling '%s' vs. '%s'", GetName(), macro->GetName());
return true;
}
}

return false;
}

bool GLCompileMacro_USE_TCGEN_ENVIRONMENT::HasConflictingMacros( size_t permutation, const std::vector<GLCompileMacro*> &macros) const
{
for (const GLCompileMacro* macro : macros)
Expand Down Expand Up @@ -1676,20 +1662,6 @@ bool GLCompileMacro_USE_TCGEN_LIGHTMAP::HasConflictingMacros(size_t permutation,
return false;
}

bool GLCompileMacro_USE_DEPTH_FADE::HasConflictingMacros(size_t permutation, const std::vector<GLCompileMacro*> &macros) const
{
for (const GLCompileMacro* macro : macros)
{
if ((permutation & macro->GetBit()) != 0 && (macro->GetType() == USE_VERTEX_SPRITE))
{
//Log::Notice("conflicting macro! canceling '%s' vs. '%s'", GetName(), macro->GetName());
return true;
}
}

return false;
}

bool GLCompileMacro_USE_DELUXE_MAPPING::HasConflictingMacros(size_t permutation, const std::vector<GLCompileMacro*> &macros) const
{
for (const GLCompileMacro* macro : macros)
Expand Down Expand Up @@ -1953,7 +1925,7 @@ void GLShader::DispatchComputeIndirect( const GLintptr indirectBuffer ) {
glDispatchComputeIndirect( indirectBuffer );
}

void GLShader::SetRequiredVertexPointers( bool vertexSprite )
void GLShader::SetRequiredVertexPointers()
{
uint32_t macroVertexAttribs = 0;

Expand All @@ -1966,13 +1938,6 @@ void GLShader::SetRequiredVertexPointers( bool vertexSprite )
}

uint32_t attribs = _vertexAttribsRequired | _vertexAttribs | macroVertexAttribs; // & ~_vertexAttribsUnsupported);

if ( vertexSprite )
{
attribs &= ~ATTR_QTANGENT;
attribs |= ATTR_ORIENTATION;
}

GL_VertexAttribsState( attribs );
}

Expand Down Expand Up @@ -2031,7 +1996,6 @@ GLShader_generic::GLShader_generic( GLShaderManager *manager ) :
GLDeformStage( this ),
GLCompileMacro_USE_VERTEX_SKINNING( this ),
GLCompileMacro_USE_VERTEX_ANIMATION( this ),
GLCompileMacro_USE_VERTEX_SPRITE( this ),
GLCompileMacro_USE_TCGEN_ENVIRONMENT( this ),
GLCompileMacro_USE_TCGEN_LIGHTMAP( this ),
GLCompileMacro_USE_DEPTH_FADE( this )
Expand Down Expand Up @@ -2063,7 +2027,6 @@ GLShader_genericMaterial::GLShader_genericMaterial( GLShaderManager* manager ) :
GLDeformStage( this ),
// GLCompileMacro_USE_VERTEX_SKINNING( this ),
GLCompileMacro_USE_VERTEX_ANIMATION( this ),
GLCompileMacro_USE_VERTEX_SPRITE( this ),
GLCompileMacro_USE_TCGEN_ENVIRONMENT( this ),
GLCompileMacro_USE_TCGEN_LIGHTMAP( this ),
GLCompileMacro_USE_DEPTH_FADE( this ) {
Expand Down Expand Up @@ -2604,8 +2567,7 @@ GLShader_heatHaze::GLShader_heatHaze( GLShaderManager *manager ) :
u_VertexInterpolation( this ),
GLDeformStage( this ),
GLCompileMacro_USE_VERTEX_SKINNING( this ),
GLCompileMacro_USE_VERTEX_ANIMATION( this ),
GLCompileMacro_USE_VERTEX_SPRITE( this )
GLCompileMacro_USE_VERTEX_ANIMATION( this )
{
}

Expand Down Expand Up @@ -2636,8 +2598,8 @@ GLShader_heatHazeMaterial::GLShader_heatHazeMaterial( GLShaderManager* manager )
u_VertexInterpolation( this ),
GLDeformStage( this ),
// GLCompileMacro_USE_VERTEX_SKINNING( this ),
GLCompileMacro_USE_VERTEX_ANIMATION( this ),
GLCompileMacro_USE_VERTEX_SPRITE( this ) {
GLCompileMacro_USE_VERTEX_ANIMATION( this )
{
}

void GLShader_heatHazeMaterial::SetShaderProgramUniforms( shaderProgram_t* shaderProgram ) {
Expand Down
Loading