zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-13 07:57:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Removed deleted virtual functions

Browse source 
This solves linking errors on macOS with missing ___cxa_deleted_virtual symbol
This commit is contained in:
alexey.lysiuk 2018-03-20 10:13:10 +02:00
parent b0c96ac43d
commit 568d439c24
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/textures/textures.h
View file

@ -225,14 +225,12 @@ public:
}; };
// Returns a single column of the texture // Returns a single column of the texture
virtual const uint8_t *GetColumn(unsigned int column, const Span **spans_out) = delete;
virtual const uint8_t *GetColumn(FRenderStyle style, unsigned int column, const Span **spans_out) = 0; virtual const uint8_t *GetColumn(FRenderStyle style, unsigned int column, const Span **spans_out) = 0;
// Returns a single column of the texture, in BGRA8 format // Returns a single column of the texture, in BGRA8 format
virtual const uint32_t *GetColumnBgra(unsigned int column, const Span **spans_out); virtual const uint32_t *GetColumnBgra(unsigned int column, const Span **spans_out);
// Returns the whole texture, stored in column-major order // Returns the whole texture, stored in column-major order
virtual const uint8_t *GetPixels() = delete;
virtual const uint8_t *GetPixels(FRenderStyle style) = 0; virtual const uint8_t *GetPixels(FRenderStyle style) = 0;
// Returns the whole texture, stored in column-major order, in BGRA8 format // Returns the whole texture, stored in column-major order, in BGRA8 format
@ -595,7 +593,6 @@ protected:
const uint8_t *GetColumn(FRenderStyle style, unsigned int column, const Span **spans_out) override; const uint8_t *GetColumn(FRenderStyle style, unsigned int column, const Span **spans_out) override;
const uint8_t *GetPixels(FRenderStyle style) override; const uint8_t *GetPixels(FRenderStyle style) override;
void Unload() override; void Unload() override;
virtual void MakeTexture() = delete;
virtual uint8_t *MakeTexture(FRenderStyle style) = 0; virtual uint8_t *MakeTexture(FRenderStyle style) = 0;
void FreeAllSpans(); void FreeAllSpans();
}; };