From 8077ddaf62bdbff2169973eca565a5752501587d Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Fri, 19 Aug 2016 23:38:41 -0700 Subject: Updated to Diligent Engine 2.0 --- RenderScript/include/EnumMappings.h | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'RenderScript/include/EnumMappings.h') diff --git a/RenderScript/include/EnumMappings.h b/RenderScript/include/EnumMappings.h index 6b61161..bc8c76c 100644 --- a/RenderScript/include/EnumMappings.h +++ b/RenderScript/include/EnumMappings.h @@ -1,4 +1,4 @@ -/* Copyright 2015 Egor Yusov +/* Copyright 2015-2016 Egor Yusov * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,7 +36,7 @@ template<>struct hash \ namespace std { - DEFINE_ENUM_HASH( Diligent::TEXTURE_TYPE ) + DEFINE_ENUM_HASH( Diligent::RESOURCE_DIMENSION ) DEFINE_ENUM_HASH( Diligent::TEXTURE_FORMAT ) DEFINE_ENUM_HASH( Diligent::VALUE_TYPE ) DEFINE_ENUM_HASH( Diligent::USAGE ) @@ -46,6 +46,7 @@ namespace std DEFINE_ENUM_HASH( Diligent::CPU_ACCESS_FLAG ) DEFINE_ENUM_HASH( Diligent::COMPARISON_FUNCTION ) DEFINE_ENUM_HASH( Diligent::BIND_SHADER_RESOURCES_FLAGS ) + DEFINE_ENUM_HASH( Diligent::SHADER_TYPE ) } namespace Diligent @@ -82,10 +83,10 @@ namespace Diligent TextureFormatEnumMapping(); }; - class TextureTypeEnumMapping : public EnumMapping < Diligent::TEXTURE_TYPE > + class ResourceDimEnumMapping : public EnumMapping < Diligent::RESOURCE_DIMENSION > { public: - TextureTypeEnumMapping(); + ResourceDimEnumMapping(); }; class ValueTypeEnumMapping : public EnumMapping < Diligent::VALUE_TYPE > @@ -105,4 +106,10 @@ namespace Diligent public: BindShaderResourcesFlagEnumMapping(); }; + + class ShaderTypeEnumMapping : public EnumMapping + { + public: + ShaderTypeEnumMapping(); + }; } -- cgit v1.2.3