Skip to content

Commit 7ab7fe2

Browse files
committed
Metal: drop uneeded Discard and Staging buffer stubs
1 parent 9f7a37b commit 7ab7fe2

12 files changed

+12
-1270
lines changed

RenderSystems/Metal/include/OgreMetalDiscardBufferManager.h

Lines changed: 0 additions & 177 deletions
This file was deleted.

RenderSystems/Metal/include/OgreMetalHardwareBufferCommon.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,13 @@ namespace Ogre
4646
private:
4747
id<MTLBuffer> mBuffer;
4848
MetalDevice *mDevice;
49-
MetalDiscardBuffer *mDiscardBuffer;
50-
StagingBuffer *mStagingBuffer;
5149
uint32 mLastFrameUsed;
5250
uint32 mLastFrameGpuWrote;
5351

5452
StagingBuffer* createStagingBuffer( size_t sizeBytes, bool forUpload );
5553
public:
5654
MetalHardwareBufferCommon(size_t sizeBytes, Usage usage, bool useShadowBuffer, uint16 alignment,
57-
MetalDiscardBufferManager* discardBufferManager, MetalDevice* device);
55+
MetalDevice* device);
5856
virtual ~MetalHardwareBufferCommon();
5957

6058
void _notifyDeviceStalled(void);
@@ -68,7 +66,6 @@ namespace Ogre
6866
The MTLBuffer in question.
6967
*/
7068
id<MTLBuffer> getBufferName( size_t &outOffset );
71-
id<MTLBuffer> getBufferNameForGpuWrite(void);
7269

7370
void* lockImpl(size_t offset, size_t length, LockOptions options) override;
7471
void unlockImpl() override;

RenderSystems/Metal/include/OgreMetalHardwareBufferManager.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ namespace Ogre {
3737
class _OgreMetalExport MetalHardwareBufferManager : public HardwareBufferManager
3838
{
3939
protected:
40-
MetalDiscardBufferManager *mDiscardBufferManager;
41-
40+
MetalDevice *mDevice;
4241
OGRE_MUTEX(mIndexBuffersMutex);
4342
IndexBufferList mIndexBuffers;
4443
public:
@@ -47,8 +46,6 @@ namespace Ogre {
4746

4847
void _notifyDeviceStalled(void);
4948

50-
MetalDiscardBufferManager* _getDiscardBufferManager(void) { return mDiscardBufferManager; }
51-
5249
/// Creates a vertex buffer
5350
virtual HardwareVertexBufferSharedPtr createVertexBuffer( size_t vertexSize, size_t numVerts,
5451
HardwareBuffer::Usage usage,

RenderSystems/Metal/include/OgreMetalProgram.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@ namespace Ogre
131131
/// Flag indicating if shader object successfully compiled
132132
bool mCompiled;
133133
/// Preprocessor options
134-
String mEntryPoint;
135134
String mTargetBufferName;
136135

137136
std::vector<GpuConstantDefinition> mConstantDefsSorted;

RenderSystems/Metal/include/OgreMetalProgramFactory.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ namespace Ogre
5353
GpuProgram* create(ResourceManager* creator,
5454
const String& name, ResourceHandle handle,
5555
const String& group, bool isManual, ManualResourceLoader* loader);
56-
void destroy(GpuProgram* prog);
5756
};
5857
}
5958

0 commit comments

Comments
 (0)