DirectXTex: 2D & 3D linear and cubic filtering with optional mirror/wrap vs. clamp

DirectXTex/DirectXTex.h

@@ -370,7 +370,15 @@ namespace DirectX
     {
         TEX_FILTER_DEFAULT          = 0,
 
-        // Clamp filtering only
+        TEX_FILTER_WRAP_U           = 0x1,
+        TEX_FILTER_WRAP_V           = 0x2,
+        TEX_FILTER_WRAP_W           = 0x4,
+        TEX_FILTER_WRAP             = ( TEX_FILTER_WRAP_U | TEX_FILTER_WRAP_V | TEX_FILTER_WRAP_W ),
+        TEX_FILTER_MIRROR_U         = 0x10,
+        TEX_FILTER_MIRROR_V         = 0x20,
+        TEX_FILTER_MIRROR_W         = 0x40,
+        TEX_FILTER_MIRROR          = ( TEX_FILTER_MIRROR_U | TEX_FILTER_MIRROR_V | TEX_FILTER_MIRROR_W ),
+            // Wrap vs. Mirror vs. Clamp filtering options
 
         TEX_FILTER_SEPARATE_ALPHA   = 0x100,
             // Resize color and alpha channel independently
@@ -395,7 +403,7 @@ namespace DirectX
 
         TEX_FILTER_SRGB_IN          = 0x1000000,
         TEX_FILTER_SRGB_OUT         = 0x2000000,
-        TEX_FILTER_SRGB             = 0x3000000,
+        TEX_FILTER_SRGB             = ( TEX_FILTER_SRGB_IN | TEX_FILTER_SRGB_OUT ),
             // sRGB <-> RGB for use in conversion operations
             // if the input format type is IsSRGB(), then SRGB_IN is on by default
             // if the output format type is IsSRGB(), then SRGB_OUT is on by default

DirectXTex/DirectXTex_Desktop_2010.vcxproj

@@ -389,6 +389,7 @@
     <ClCompile Include="BC4BC5.cpp" />
     <ClCompile Include="BC6HBC7.cpp" />
     <CLInclude Include="DDS.h" />
+    <CLInclude Include="filters.h" />
     <CLInclude Include="scoped.h" />
     <CLInclude Include="DirectXTex.h" />
     <CLInclude Include="DirectXTexp.h" />

DirectXTex/DirectXTex_Desktop_2010.vcxproj.filters

@@ -13,6 +13,7 @@
       <ClCompile Include="BC4BC5.cpp" />
       <ClCompile Include="BC6HBC7.cpp" />
       <CLInclude Include="DDS.h" />
+      <ClInclude Include="filters.h" />
       <CLInclude Include="scoped.h" />
       <CLInclude Include="DirectXTex.h" /> 
       <CLInclude Include="DirectXTexp.h" /> 

DirectXTex/DirectXTex_Desktop_2010_SDK80.vcxproj

@@ -371,6 +371,7 @@
     <ClCompile Include="BC4BC5.cpp" />
     <ClCompile Include="BC6HBC7.cpp" />
     <CLInclude Include="DDS.h" />
+    <CLInclude Include="filters.h" />
     <CLInclude Include="scoped.h" />
     <CLInclude Include="DirectXTex.h" />
     <CLInclude Include="DirectXTexp.h" />

DirectXTex/DirectXTex_Desktop_2010_SDK80.vcxproj.filters

@@ -13,6 +13,7 @@
       <ClCompile Include="BC4BC5.cpp" />
       <ClCompile Include="BC6HBC7.cpp" />
       <CLInclude Include="DDS.h" />
+      <ClInclude Include="filters.h" />
       <CLInclude Include="scoped.h" />
       <CLInclude Include="DirectXTex.h" /> 
       <CLInclude Include="DirectXTexp.h" /> 

DirectXTex/DirectXTex_Desktop_2012.vcxproj

@@ -390,6 +390,7 @@
     <ClCompile Include="BC4BC5.cpp" />
     <ClCompile Include="BC6HBC7.cpp" />
     <CLInclude Include="DDS.h" />
+    <ClInclude Include="filters.h" />
     <CLInclude Include="scoped.h" />
     <CLInclude Include="DirectXTex.h" />
     <CLInclude Include="DirectXTexp.h" />

DirectXTex/DirectXTex_Desktop_2012.vcxproj.filters

@@ -1,38 +1,41 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns:atg="http://atg.xbox.com" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-<ItemGroup>
-<Filter Include="Resource Files">
-<UniqueIdentifier>{8e114980-c1a3-4ada-ad7c-83caadf5daeb}</UniqueIdentifier>
-<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
-</Filter>
-</ItemGroup>
-<ItemGroup />
-<ItemGroup>
-      <CLInclude Include="BC.h" />
-      <ClCompile Include="BC.cpp" />
-      <ClCompile Include="BC4BC5.cpp" />
-      <ClCompile Include="BC6HBC7.cpp" />
-      <CLInclude Include="DDS.h" />
-      <CLInclude Include="scoped.h" />
-      <CLInclude Include="DirectXTex.h" /> 
-      <CLInclude Include="DirectXTexp.h" /> 
-      <CLInclude Include="DirectXTex.inl" />
-      <ClCompile Include="DirectXTexCompress.cpp" />
-      <ClCompile Include="DirectXTexConvert.cpp" />
-      <ClCompile Include="DirectXTexD3D11.cpp" />
-      <ClCompile Include="DirectXTexDDS.cpp" />
-      <ClCompile Include="DirectXTexFlipRotate.cpp" />
-      <ClCompile Include="DirectXTexImage.cpp" />
-      <ClCompile Include="DirectXTexMipMaps.cpp" />
-      <ClCompile Include="DirectXTexMisc.cpp" />
-      <ClCompile Include="DirectXTexNormalMaps.cpp" />
-      <ClCompile Include="DirectXTexPMAlpha.cpp" />
-      <ClCompile Include="DirectXTexResize.cpp" />
-      <ClCompile Include="DirectXTexTGA.cpp" />
-      <ClCompile Include="DirectXTexUtil.cpp" />
-      <ClCompile Include="DirectXTexWIC.cpp" />
+  <ItemGroup>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{8e114980-c1a3-4ada-ad7c-83caadf5daeb}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions>
+    </Filter>
   </ItemGroup>
-<ItemGroup></ItemGroup>
-<ItemGroup></ItemGroup>
-<ItemGroup></ItemGroup>
-</Project>
+  <ItemGroup>
+    <CLInclude Include="BC.h" />
+    <ClCompile Include="BC.cpp" />
+    <ClCompile Include="BC4BC5.cpp" />
+    <ClCompile Include="BC6HBC7.cpp" />
+    <CLInclude Include="DDS.h" />
+    <ClInclude Include="filters.h" />
+    <CLInclude Include="scoped.h" />
+    <CLInclude Include="DirectXTex.h" />
+    <CLInclude Include="DirectXTexp.h" />
+    <CLInclude Include="DirectXTex.inl" />
+    <ClCompile Include="DirectXTexCompress.cpp" />
+    <ClCompile Include="DirectXTexConvert.cpp" />
+    <ClCompile Include="DirectXTexD3D11.cpp" />
+    <ClCompile Include="DirectXTexDDS.cpp" />
+    <ClCompile Include="DirectXTexFlipRotate.cpp" />
+    <ClCompile Include="DirectXTexImage.cpp" />
+    <ClCompile Include="DirectXTexMipMaps.cpp" />
+    <ClCompile Include="DirectXTexMisc.cpp" />
+    <ClCompile Include="DirectXTexNormalMaps.cpp" />
+    <ClCompile Include="DirectXTexPMAlpha.cpp" />
+    <ClCompile Include="DirectXTexResize.cpp" />
+    <ClCompile Include="DirectXTexTGA.cpp" />
+    <ClCompile Include="DirectXTexUtil.cpp" />
+    <ClCompile Include="DirectXTexWIC.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+  <ItemGroup>
+  </ItemGroup>
+</Project>

DirectXTex/DirectXTex_Windows8.vcxproj

@@ -599,6 +599,7 @@
     <ClCompile Include="BC4BC5.cpp" />
     <ClCompile Include="BC6HBC7.cpp" />
     <CLInclude Include="DDS.h" />
+    <CLInclude Include="filters.h" />
     <CLInclude Include="scoped.h" />
     <CLInclude Include="DirectXTex.h" />
     <CLInclude Include="DirectXTexp.h" />

DirectXTex/DirectXTex_Windows8.vcxproj.filters

@@ -13,6 +13,7 @@
       <ClCompile Include="BC4BC5.cpp" />
       <ClCompile Include="BC6HBC7.cpp" />
       <CLInclude Include="DDS.h" />
+      <ClInclude Include="filters.h" />
       <CLInclude Include="scoped.h" />
       <CLInclude Include="DirectXTex.h" /> 
       <CLInclude Include="DirectXTexp.h" />