Commit Graph

275 Commits

Author SHA1 Message Date
Chuck Walbourn
ab9fd446ee Minimized windows.h content 2016-04-24 20:28:04 -07:00
Chuck Walbourn
51e92d4e5d Use IID_PPV_ARGS macro 2016-04-18 14:45:56 -07:00
Chuck Walbourn
990b989be9 Removed DirectXMath adapter for the Windows 8.0 SDK 2016-03-22 16:12:08 -07:00
Chuck Walbourn
2b22bfed1c Cleaned up /analyze warnings with VS 2015 Update 2 2016-03-18 00:48:24 -07:00
Chuck Walbourn
a7ffe96b3e Optional callback from WIC readers to get additional metadata queries 2016-03-03 18:44:40 -08:00
Chuck Walbourn
c64466e096 Retired VS 2012 projects 2016-02-23 12:11:00 -08:00
Chuck Walbourn
db6e5a39c1 Added shaders to sln 2016-02-21 13:50:59 -08:00
Chuck Walbourn
ed8adb0c21 Minor code review 2016-02-19 22:10:04 -08:00
Chuck Walbourn
246bebc464 clean up image files on failed write 2016-02-10 14:11:05 -08:00
Chuck Walbourn
ac8c7d3c1e Updated for Windows SDK 10586 2015-11-30 16:32:30 -08:00
Chuck Walbourn
2d993b85f3 October 30, 2015 2015-10-30 10:42:04 -07:00
Chuck Walbourn
a121bc5c31 DDS support for legacy bumpmap formats D3DFMT_V8U8, D3DFMT_Q8W8V8U8, and D3DFMT_V16U16 2015-10-29 16:39:53 -07:00
Chuck Walbourn
231206104c Fixed overread errors in Compress (CPU) 2015-10-07 11:44:44 -07:00
Chuck Walbourn
e3d21fc8c6 Fixed problems with WIC1 codepaths 2015-08-19 18:00:26 -07:00
Chuck Walbourn
7093178481 Added Get/SetWICFactory 2015-08-18 16:14:09 -07:00
Chuck Walbourn
4a223dd8ad Updated for DXGI 1.3 types 2015-08-14 12:20:40 -07:00
Chuck Walbourn
225a8e3b64 Added Windows 10 SDK project 2015-08-13 18:08:35 -07:00
Chuck Walbourn
455c2f0915 Added VS 2015 projects for Xbox One XDK 2015-08-03 16:28:32 -07:00
Chuck Walbourn
87141aea99 Merged single set of solutions 2015-08-03 16:17:20 -07:00
Chuck Walbourn
361c7d9d7f Updated VS filters 2015-07-31 18:28:32 -07:00
Chuck Walbourn
15535d72ac July 29, 2015 2015-07-29 10:07:16 -07:00
Chuck Walbourn
88a6233651 Updated for Windows 10 SDK 10240 2015-07-27 11:30:42 -07:00
Chuck Walbourn
229b5ea528 Retired VS 2010 and Windows Store 8.0 projects 2015-07-27 10:54:07 -07:00
unknown
d7e19a28d3 Merge branch 'master' of https://github.com/Microsoft/DirectXTex 2015-07-09 15:39:40 -07:00
unknown
c12188a333 Minor code review fixes 2015-07-09 15:39:23 -07:00
Chuck Walbourn
847ab8940a Fixed round problem with 32-bit RGBA/BGRA formats 2015-07-07 14:25:48 -07:00
Chuck Walbourn
4332a15dda Fixed file length validation problem in LoadDDSFromFile 2015-06-18 16:14:10 -07:00
Chuck Walbourn
1167ebb9c7 DXGI_FORMAT_A8_UNORM is not compatible with DXGI_FORMAT_R8_TYPELESS 2015-05-20 14:17:44 -07:00
Chuck Walbourn
69190b2a7d Removed WPO setting for static library 2015-04-23 16:03:51 -07:00
Chuck Walbourn
429b3e7995 BC7 compressor optimization for skipping mode 0 & 2 by default 2015-04-22 13:31:37 -07:00
walbourn_cp
96b21d85e2 More VS 2015 projects 2015-03-26 13:52:36 -07:00
walbourn_cp
058c71714d Updated libraries fro VS 2015 C99 and legacy printf conformance
- Static libraries built with _CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS
2015-03-24 15:51:05 -07:00
walbourn_cp
d3887c4425 Support for universal Windows apps Technical Preview 2015-03-24 15:26:31 -07:00
walbourn_cp
f618e9f19d Fixed bugs in WIC loader for multframe images when resizing was required
- texconv & texassemble now load multi-frames if present from WIC files (tiff, gif)
2015-03-17 18:07:21 -07:00
walbourn_cp
5541a2cbcf Fixed bug with GenerateMipMaps for WIC-based generation of non-WIC supported formats. 2015-03-16 16:34:27 -07:00
walbourn_cp
74c2231e3c Minor SAL fix 2015-03-10 15:18:42 -07:00
walbourn_cp
81a447f8b3 Minor code review feedback 2015-03-09 12:29:08 -07:00
walbourn_cp
e529c6a73b Added use of C++11 defaulted and deleted constructors 2015-02-20 14:43:07 -08:00
walbourn_cp
e23c8e19fd Code review feedback 2015-01-30 17:31:49 -08:00
walbourn_cp
5f95b87ddf Updated libraries for VS 2015 C99 and legacy printf conformance
- Static libraries built with _CRT_STDIO_ARBITRARY_WIDE_SPECIFIERS
2015-01-24 01:17:54 -08:00
walbourn_cp
27020cce7b Minor code review feedback
- Don't need to use ".get()[" pattern when using std::unique_ptr<T[]> specialization
2014-11-20 13:44:59 -08:00
walbourn_cp
57b7c894bc Add VS 2015 projects (using VS 2015 Technical Preview) 2014-11-13 18:04:03 -08:00
walbourn_cp
367db3de30 DirectXTex: Improved format conversions
- depth/stencil conversions incl fix for stencil data handling
- alpha only conversions
- fixed bug with half-precision (float16) format conversions
- fixed bug with RGB -> 1 channel conversion for non-UNORM sources
2014-09-22 12:39:24 -07:00
walbourn_cp
91951178e0 Fixed warnings found by Dev14 CTP 2014-09-18 16:29:08 -07:00
walbourn_cp
0922ab3f94 Fix for C++14 with std::vector<const T> 2014-09-18 11:26:01 -07:00
walbourn_cp
501835a8b3 Xbox One platform changes 2014-09-15 10:32:51 -07:00
walbourn_cp
48e969aac7 Xbox One platform changes 2014-09-11 15:26:14 -07:00
walbourn_cp
1e0d861ee3 Minor code cleanup 2014-09-11 15:25:42 -07:00
walbourn_cp
385017d1ec Made ScratchImage::OverrideFormat more flexible (and less safe) 2014-09-11 15:24:23 -07:00
walbourn_cp
15d1a22921 Fixed issue when BC decompressing non-standard compressed rowPitch images 2014-09-11 15:23:33 -07:00
walbourn_cp
209772f248 Minor code cleanup 2014-09-11 15:21:52 -07:00
walbourn_cp
dab54e856c Explicit calling-convention annotation for all 'public' functions 2014-09-04 17:57:16 -07:00
walbourn_cp
7b177a9b5b Xbox One platform updates 2014-09-04 17:46:46 -07:00
walbourn_cp
ad9d19712a /fp:fast and use /arch:SSE2 for Win32 (x86) 2014-07-22 11:49:31 -07:00
walbourn_cp
c568c51408 DirectXTex: GenerateMips fails if asked to not generate any mips 2014-07-11 16:57:54 -07:00
walbourn_cp
4233e222e3 DirectXTex: fixed wide-image issue with CPU Compress 2014-07-10 16:03:13 -07:00
walbourn_cp
c3ac93db96 Code Review feedback 2014-07-01 12:36:30 -07:00
walbourn_cp
d7d90d4911 MInor cleanup of XDK projects 2014-06-19 13:49:28 -07:00
walbourn_cp
8a597ef59b DirectXTex: minor fix (no codegen impact) 2014-06-04 15:56:21 -07:00
walbourn_cp
aa61672a48 Removed all use of MONOLITHIC driver variable 2014-05-08 13:37:43 -07:00
walbourn_cp
917281720e Removed support for 'stock' Direct3D for Xbox One XDK platform
- Removed all use of MONOLITHIC driver variable
- _XBOX_ONE && _TITLE now implies using 'monolithic' Direct3D
2014-05-08 13:33:19 -07:00
walbourn_cp
0a3b283e75 Projects and support for the Windows phone 8.1 platform 2014-04-03 13:03:44 -07:00
walbourn_cp
c671cc3911 DirectXTex: Minor code review fix 2014-03-31 18:11:40 -07:00
walbourn_cp
d6976ed850 DirectXTex: support writing DDS files where input Image struct rowPitch is not 1-byte aligned 2014-02-20 15:24:34 -08:00
walbourn_cp
76b79c42b5 DirectXTex: added alpha weight parameter for BC7 GPU compressor [breaking change]
- texconv has new '-aw' switch to take the parameter
2014-02-19 17:31:35 -08:00
walbourn_cp
5336f904da DirectXTex: Support for Direct3D 11 video and Xbox One extended formats
- New APIs: IsPlanar, IsPalettized, IsDepthStencil, ConvertToSinglePlane
2014-02-14 13:33:01 -08:00
walbourn_cp
c72e6ccc22 DirectXTex: Fixed bug with application of ordered dithering in non-WIC codepaths 2014-02-13 11:28:26 -08:00
walbourn_cp
c43f736184 DirectXTex: Added IsVolumemap() helper to TexMetadata 2014-01-30 16:48:52 -08:00
walbourn_cp
840f0d4238 DirectXTex: Fix for size rounding bug in GPU BC compressor 2014-01-22 11:06:35 -08:00
walbourn_cp
6a37f81f09 DirectXTex: TEX_COMPRESS_* flags; added 'compress' flags paramter to GPU Compress [breaking change] 2014-01-22 11:04:35 -08:00
walbourn_cp
8d3dbe1fc0 Added comment explaining reason for supressing 4005 warning 2014-01-21 12:50:14 -08:00
walbourn_cp
b4b63a3557 Eliminate ScopedObject in favor of standard Microsoft::WRL::ComPtr 2014-01-15 17:08:08 -08:00
walbourn_cp
9ee1142b42 Removed d2d1.h workaround as this was caused by a case of incorrect mixing of DXSDK and Windows 8.x SDK 2014-01-15 13:18:18 -08:00
walbourn_cp
f1ff6f10f2 DirectXTex: Dropped support for VS 2010 + legacy DirectX SDK without Windows 8.x SDK
- Removed DXGI_1_2_FORMATS and USE_XNAMATH control defines
- Deleted *Desktop_2010_SDK81.* project files, updated *Desktop_2010.* project files to use Windows 8.1 SDK
2014-01-15 13:14:48 -08:00
walbourn_cp
7ddd3762bb DirectXTex: added move operators for ScratchImage, Blob 2013-12-24 12:57:42 -08:00
walbourn_cp
858d473b81 DirectXTK/DirectXTex: Xbox One platform support 2013-12-05 16:41:24 -08:00
walbourn_cp
848294f2e7 Dropped VS 2010 + Windows 8.0 SDK in favor of VS 2010 + Windows 8.1 SDK 2013-11-20 13:35:35 -08:00
walbourn_cp
b73612600f DirectXTex: Resize logic in non-WIC custom filtering was backwards for when to use the BOX filter 2013-11-15 14:54:08 -08:00
walbourn_cp
65de5a1f37 DirectXTex: Added project which uses VS 2010 with the Windows 8.1 SDK 2013-10-18 20:49:03 -07:00
walbourn_cp
f4cf594bcd Update for VS 2013 / Windows 8.1 RTM 2013-10-18 17:36:51 -07:00
walbourn_cp
6cafea6cb0 DirectXTex: Fixed problem with DirectCompute compressor for BC7_UNORM_SRGB
- Also added diagnostic message from texconv when doing DirectCompute compression
2013-10-08 16:26:29 -07:00
walbourn_cp
d82ee0c5dd DirectXTex: Supressed warning from /analyze 2013-10-07 18:21:09 -07:00
walbourn_cp
5159109035 DirectXTex: public header doesn't include windows.h, so might not have _WIN32_WINNT_WIN8 symbol yet 2013-10-04 17:44:52 -07:00
walbourn_cp
e12d9c67f2 DirectXTex: Update for sRGB handling with pmalpha 2013-10-01 17:28:56 -07:00
walbourn_cp
1bc39d8854 DirectXTex: minor /analyze fix 2013-09-09 15:10:35 -07:00
walbourn_cp
7523b2bb9b DirectXTex: Updated to use DirectXMath 3.06 when available 2013-09-09 12:45:36 -07:00
walbourn_cp
c9f5fdb7a8 DirectXTex: add use of d3d11_1.h when available 2013-09-03 15:04:04 -07:00
walbourn_cp
8eec65caf4 DirectXTex: BC6H / BC7 DirectCompute codec integration 2013-08-05 10:58:54 -07:00
walbourn_cp
44510c23e7 DirectXTex: Fixed problem with BC4/BC5 compressor when given RGBA32 input image 2013-07-31 13:16:31 -07:00
walbourn_cp
d062ae2097 DirectxTex: ComputeMSE flags for X2 bias 2013-07-31 13:15:42 -07:00
walbourn_cp
8bfc1b7de3 DirectXTex: Added WIC_FLAGS_IGNORE_SRGB to ignore the presense of sRGB metadata in WIC files 2013-07-31 00:39:59 -07:00
walbourn_cp
5f3b34beb5 DirectXTex: Support for non-power-of-2 mipmapped BC textures 2013-07-30 17:32:45 -07:00
walbourn_cp
5a6c053e99 DirectXTex: Fixed syntax error 2013-07-29 18:06:05 -07:00
walbourn_cp
c4c09c2966 DirectXTex: minor fix for BC1 encoder 2013-07-29 13:33:52 -07:00
walbourn_cp
1d3e1d0904 DirectXTex: Make ScopedObject match Microsoft::WRL::ComPtr, use Microsoft::WRL::ComPtr when possible 2013-07-26 16:44:00 -07:00
walbourn_cp
70afb86830 DirectXTex: VS 2013 /analyze fix 2013-07-25 16:53:48 -07:00
walbourn_cp
98b4e32ce6 Use of _WIN32_WINNT_WIN8 with compat shim for older Windows SDKs 2013-07-24 16:45:33 -07:00
walbourn_cp
489f4c51ae DirectXTex: Set output directories for DirectXTex library 2013-07-19 23:24:25 -07:00
walbourn_cp
aef1bb0e8d DirectXTex: Minor BC6H / BC7 tweaks
- Minor DirectXMath optimization to error metric computation
- More code review change (Swap -> std::swap)
2013-07-18 23:12:49 -07:00
walbourn_cp
a69fcaa8de DirectXTex: Cleaned up .sln versions 2013-07-12 15:48:41 -07:00
walbourn_cp
3f1f4acfda DirectXTex: BC6H/BC7 had subtle signed/unsigned bug that resulted in incorrect decoding in particular edge cases 2013-07-11 17:36:24 -07:00
walbourn_cp
b610af415e DirectXTex: BC6H / BC 7 handling of invalid mode blocks updated to match the format specs 2013-07-10 10:49:59 -07:00
walbourn_cp
51af8e4af5 DirectXTex: Code Review feedback 2013-07-09 16:16:38 -07:00
walbourn_cp
4c1a8527c1 DirectXTex: Fixed /analyze issues 2013-07-02 15:27:07 -07:00
walbourn_cp
1b92159d63 DirectXTex: Use alternative to CreateStreamOnHGlobal for Windows Store apps 2013-07-02 13:07:56 -07:00
walbourn_cp
a1628e8fd4 DirectXTex/DirectXTK: Updated VS 2013 Preview Windows 8.1 SLNs 2013-07-02 12:55:40 -07:00
walbourn_cp
0aa54a8045 DirectXTex: Workaround to avoid ICE when building VS 2013 preview Debug ARM config 2013-07-02 12:53:52 -07:00
walbourn_cp
bd0b88aa8e DirectXTex: some more /analyze cleanup 2013-07-01 13:30:13 -07:00
walbourn_cp
af675e3c3a DirectXTex: WinRT usage problematic, sticking with CS on HGLBOAL 2013-06-28 22:43:39 -07:00
walbourn_cp
a303eea709 DirectXTex: when building for WinRT, use InMemoryRandomAccessStream instead CreateStreamOnHGlobal 2013-06-27 21:17:46 -07:00
walbourn_cp
887d87bf91 DirectXTex: /analyze cleanup 2013-06-27 16:21:01 -07:00
walbourn_cp
61a0a1a19c SaveToWIC* functions updated with optional setCustomProps parameter for setting custom encoding options 2013-06-27 11:05:15 -07:00
walbourn_cp
bb622bf4ec DirectXTex: Added projects for VS 2013 Preview 2013-06-26 15:22:13 -07:00
walbourn_cp
27c91d3da7 DirectXTex: minor 'return null on failure' fix for CreateTexture/CreateSRV 2013-06-25 12:35:05 -07:00
walbourn_cp
32b06b3e5c DirectXTK/DirectXTex: Minor code review feedback 2013-06-21 14:12:39 -07:00
walbourn_cp
72c9103b1d WIC_USE_FACTORY_PROXY workaround no longer needed. 2013-06-18 14:18:07 -07:00
walbourn_cp
fb6f5aac2e DirectXTex: Integrated some Code Review feedback (no code impact) 2013-06-17 12:32:11 -07:00
walbourn_cp
0678c2b5f9 DirectxTex: Need to slightly bias results floating-point error introduced by TRIANGLE filter
- Avoids problem with harshly quantized formats like 2-bit alpha
- Defaults to TRIANGLE filter for non-pow-2 volume maps
2013-06-15 11:55:07 -07:00
walbourn_cp
2fdf1f6d0a DirectXTex: added finite low-pass triangle custom filter
- TEX_FILTER_TRIANGLE
- texconv updated -if image filter options
2013-06-14 16:17:16 -07:00
walbourn_cp
8fa166372d DirectXTex: Custom filtering (Point, Linear, Cubic, sRGB gamma correct) implemented for Resize 2013-06-12 20:17:43 -07:00
walbourn_cp
7c5c9addf8 DirectXTex: Fixed slight image shift in custom Cubic filtering 2013-06-12 19:54:17 -07:00
walbourn_cp
98699f90f9 DirectXTex: Replace D3DX's table sRGB encoding/decoding with gamma correct implementation 2013-06-12 16:28:11 -07:00
walbourn_cp
bdb7d21088 DirectXTex: Implemented dithering for non-WIC codepaths
- Reworked texconv options for -if for dithering
2013-06-11 13:18:23 -07:00
walbourn_cp
3474bcbab9 DirectXTex: WIC metadata usage
- Check/writes the sRGB information for DXGI_FORMAT_*_SRGB formats
- Updated WICTextureLoader & ScreenGrab
2013-06-10 15:34:13 -07:00
walbourn_cp
8a267b10b2 DirectXTex: some code cleanup 2013-06-10 15:16:08 -07:00
walbourn_cp
ae8a8cfa9a DirectXTex: Added DDS_FLAGS_EXPAND_LUMINANCE support 2013-06-10 15:14:55 -07:00
walbourn_cp
0a6e75fe5a DirectXTex: Convert threshold parameter was not being used correctly
Convert needs to use non-WIC paths for -sepalpha cases
2013-06-07 18:07:08 -07:00
walbourn_cp
76bd58ecb0 DirectXTeX: Removed some debug code that upset /analyze 2013-06-06 18:03:58 -07:00
walbourn_cp
a9c0c4320e DirectXTex: sRGB correct filtering for mipmap generation 2013-06-06 17:58:23 -07:00
walbourn_cp
0853752b5d DirectXTex: code review feedback 2013-06-06 16:22:07 -07:00
walbourn_cp
4e1e8b49c1 DirectXTex: non-power-of-2 error should be in 2DBox, not 2DPoint 2013-06-06 14:46:28 -07:00
walbourn_cp
cc6da6ef25 DirectXTex: added filters.h 2013-06-06 14:03:31 -07:00
walbourn_cp
5264ae6503 DirectXTex: 2D & 3D linear and cubic filtering with optional mirror/wrap vs. clamp 2013-06-06 14:02:17 -07:00
walbourn_cp
add7763d9c DirectXTex: Added TEX_FILTER_BOX (which is an alias for FANT) 2013-06-03 15:32:00 -07:00
walbourn_cp
f6cace44e8 DirectXTex: Minor code cleanup 2013-06-03 15:11:47 -07:00
walbourn_cp
5fd613b1fb DirectXTex: Added BitsPerColor DXGI utility function 2013-06-03 14:41:16 -07:00
walbourn_cp
24ead31a39 Added error check to SaveWIC functions if requested optional targetFormat is not supported by the WIC codec 2013-06-01 10:55:18 -07:00
walbourn_cp
6323465f1f DirectXTex: Special-case optimization when doing RGBA 32bpp resize or 2D mipmap generation 2013-04-30 15:25:26 -07:00
walbourn_cp
598fedaf35 DirectXTex: partial typeless support for _LoadScanline 2013-04-29 17:43:13 -07:00
walbourn_cp
11cafa387d Minor whitespace fix 2013-04-26 16:02:53 -07:00
walbourn_cp
e95ffd151d DirectXTex: cleanup of volume map custom point/box filters 2013-04-26 15:11:42 -07:00
walbourn_cp
c398ac1711 DirectXTex: Resolve SRGB handling problems with conversions
- Convert: TEX_FILTER_FORCE_NON_WIC, TEX_FILTER_FORCE_WIC, TEX_FILTER_RGB_COPY_RED/BLUE/GREEN
 - ComputeMSE flags for sRGB colorspace and channel ignore options
2013-04-16 17:51:36 -07:00
walbourn_cp
33db361592 Update DDS alpha mode metadata
- Make alpha mode 3 bits instead of 2
- Rename 4TH_CHANNEL to CUSTOM
- Reorder enum
2013-04-11 15:23:54 -07:00
walbourn_cp
dc401291a1 VS 2012 and VS 2010+SDK8.0 projects don't use <xnamath.h>, they use DirectXMath
Fixed DDSView to use DirectXMath when it should
2013-04-10 23:37:19 -07:00
walbourn_cp
ec03b62e6d DirectXTex - WIC 32bpp RGBE is 8:8:8:8, not the same as DXGI SHAREDEXP 9:9:9:5
- Fixed LoadScanline/StoreScanline for SHAREDEXP, X2_BIAS, and R1
2013-04-10 18:11:47 -07:00
walbourn_cp
e4e6c6c008 DirectXTex: Code review feedback
- /analyze work focused on VS 2012 with SAL2 rather than VS 2010
2013-04-10 11:22:22 -07:00
walbourn_cp
91654fc9df Fixed bug with non-square volume mipmaps 2013-04-04 11:27:05 -07:00
walbourn_cp
991b325f10 Code review feedback 2013-03-28 00:14:06 -07:00
walbourn_cp
0d382fbe25 DirectXTex updated to read & write new miscFlags2 alpha mode metadata for DDS files
- Added helper to see if a texure's alpha channel is all opaque
- Reads and writes DXT2 and DXT4 DDS files
- Updated PremultiplyAlpha function to set miscFlags2 appropriately
- Texconv updated for new feature, "-dx10" switch now allows write of miscFlags2 data
2013-03-22 17:52:43 -07:00
walbourn_cp
87880558bb Use no-throw new so out-of-memory returns an HRESULT; minor /analyze fix 2013-03-20 14:12:40 -07:00