Skip to content

Commit a5aa881

Browse files
committed
UPBGE: Remove unused functions in Rasterizer.
1 parent 8633845 commit a5aa881

File tree

4 files changed

+1
-31
lines changed

4 files changed

+1
-31
lines changed

source/gameengine/Rasterizer/RAS_DisplayArrayBucket.cpp

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@ RAS_DisplayArrayBucket::RAS_DisplayArrayBucket(RAS_MaterialBucket *bucket, RAS_I
5656
m_displayArray(array),
5757
m_mesh(mesh),
5858
m_meshMaterial(meshmat),
59-
m_useDisplayList(false),
60-
m_useVao(/*false*/true),
59+
m_useVao(true),
6160
m_storageInfo(nullptr),
6261
m_instancingBuffer(nullptr),
6362
m_downwardNode(this, std::mem_fn(&RAS_DisplayArrayBucket::RunDownwardNode), nullptr),
@@ -131,11 +130,6 @@ RAS_IDisplayArray *RAS_DisplayArrayBucket::GetDisplayArray() const
131130
return m_displayArray;
132131
}
133132

134-
RAS_MaterialBucket *RAS_DisplayArrayBucket::GetMaterialBucket() const
135-
{
136-
return m_bucket;
137-
}
138-
139133
RAS_MeshObject *RAS_DisplayArrayBucket::GetMesh() const
140134
{
141135
return m_mesh;
@@ -179,11 +173,6 @@ void RAS_DisplayArrayBucket::RemoveDeformer(RAS_Deformer *deformer)
179173
}
180174
}
181175

182-
bool RAS_DisplayArrayBucket::UseDisplayList() const
183-
{
184-
return m_useDisplayList;
185-
}
186-
187176
bool RAS_DisplayArrayBucket::UseVao() const
188177
{
189178
return m_useVao;
@@ -197,18 +186,12 @@ bool RAS_DisplayArrayBucket::UseBatching() const
197186
void RAS_DisplayArrayBucket::UpdateActiveMeshSlots(RAS_IRasterizer *rasty)
198187
{
199188
// Reset values to default.
200-
m_useDisplayList = true;
201189
m_useVao = true;
202190
bool arrayModified = false;
203191

204192
RAS_IPolyMaterial *material = m_bucket->GetPolyMaterial();
205193

206-
if (!material->UseDisplayLists()) {
207-
m_useDisplayList = false;
208-
}
209-
210194
if (material->IsZSort() || m_bucket->UseInstancing() || !m_displayArray || material->UsesObjectColor()) {
211-
m_useDisplayList = false;
212195
m_useVao = false;
213196
}
214197

@@ -217,7 +200,6 @@ void RAS_DisplayArrayBucket::UpdateActiveMeshSlots(RAS_IRasterizer *rasty)
217200

218201
// Test if one of deformers is dynamic.
219202
if (deformer->IsDynamic()) {
220-
m_useDisplayList = false;
221203
arrayModified = true;
222204
}
223205
}

source/gameengine/Rasterizer/RAS_DisplayArrayBucket.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,6 @@ class RAS_DisplayArrayBucket
6767
/// The list of all deformer usign this display array.
6868
RAS_DeformerList m_deformerList;
6969

70-
/// True if the display array is not frequently modified and can use display list.
71-
bool m_useDisplayList;
7270
/// As m_useDisplayList but without rasterizer value.
7371
bool m_useVao;
7472

@@ -108,7 +106,6 @@ class RAS_DisplayArrayBucket
108106

109107
/// \section Accesor
110108
RAS_IDisplayArray *GetDisplayArray() const;
111-
RAS_MaterialBucket *GetMaterialBucket() const;
112109
RAS_MeshObject *GetMesh() const;
113110
RAS_MeshMaterial *GetMeshMaterial() const;
114111

@@ -126,9 +123,7 @@ class RAS_DisplayArrayBucket
126123
void RemoveDeformer(RAS_Deformer *deformer);
127124

128125
/// \section Render Infos
129-
bool UseDisplayList() const;
130126
bool UseVao() const;
131-
132127
bool UseBatching() const;
133128

134129
/// Update render infos.

source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,3 @@ RAS_Texture *RAS_IPolyMaterial::GetTexture(unsigned int index)
161161
{
162162
return m_textures[index];
163163
}
164-
165-
bool RAS_IPolyMaterial::UseDisplayLists() const
166-
{
167-
return (m_flag & RAS_DISPLAYLISTS);
168-
}

source/gameengine/Rasterizer/RAS_IPolygonMaterial.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ enum MaterialProps
5656
RAS_CASTSHADOW = (1 << 4),
5757
RAS_ONLYSHADOW = (1 << 5),
5858
RAS_OBJECTCOLOR = (1 << 6),
59-
RAS_DISPLAYLISTS = (1 << 7)
6059
};
6160

6261
enum MaterialRasterizerModes
@@ -120,7 +119,6 @@ class RAS_IPolyMaterial
120119
bool CastsShadows() const;
121120
bool OnlyShadow() const;
122121
RAS_Texture *GetTexture(unsigned int index);
123-
bool UseDisplayLists() const;
124122

125123
virtual const std::string GetTextureName() const = 0;
126124
virtual Material *GetBlenderMaterial() const = 0;

0 commit comments

Comments
 (0)