Skip to content

Vulkan: remove stale USE_VK_PBR, USE_VBO_GRID, and USE_TESS_NEEDS flags #267

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

Draft
cursor wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Vulkan: remove stale USE_VK_PBR, USE_VBO_GRID, and USE_TESS_NEEDS flags #267

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
ad836f5
Vulkan: remove stale USE_VK_PBR, USE_VBO_GRID, and USE_TESS_NEEDS flags
cursoragent Jun 17, 2026
bba0c45
Fix stray #endif left after USE_VBO_GRID unwrap in vk_vbo.c
cursoragent Jun 17, 2026
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
6 changes: 0 additions & 6 deletions src/renderers/vulkan/tr_animation.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,9 +411,6 @@ void RB_MDRSurfaceAnim( mdrSurface_t *surface )
tempVert[1] += w->boneWeight * ( DotProduct( bone->matrix[1], w->offset ) + bone->matrix[1][3] );
tempVert[2] += w->boneWeight * ( DotProduct( bone->matrix[2], w->offset ) + bone->matrix[2][3] );

#ifdef USE_TESS_NEEDS_NORMAL
if ( tess.needsNormal )
#endif
{
tempNormal[0] += w->boneWeight * DotProduct( bone->matrix[0], v->normal );
tempNormal[1] += w->boneWeight * DotProduct( bone->matrix[1], v->normal );
Expand All @@ -425,9 +422,6 @@ void RB_MDRSurfaceAnim( mdrSurface_t *surface )
tess.xyz[baseVertex + j][1] = tempVert[1];
tess.xyz[baseVertex + j][2] = tempVert[2];

#ifdef USE_TESS_NEEDS_NORMAL
if ( tess.needsNormal )
#endif
{
tess.normal[baseVertex + j][0] = tempNormal[0];
tess.normal[baseVertex + j][1] = tempNormal[1];
Expand Down
22 changes: 1 addition & 21 deletions src/renderers/vulkan/tr_local.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

#define MAX_TEXTURE_SIZE 32768

#ifdef USE_VBO
#define USE_VBO_GRID /* put SF_GRID to VBO */
#endif

//#define USE_TESS_NEEDS_NORMAL
//#define USE_TESS_NEEDS_ST2

#define SH_COEFF_COUNT 9

Expand Down Expand Up @@ -546,11 +541,6 @@ typedef struct shader_s {

fogPass_t fogPass; // draw a blended pass, possibly with depth test equals

qboolean needsNormal; // not all shaders will need all data to be gathered
//qboolean needsST1;
qboolean needsST2;
//qboolean needsColor;

int numDeforms;
deformStage_t deforms[MAX_SHADER_DEFORMS];

Expand Down Expand Up @@ -2047,9 +2037,7 @@ image_t *vk_create_pbr_albedo_srgb( const char *albedoMapName, imgFlags_t flags
//
// tr_surface.c
//
#ifdef USE_VBO_GRID
void RB_SurfaceGridEstimate( srfGridMesh_t *cv, int *numVertexes, int *numIndexes );
#endif
void RB_SurfaceGridEstimate( srfGridMesh_t *cv, int *numVertexes, int *numIndexes );

/*
====================================================================
Expand Down Expand Up @@ -2114,14 +2102,6 @@ typedef struct shaderCommands_s
#endif
#endif

// info extracted from current shader
#ifdef USE_TESS_NEEDS_NORMAL
int needsNormal;
#endif
#ifdef USE_TESS_NEEDS_ST2
int needsST2;
#endif

int numPasses;
shaderStage_t **xstages;

Expand Down
3 changes: 0 additions & 3 deletions src/renderers/vulkan/tr_main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1078,9 +1078,6 @@ static qboolean SurfIsOffscreen( const drawSurf_t *drawSurf, qboolean *isMirror
RB_BeginSurface( shader, fogNum );
#ifdef USE_VBO
tess.allowVBO = qfalse;
#endif
#ifdef USE_TESS_NEEDS_NORMAL
tess.needsNormal = qtrue;
#endif
rb_surfaceTable[ *drawSurf->surface ]( drawSurf->surface );

Expand Down
11 changes: 0 additions & 11 deletions src/renderers/vulkan/tr_shade.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,17 +390,6 @@ void RB_BeginSurface( shader_t *shader, int fogNum ) {
tess.dlightUpdateParams = qtrue;
}

#ifdef USE_TESS_NEEDS_NORMAL
tess.needsNormal = state->needsNormal || tess.dlightPass || r_shownormals->integer ||
( backEnd.currentEntity == &tr.worldEntity &&
( ( r_shDebugView && r_shDebugView->integer ) ||
( r_shWorldLighting && r_shWorldLighting->integer && r_shLighting && r_shLighting->integer ) ) );
#endif

#ifdef USE_TESS_NEEDS_ST2
tess.needsST2 = state->needsST2;
#endif

tess.numIndexes = 0;
tess.numVertexes = 0;
tess.sdfUiEdge = -1.0f;
Expand Down
60 changes: 0 additions & 60 deletions src/renderers/vulkan/tr_shader.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3888,64 +3888,6 @@ static void InitShader( const char *name, int lightmapIndex ) {
}


static void DetectNeeds( void )
{
int i, n;

for ( i = 0; i < MAX_SHADER_STAGES; i++ )
{
if ( !stages[i].active )
break;

for ( n = 0; n < NUM_TEXTURE_BUNDLES; n++ ) {
const texCoordGen_t t = stages[i].bundle[n].tcGen;
if ( t == TCGEN_LIGHTMAP )
{
shader.needsST2 = qtrue;
}
if ( t == TCGEN_ENVIRONMENT_MAPPED || t == TCGEN_ENVIRONMENT_MAPPED_FP )
{
shader.needsNormal = qtrue;
}
if ( stages[i].bundle[n].alphaGen == AGEN_LIGHTING_SPECULAR || stages[i].bundle[n].rgbGen == CGEN_LIGHTING_DIFFUSE )
{
shader.needsNormal = qtrue;
}
}
#if 0
t1 = stages[i].bundle[0].tcGen;
t2 = stages[i].bundle[1].tcGen;

if ( t1 == TCGEN_LIGHTMAP || t2 == TCGEN_LIGHTMAP )
{
shader.needsST2 = qtrue;
}
if ( t1 == TCGEN_ENVIRONMENT_MAPPED || t1 == TCGEN_ENVIRONMENT_MAPPED_FP )
{
shader.needsNormal = qtrue;
}
if ( t2 == TCGEN_ENVIRONMENT_MAPPED || t2 == TCGEN_ENVIRONMENT_MAPPED_FP )
{
shader.needsNormal = qtrue;
}
if ( stages[i].bundle[0].alphaGen == AGEN_LIGHTING_SPECULAR || stages[i].bundle[0].rgbGen == CGEN_LIGHTING_DIFFUSE )
{
shader.needsNormal = qtrue;
}
#endif
}
for ( i = 0; i < shader.numDeforms; i++ )
{
if ( shader.deforms[i].deformation == DEFORM_WAVE || shader.deforms[i].deformation == DEFORM_NORMALS || shader.deforms[i].deformation == DEFORM_BULGE ) {
shader.needsNormal = qtrue;
}
if ( shader.deforms[i].deformation >= DEFORM_TEXT0 && shader.deforms[i].deformation <= DEFORM_TEXT7 ) {
shader.needsNormal = qtrue;
}
}
}


/*
=========================
FinishShader
Expand Down Expand Up @@ -4104,8 +4046,6 @@ static shader_t *FinishShader( void ) {
}
}

DetectNeeds();

// fix alphaGen flags to avoid redundant comparisons in R_ComputeColors()
for ( i = 0; i < MAX_SHADER_STAGES; i++ ) {
shaderStage_t *pStage = &stages[ i ];
Expand Down
33 changes: 0 additions & 33 deletions src/renderers/vulkan/tr_surface.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,9 +405,6 @@ static void RB_SurfaceTriangles( const srfTriangles_t *srf ) {
xyz[1] = dv->xyz[1];
xyz[2] = dv->xyz[2];

#ifdef USE_TESS_NEEDS_NORMAL
if ( tess.needsNormal )
#endif
{
normal[0] = dv->normal[0];
normal[1] = dv->normal[1];
Expand All @@ -433,9 +430,6 @@ static void RB_SurfaceTriangles( const srfTriangles_t *srf ) {
texCoords0[0] = dv->st[0];
texCoords0[1] = dv->st[1];

#ifdef USE_TESS_NEEDS_ST2
if ( tess.needsST2 )
#endif
{
texCoords1[0] = dv->lightmap[0];
texCoords1[1] = dv->lightmap[1];
Expand Down Expand Up @@ -988,9 +982,6 @@ static void RB_SurfaceFace( const srfSurfaceFace_t *surf ) {

numPoints = surf->numPoints;

#ifdef USE_TESS_NEEDS_NORMAL
if ( tess.needsNormal )
#endif
{
if ( surf->normals ) {
// per-vertex normals for non-coplanar faces
Expand All @@ -1017,9 +1008,6 @@ static void RB_SurfaceFace( const srfSurfaceFace_t *surf ) {
#ifdef USE_VK_PBR
tess.texCoords[0][ndx][0] = v[6];
tess.texCoords[0][ndx][1] = v[7];
#ifdef USE_TESS_NEEDS_ST2
if ( tess.needsST2 )
#endif
{
tess.texCoords[1][ndx][0] = v[8];
tess.texCoords[1][ndx][1] = v[9];
Expand All @@ -1032,9 +1020,6 @@ static void RB_SurfaceFace( const srfSurfaceFace_t *surf ) {
#else
tess.texCoords[0][ndx][0] = v[3];
tess.texCoords[0][ndx][1] = v[4];
#ifdef USE_TESS_NEEDS_ST2
if ( tess.needsST2 )
#endif
{
tess.texCoords[1][ndx][0] = v[5];
tess.texCoords[1][ndx][1] = v[6];
Expand Down Expand Up @@ -1083,7 +1068,6 @@ static float LodErrorForVolume( vec3_t local, float radius ) {
return r_lodCurveError->value / d;
}

#ifdef USE_VBO_GRID
void RB_SurfaceGridEstimate( srfGridMesh_t *cv, int *numVertexes, int *numIndexes )
{
int lodWidth, lodHeight;
Expand Down Expand Up @@ -1147,7 +1131,6 @@ void RB_SurfaceGridEstimate( srfGridMesh_t *cv, int *numVertexes, int *numIndexe
tess.numVertexes = 0;
tess.numIndexes = 0;
}
#endif // USE_VBO_GRID

/*
=============
Expand Down Expand Up @@ -1178,7 +1161,6 @@ static void RB_SurfaceGrid( srfGridMesh_t *cv ) {
int dlightBits;
int *vDlightBits;

#ifdef USE_VBO_GRID
if ( tess.allowVBO && cv->vboItemIndex && !cv->dlightBits ) {
// transition to vbo render list
if ( tess.vboIndex == 0 ) {
Expand All @@ -1196,23 +1178,16 @@ static void RB_SurfaceGrid( srfGridMesh_t *cv ) {
}

VBO_Flush();
#else
#ifdef USE_VBO
VBO_Flush();
#endif
#endif

dlightBits = cv->dlightBits;
tess.dlightBits |= dlightBits;

#ifdef USE_VBO_GRID
tess.surfType = SF_GRID;

// determine the allowable discrepance
if ( cv->vboItemIndex && ( tr.mapLoading || ( tess.dlightPass && tess.shader->isStaticShader ) ) )
lodError = r_lodCurveError->value; // fixed quality for VBO
else
#endif // USE_VBO_GRID
lodError = LodErrorForVolume( cv->lodOrigin, cv->lodRadius );

// determine which rows and columns of the subdivision
Expand Down Expand Up @@ -1253,13 +1228,11 @@ static void RB_SurfaceGrid( srfGridMesh_t *cv ) {
if ( vrows < 2 || irows < 1 ) {
if ( tr.mapLoading ) {
// estimate and flush
#ifdef USE_VBO_GRID
if ( cv->vboItemIndex ) {
VBO_PushData( cv->vboItemIndex, &tess );
tess.numIndexes = 0;
tess.numVertexes = 0;
} else
#endif // USE_VBO_GRID
ri.Error( ERR_DROP, "Unexpected grid flush during map loading!\n" );
} else {
RB_EndSurface();
Expand Down Expand Up @@ -1300,17 +1273,11 @@ static void RB_SurfaceGrid( srfGridMesh_t *cv ) {
xyz[2] = dv->xyz[2];
texCoords0[0] = dv->st[0];
texCoords0[1] = dv->st[1];
#ifdef USE_TESS_NEEDS_ST2
if ( tess.needsST2 )
#endif
{
texCoords1[0] = dv->lightmap[0];
texCoords1[1] = dv->lightmap[1];
texCoords1 += 2;
}
#ifdef USE_TESS_NEEDS_NORMAL
if ( tess.needsNormal )
#endif
{
normal[0] = dv->normal[0];
normal[1] = dv->normal[1];
Expand Down
Loading
Loading