summaryrefslogtreecommitdiffstats
path: root/RenderScript/include
diff options
context:
space:
mode:
authorEgor Yusov <egor.yusov@gmail.com>2017-05-20 21:04:35 +0000
committerEgor Yusov <egor.yusov@gmail.com>2017-05-20 21:04:35 +0000
commit4ea98db3d965f37f0fa90609c1c2671f3d959c50 (patch)
treecbba85e27721f787370ad60fb3f64d55724604cd /RenderScript/include
parentResolved conflict (diff)
downloadDiligentTools-4ea98db3d965f37f0fa90609c1c2671f3d959c50.tar.gz
DiligentTools-4ea98db3d965f37f0fa90609c1c2671f3d959c50.zip
Merge from dev branch
Diffstat (limited to 'RenderScript/include')
-rw-r--r--RenderScript/include/BlendStateDescParser.h2
-rw-r--r--RenderScript/include/BufferParser.h2
-rw-r--r--RenderScript/include/BufferViewParser.h2
-rw-r--r--RenderScript/include/ClassMethodBinding.h2
-rw-r--r--RenderScript/include/ConvenienceFunctions.h2
-rw-r--r--RenderScript/include/Debug.h2
-rw-r--r--RenderScript/include/DepthStencilStateDescParser.h2
-rw-r--r--RenderScript/include/DeviceContextFuncBindings.h2
-rw-r--r--RenderScript/include/DrawAttribsParser.h2
-rw-r--r--RenderScript/include/EngineObjectParserBase.h2
-rw-r--r--RenderScript/include/EngineObjectParserCommon.h2
-rw-r--r--RenderScript/include/EnumMappings.h2
-rw-r--r--RenderScript/include/InputLayoutDescParser.h2
-rw-r--r--RenderScript/include/LuaBindings.h2
-rw-r--r--RenderScript/include/LuaFunctionBinding.h2
-rw-r--r--RenderScript/include/LuaWrappers.h2
-rw-r--r--RenderScript/include/PSODescParser.h2
-rw-r--r--RenderScript/include/ParsingErrors.h2
-rw-r--r--RenderScript/include/RasterizerStateDescParser.h2
-rw-r--r--RenderScript/include/ResourceMappingParser.h2
-rw-r--r--RenderScript/include/SamplerParser.h2
-rw-r--r--RenderScript/include/ScissorRectParser.h2
-rw-r--r--RenderScript/include/ScriptParser.h2
-rw-r--r--RenderScript/include/ShaderParser.h2
-rw-r--r--RenderScript/include/ShaderResourceBindingParser.h2
-rw-r--r--RenderScript/include/ShaderVariableParser.h2
-rw-r--r--RenderScript/include/TextureParser.h2
-rw-r--r--RenderScript/include/TextureViewParser.h2
-rw-r--r--RenderScript/include/ViewportParser.h2
-rw-r--r--RenderScript/include/pch.h2
30 files changed, 30 insertions, 30 deletions
diff --git a/RenderScript/include/BlendStateDescParser.h b/RenderScript/include/BlendStateDescParser.h
index 59f5664..fb89c7f 100644
--- a/RenderScript/include/BlendStateDescParser.h
+++ b/RenderScript/include/BlendStateDescParser.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/RenderScript/include/BufferParser.h b/RenderScript/include/BufferParser.h
index e375d19..77a5fe6 100644
--- a/RenderScript/include/BufferParser.h
+++ b/RenderScript/include/BufferParser.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/RenderScript/include/BufferViewParser.h b/RenderScript/include/BufferViewParser.h
index 03e6b10..a083569 100644
--- a/RenderScript/include/BufferViewParser.h
+++ b/RenderScript/include/BufferViewParser.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/RenderScript/include/ClassMethodBinding.h b/RenderScript/include/ClassMethodBinding.h
index 141261a..aa14b80 100644
--- a/RenderScript/include/ClassMethodBinding.h
+++ b/RenderScript/include/ClassMethodBinding.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/RenderScript/include/ConvenienceFunctions.h b/RenderScript/include/ConvenienceFunctions.h
index 23a08f4..334f4c9 100644
--- a/RenderScript/include/ConvenienceFunctions.h
+++ b/RenderScript/include/ConvenienceFunctions.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/RenderScript/include/Debug.h b/RenderScript/include/Debug.h
index cd19f10..5c22fda 100644
--- a/RenderScript/include/Debug.h
+++ b/RenderScript/include/Debug.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/RenderScript/include/DepthStencilStateDescParser.h b/RenderScript/include/DepthStencilStateDescParser.h
index 340d05e..5176daa 100644
--- a/RenderScript/include/DepthStencilStateDescParser.h
+++ b/RenderScript/include/DepthStencilStateDescParser.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/RenderScript/include/DeviceContextFuncBindings.h b/RenderScript/include/DeviceContextFuncBindings.h
index a03c3f0..2d1d4da 100644
--- a/RenderScript/include/DeviceContextFuncBindings.h
+++ b/RenderScript/include/DeviceContextFuncBindings.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/RenderScript/include/DrawAttribsParser.h b/RenderScript/include/DrawAttribsParser.h
index 88da020..e8f27ea 100644
--- a/RenderScript/include/DrawAttribsParser.h
+++ b/RenderScript/include/DrawAttribsParser.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/RenderScript/include/EngineObjectParserBase.h b/RenderScript/include/EngineObjectParserBase.h
index 7e0265c..f35a029 100644
--- a/RenderScript/include/EngineObjectParserBase.h
+++ b/RenderScript/include/EngineObjectParserBase.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/RenderScript/include/EngineObjectParserCommon.h b/RenderScript/include/EngineObjectParserCommon.h
index dfef174..fad07fc 100644
--- a/RenderScript/include/EngineObjectParserCommon.h
+++ b/RenderScript/include/EngineObjectParserCommon.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/RenderScript/include/EnumMappings.h b/RenderScript/include/EnumMappings.h
index bc8c76c..4f80b36 100644
--- a/RenderScript/include/EnumMappings.h
+++ b/RenderScript/include/EnumMappings.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/RenderScript/include/InputLayoutDescParser.h b/RenderScript/include/InputLayoutDescParser.h
index 2da56ca..f6d6773 100644
--- a/RenderScript/include/InputLayoutDescParser.h
+++ b/RenderScript/include/InputLayoutDescParser.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/RenderScript/include/LuaBindings.h b/RenderScript/include/LuaBindings.h
index 2799bd1..19df66c 100644
--- a/RenderScript/include/LuaBindings.h
+++ b/RenderScript/include/LuaBindings.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/RenderScript/include/LuaFunctionBinding.h b/RenderScript/include/LuaFunctionBinding.h
index 863becd..8ab0fd2 100644
--- a/RenderScript/include/LuaFunctionBinding.h
+++ b/RenderScript/include/LuaFunctionBinding.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/RenderScript/include/LuaWrappers.h b/RenderScript/include/LuaWrappers.h
index bf7d653..1fd3ee7 100644
--- a/RenderScript/include/LuaWrappers.h
+++ b/RenderScript/include/LuaWrappers.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/RenderScript/include/PSODescParser.h b/RenderScript/include/PSODescParser.h
index 01d8fc8..1d223ce 100644
--- a/RenderScript/include/PSODescParser.h
+++ b/RenderScript/include/PSODescParser.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/RenderScript/include/ParsingErrors.h b/RenderScript/include/ParsingErrors.h
index 8ca794b..d0944a2 100644
--- a/RenderScript/include/ParsingErrors.h
+++ b/RenderScript/include/ParsingErrors.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/RenderScript/include/RasterizerStateDescParser.h b/RenderScript/include/RasterizerStateDescParser.h
index 78a0023..a4bf220 100644
--- a/RenderScript/include/RasterizerStateDescParser.h
+++ b/RenderScript/include/RasterizerStateDescParser.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/RenderScript/include/ResourceMappingParser.h b/RenderScript/include/ResourceMappingParser.h
index 8be5f0a..4927617 100644
--- a/RenderScript/include/ResourceMappingParser.h
+++ b/RenderScript/include/ResourceMappingParser.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/RenderScript/include/SamplerParser.h b/RenderScript/include/SamplerParser.h
index c3f0eb6..b0199ee 100644
--- a/RenderScript/include/SamplerParser.h
+++ b/RenderScript/include/SamplerParser.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/RenderScript/include/ScissorRectParser.h b/RenderScript/include/ScissorRectParser.h
index e33544b..96da48f 100644
--- a/RenderScript/include/ScissorRectParser.h
+++ b/RenderScript/include/ScissorRectParser.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/RenderScript/include/ScriptParser.h b/RenderScript/include/ScriptParser.h
index 93d47d1..828a945 100644
--- a/RenderScript/include/ScriptParser.h
+++ b/RenderScript/include/ScriptParser.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/RenderScript/include/ShaderParser.h b/RenderScript/include/ShaderParser.h
index fdfb3da..a1df356 100644
--- a/RenderScript/include/ShaderParser.h
+++ b/RenderScript/include/ShaderParser.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/RenderScript/include/ShaderResourceBindingParser.h b/RenderScript/include/ShaderResourceBindingParser.h
index 281ac54..066b9b3 100644
--- a/RenderScript/include/ShaderResourceBindingParser.h
+++ b/RenderScript/include/ShaderResourceBindingParser.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/RenderScript/include/ShaderVariableParser.h b/RenderScript/include/ShaderVariableParser.h
index 5641939..91039cd 100644
--- a/RenderScript/include/ShaderVariableParser.h
+++ b/RenderScript/include/ShaderVariableParser.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/RenderScript/include/TextureParser.h b/RenderScript/include/TextureParser.h
index 20aea0e..17a6a84 100644
--- a/RenderScript/include/TextureParser.h
+++ b/RenderScript/include/TextureParser.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/RenderScript/include/TextureViewParser.h b/RenderScript/include/TextureViewParser.h
index 3ea135e..e8fba7e 100644
--- a/RenderScript/include/TextureViewParser.h
+++ b/RenderScript/include/TextureViewParser.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/RenderScript/include/ViewportParser.h b/RenderScript/include/ViewportParser.h
index 9633f5e..39aa1ab 100644
--- a/RenderScript/include/ViewportParser.h
+++ b/RenderScript/include/ViewportParser.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/RenderScript/include/pch.h b/RenderScript/include/pch.h
index 86aa6a5..eec1e6d 100644
--- a/RenderScript/include/pch.h
+++ b/RenderScript/include/pch.h
@@ -1,4 +1,4 @@
-/* Copyright 2015-2016 Egor Yusov
+/* Copyright 2015-2017 Egor Yusov
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.