summaryrefslogtreecommitdiffstats
path: root/RenderScript
diff options
context:
space:
mode:
authorEgor Yusov <egor.yusov@gmail.com>2018-12-28 21:44:09 +0000
committerEgor Yusov <egor.yusov@gmail.com>2018-12-28 21:44:09 +0000
commit93f9d3d462d52294f7ab918c39cdfc03c6838b0b (patch)
tree1e0d9bdcd92473015d8fa1b124c26ab24184d291 /RenderScript
parentFixed clang warning (diff)
downloadDiligentTools-93f9d3d462d52294f7ab918c39cdfc03c6838b0b.tar.gz
DiligentTools-93f9d3d462d52294f7ab918c39cdfc03c6838b0b.zip
Fixed clang build warnings re overridden virtual functions
Diffstat (limited to 'RenderScript')
-rw-r--r--RenderScript/include/BufferParser.h4
-rw-r--r--RenderScript/include/BufferViewParser.h4
-rw-r--r--RenderScript/include/DrawAttribsParser.h12
-rw-r--r--RenderScript/include/PSODescParser.h6
-rw-r--r--RenderScript/include/RasterizerStateDescParser.h6
-rw-r--r--RenderScript/include/ResourceMappingParser.h14
-rw-r--r--RenderScript/include/SamplerParser.h6
-rw-r--r--RenderScript/include/ScissorRectParser.h12
-rw-r--r--RenderScript/include/ShaderParser.h6
-rw-r--r--RenderScript/include/ShaderResourceBindingParser.h14
-rw-r--r--RenderScript/include/ShaderVariableParser.h14
-rw-r--r--RenderScript/include/TextureParser.h8
-rw-r--r--RenderScript/include/TextureViewParser.h4
-rw-r--r--RenderScript/include/ViewportParser.h12
14 files changed, 61 insertions, 61 deletions
diff --git a/RenderScript/include/BufferParser.h b/RenderScript/include/BufferParser.h
index be96d4d..6576783 100644
--- a/RenderScript/include/BufferParser.h
+++ b/RenderScript/include/BufferParser.h
@@ -36,14 +36,14 @@ namespace std
namespace Diligent
{
- class BufferParser : public EngineObjectParserCommon<IBuffer>
+ class BufferParser final : public EngineObjectParserCommon<IBuffer>
{
public:
BufferParser( IRenderDevice *pRenderDevice, lua_State *L );
static const Char* BufferLibName;
protected:
- virtual void CreateObj( lua_State *L );
+ virtual void CreateObj( lua_State *L )override final;
private:
// BufferDesc structure does not provide storage for the Name field.
diff --git a/RenderScript/include/BufferViewParser.h b/RenderScript/include/BufferViewParser.h
index 6e16b94..0d2e906 100644
--- a/RenderScript/include/BufferViewParser.h
+++ b/RenderScript/include/BufferViewParser.h
@@ -35,14 +35,14 @@ namespace std
namespace Diligent
{
- class BufferViewParser : public EngineObjectParserCommon<IBufferView>
+ class BufferViewParser final : public EngineObjectParserCommon<IBufferView>
{
public:
BufferViewParser( class BufferParser *pBufParser, IRenderDevice *pRenderDevice, lua_State *L );
static const Char *BufferViewLibName;
protected:
- virtual void CreateObj( lua_State *L );
+ virtual void CreateObj( lua_State *L )override final;
private:
// BufferViewDesc structure does not provide storage for the Name field.
diff --git a/RenderScript/include/DrawAttribsParser.h b/RenderScript/include/DrawAttribsParser.h
index 924a3e6..f9c538e 100644
--- a/RenderScript/include/DrawAttribsParser.h
+++ b/RenderScript/include/DrawAttribsParser.h
@@ -35,18 +35,18 @@ namespace std
namespace Diligent
{
- class DrawAttribsParser : public EngineObjectParserBase
+ class DrawAttribsParser final : public EngineObjectParserBase
{
public:
DrawAttribsParser( class BufferParser *pBuffParser, IRenderDevice *pRenderDevice, lua_State *L );
static const Char* DrawAttribsLibName;
protected:
- virtual void CreateObj( lua_State *L );
- virtual void DestroyObj( void *pData );
- virtual void ReadField( lua_State *L, void *pData, const Char *Field );
- virtual void UpdateField( lua_State *L, void *pData, const Char *Field );
- virtual void PushExistingObject( lua_State *L, const void *pObject );
+ virtual void CreateObj( lua_State *L )override final;
+ virtual void DestroyObj( void *pData )override final;
+ virtual void ReadField( lua_State *L, void *pData, const Char *Field )override final;
+ virtual void UpdateField( lua_State *L, void *pData, const Char *Field )override final;
+ virtual void PushExistingObject( lua_State *L, const void *pObject )override final;
private:
int Draw( lua_State * );
diff --git a/RenderScript/include/PSODescParser.h b/RenderScript/include/PSODescParser.h
index 8d732af..be67fed 100644
--- a/RenderScript/include/PSODescParser.h
+++ b/RenderScript/include/PSODescParser.h
@@ -31,15 +31,15 @@
namespace Diligent
{
- class PSODescParser : public EngineObjectParserCommon<IPipelineState>
+ class PSODescParser final : public EngineObjectParserCommon<IPipelineState>
{
public:
PSODescParser( IRenderDevice *pRenderDevice, lua_State *L );
static const Char* PSODescLibName;
protected:
- virtual void CreateObj( lua_State *L );
-
+ virtual void CreateObj( lua_State *L )override final;
+
private:
// PipelineStateDesc structure does not provide storage for the Name field.
// We need to use ObjectDescWrapper<> to be able to store the field.
diff --git a/RenderScript/include/RasterizerStateDescParser.h b/RenderScript/include/RasterizerStateDescParser.h
index 46dfdcc..d25d308 100644
--- a/RenderScript/include/RasterizerStateDescParser.h
+++ b/RenderScript/include/RasterizerStateDescParser.h
@@ -35,12 +35,12 @@ namespace std
namespace Diligent
{
template<>
- class MemberBinder<RasterizerStateDesc> : public MemberBinderBase
+ class MemberBinder<RasterizerStateDesc> final : public MemberBinderBase
{
public:
MemberBinder( size_t MemberOffset, size_t Dummy ) ;
- virtual void GetValue( lua_State *L, const void* pBasePointer )override;
- virtual void SetValue( lua_State *L, int Index, void* pBasePointer )override;
+ virtual void GetValue( lua_State *L, const void* pBasePointer )override final;
+ virtual void SetValue( lua_State *L, int Index, void* pBasePointer )override final;
private:
BindingsMapType m_Bindings;
diff --git a/RenderScript/include/ResourceMappingParser.h b/RenderScript/include/ResourceMappingParser.h
index 337cd7b..e831373 100644
--- a/RenderScript/include/ResourceMappingParser.h
+++ b/RenderScript/include/ResourceMappingParser.h
@@ -30,25 +30,25 @@
namespace Diligent
{
- class ResourceMappingParser : public EngineObjectParserBase
+ class ResourceMappingParser final : public EngineObjectParserBase
{
public:
ResourceMappingParser( IRenderDevice *pRenderDevice, lua_State *L,
class TextureViewParser *pTexViewParser,
class BufferParser *pBuffParser,
class BufferViewParser *pBuffViewParser );
- virtual void GetObjectByName( lua_State *L, const Char *ShaderName, IResourceMapping** ppObject );
+ void GetObjectByName( lua_State *L, const Char *ShaderName, IResourceMapping** ppObject );
static const Char* ResourceMappingLibName;
protected:
- virtual void CreateObj( lua_State *L );
- virtual void ReadField( lua_State *L, void *pData, const Char *Field );
- virtual void UpdateField( lua_State *L, void *pData, const Char *Field );
+ virtual void CreateObj( lua_State *L )override final;
+ virtual void ReadField( lua_State *L, void *pData, const Char *Field )override final;
+ virtual void UpdateField( lua_State *L, void *pData, const Char *Field )override final;
private:
- virtual void PushExistingObject( lua_State *L, const void *pObject );
- virtual void DestroyObj( void *pData );
+ virtual void PushExistingObject( lua_State *L, const void *pObject )override final;
+ virtual void DestroyObj( void *pData )override final;
BindingsMapType m_Bindings;
diff --git a/RenderScript/include/SamplerParser.h b/RenderScript/include/SamplerParser.h
index 3cc5dc3..2b438da 100644
--- a/RenderScript/include/SamplerParser.h
+++ b/RenderScript/include/SamplerParser.h
@@ -61,7 +61,7 @@ namespace Diligent
DEFINE_ENUM_BINDER( Bindings, StructType, MagFilter, FilterTypeEnumMapping );
DEFINE_ENUM_BINDER( Bindings, StructType, MipFilter, FilterTypeEnumMapping );
-
+
DEFINE_ENUM_ELEMENT_MAPPING( TexAddrModeEnumMapping, TEXTURE_ADDRESS_WRAP );
DEFINE_ENUM_ELEMENT_MAPPING( TexAddrModeEnumMapping, TEXTURE_ADDRESS_MIRROR );
DEFINE_ENUM_ELEMENT_MAPPING( TexAddrModeEnumMapping, TEXTURE_ADDRESS_CLAMP );
@@ -88,14 +88,14 @@ namespace Diligent
DEFINE_BINDER( Bindings, StructType, MaxLOD );
}
- class SamplerParser : public EngineObjectParserCommon<ISampler>
+ class SamplerParser final : public EngineObjectParserCommon<ISampler>
{
public:
SamplerParser( IRenderDevice *pRenderDevice, lua_State *L );
static const Char* SamplerLibName;
protected:
- virtual void CreateObj( lua_State *L );
+ virtual void CreateObj( lua_State *L )override final;
private:
// SamplerDesc structure does not provide storage for the Name field.
diff --git a/RenderScript/include/ScissorRectParser.h b/RenderScript/include/ScissorRectParser.h
index de855a5..dd9c865 100644
--- a/RenderScript/include/ScissorRectParser.h
+++ b/RenderScript/include/ScissorRectParser.h
@@ -30,18 +30,18 @@
namespace Diligent
{
- class ScissorRectParser : public EngineObjectParserBase
+ class ScissorRectParser final : public EngineObjectParserBase
{
public:
ScissorRectParser( IRenderDevice *pRenderDevice, lua_State *L );
static const Char* ScissorRectLibName;
protected:
- virtual void CreateObj( lua_State *L );
- virtual void DestroyObj( void *pData );
- virtual void ReadField( lua_State *L, void *pData, const Char *Field );
- virtual void UpdateField( lua_State *L, void *pData, const Char *Field );
- virtual void PushExistingObject( lua_State *L, const void *pObject );
+ virtual void CreateObj( lua_State *L )override final;
+ virtual void DestroyObj( void *pData )override final;
+ virtual void ReadField( lua_State *L, void *pData, const Char *Field )override final;
+ virtual void UpdateField( lua_State *L, void *pData, const Char *Field )override final;
+ virtual void PushExistingObject( lua_State *L, const void *pObject )override final;
private:
int SetScissorRects( lua_State * );
diff --git a/RenderScript/include/ShaderParser.h b/RenderScript/include/ShaderParser.h
index 4af5f98..fcd74e2 100644
--- a/RenderScript/include/ShaderParser.h
+++ b/RenderScript/include/ShaderParser.h
@@ -36,7 +36,7 @@ namespace std
namespace Diligent
{
- class ShaderParser : public EngineObjectParserCommon<IShader>
+ class ShaderParser final : public EngineObjectParserCommon<IShader>
{
public:
ShaderParser( IRenderDevice *pRenderDevice, lua_State *L, const String& ResMappingMetatableName);
@@ -61,8 +61,8 @@ namespace Diligent
};
protected:
- virtual void CreateObj( lua_State *L );
- virtual void ReadField( lua_State *L, void *pData, const Char *Field );
+ virtual void CreateObj( lua_State *L )override final;
+ virtual void ReadField( lua_State *L, void *pData, const Char *Field )override final;
private:
diff --git a/RenderScript/include/ShaderResourceBindingParser.h b/RenderScript/include/ShaderResourceBindingParser.h
index 9785c78..e4c61df 100644
--- a/RenderScript/include/ShaderResourceBindingParser.h
+++ b/RenderScript/include/ShaderResourceBindingParser.h
@@ -31,7 +31,7 @@
namespace Diligent
{
- class ShaderResourceBindingParser : public EngineObjectParserBase
+ class ShaderResourceBindingParser final : public EngineObjectParserBase
{
public:
ShaderResourceBindingParser( IRenderDevice *pRenderDevice, lua_State *L,
@@ -40,14 +40,14 @@ namespace Diligent
const String &ShaderVarMetatableRegistryName);
static const Char* ShaderResourceBindingLibName;
- virtual void GetObjectByName( lua_State *L, const Char *ShaderName, IShaderResourceBinding** ppObject );
+ void GetObjectByName( lua_State *L, const Char *ShaderName, IShaderResourceBinding** ppObject );
protected:
- virtual void CreateObj( lua_State *L );
- virtual void DestroyObj( void *pData );
- virtual void ReadField( lua_State *L, void *pData, const Char *Field );
- virtual void UpdateField( lua_State *L, void *pData, const Char *Field );
- virtual void PushExistingObject( lua_State *L, const void *pObject );
+ virtual void CreateObj( lua_State *L )override final;
+ virtual void DestroyObj( void *pData )override final;
+ virtual void ReadField( lua_State *L, void *pData, const Char *Field )override final;
+ virtual void UpdateField( lua_State *L, void *pData, const Char *Field )override final;
+ virtual void PushExistingObject( lua_State *L, const void *pObject )override final;
private:
String m_PSOLibMetatableName;
diff --git a/RenderScript/include/ShaderVariableParser.h b/RenderScript/include/ShaderVariableParser.h
index f974648..c537122 100644
--- a/RenderScript/include/ShaderVariableParser.h
+++ b/RenderScript/include/ShaderVariableParser.h
@@ -31,7 +31,7 @@
namespace Diligent
{
- class ShaderVariableParser : public EngineObjectParserBase
+ class ShaderVariableParser final : public EngineObjectParserBase
{
public:
ShaderVariableParser( IRenderDevice *pRenderDevice, lua_State *L,
@@ -41,14 +41,14 @@ namespace Diligent
const String &TexViewMetatableName );
static const Char* ShaderVariableLibName;
- virtual void GetObjectByName( lua_State *L, const Char *ShaderName, IShaderVariable** ppObject );
+ void GetObjectByName( lua_State *L, const Char *ShaderName, IShaderVariable** ppObject );
protected:
- virtual void CreateObj( lua_State *L );
- virtual void DestroyObj( void *pData );
- virtual void ReadField( lua_State *L, void *pData, const Char *Field );
- virtual void UpdateField( lua_State *L, void *pData, const Char *Field );
- virtual void PushExistingObject( lua_State *L, const void *pObject );
+ virtual void CreateObj( lua_State *L )override final;
+ virtual void DestroyObj( void *pData )override final;
+ virtual void ReadField( lua_State *L, void *pData, const Char *Field )override final;
+ virtual void UpdateField( lua_State *L, void *pData, const Char *Field )override final;
+ virtual void PushExistingObject( lua_State *L, const void *pObject )override final;
private:
const String m_ShaderLibMetatableName;
diff --git a/RenderScript/include/TextureParser.h b/RenderScript/include/TextureParser.h
index 0e0e542..f75b5ce 100644
--- a/RenderScript/include/TextureParser.h
+++ b/RenderScript/include/TextureParser.h
@@ -35,15 +35,15 @@ namespace std
namespace Diligent
{
- class TextureParser : public EngineObjectParserCommon<ITexture>
+ class TextureParser final : public EngineObjectParserCommon<ITexture>
{
public:
TextureParser( IRenderDevice *pRenderDevice, lua_State *L );
static const Char* TextureLibName;
protected:
- virtual void CreateObj( lua_State *L );
-
+ virtual void CreateObj( lua_State *L )override final;
+
private:
// TextureDesc structure does not provide storage for the Name field.
// We need to use ObjectDescWrapper<> to be able to store the field.
@@ -51,7 +51,7 @@ namespace Diligent
ResourceDimEnumMapping m_TexTypeEnumMapping;
TextureFormatEnumMapping m_TexFormatEnumMapping;
-
+
// Note that different bind flags are allowed for different objects,
// so we need to populate this enum with values suitable for textures only
EnumMapping<Diligent::BIND_FLAGS> m_BindFlagEnumMapping;
diff --git a/RenderScript/include/TextureViewParser.h b/RenderScript/include/TextureViewParser.h
index b4d77e0..521982a 100644
--- a/RenderScript/include/TextureViewParser.h
+++ b/RenderScript/include/TextureViewParser.h
@@ -36,14 +36,14 @@ namespace std
namespace Diligent
{
- class TextureViewParser : public EngineObjectParserCommon<ITextureView>
+ class TextureViewParser final : public EngineObjectParserCommon<ITextureView>
{
public:
TextureViewParser( class TextureParser *pTexParser, class SamplerParser *pSamplerParser, IRenderDevice *pRenderDevice, lua_State *L );
static const Char *TextureViewLibName;
protected:
- virtual void CreateObj( lua_State *L );
+ virtual void CreateObj( lua_State *L )override final;
private:
// TextureViewDesc structure does not provide storage for the Name field.
diff --git a/RenderScript/include/ViewportParser.h b/RenderScript/include/ViewportParser.h
index 861bace..e627d85 100644
--- a/RenderScript/include/ViewportParser.h
+++ b/RenderScript/include/ViewportParser.h
@@ -30,18 +30,18 @@
namespace Diligent
{
- class ViewportParser : public EngineObjectParserBase
+ class ViewportParser final : public EngineObjectParserBase
{
public:
ViewportParser( IRenderDevice *pRenderDevice, lua_State *L );
static const Char* ViewportLibName;
protected:
- virtual void CreateObj( lua_State *L );
- virtual void DestroyObj( void *pData );
- virtual void ReadField( lua_State *L, void *pData, const Char *Field );
- virtual void UpdateField( lua_State *L, void *pData, const Char *Field );
- virtual void PushExistingObject( lua_State *L, const void *pObject );
+ virtual void CreateObj( lua_State *L )override final;
+ virtual void DestroyObj( void *pData )override final;
+ virtual void ReadField( lua_State *L, void *pData, const Char *Field )override final;
+ virtual void UpdateField( lua_State *L, void *pData, const Char *Field )override final;
+ virtual void PushExistingObject( lua_State *L, const void *pObject )override final;
private:
int SetViewports( lua_State * );