Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
2ba0289
[Draft]
isplunke Sep 17, 2024
0a8c5bf
Moved functionst to new file DirectTexSwizzle
isplunke Sep 18, 2024
e29108a
cleanup move
isplunke Sep 18, 2024
406787d
added 3D
isplunke Sep 18, 2024
061f06c
Almost handel Block Compression.
isplunke Sep 19, 2024
f3b95e0
Fix 3d swizzle idexing into multiple images
isplunke Sep 19, 2024
c5ef2db
Undo: Almost handel Block Compression.
isplunke Sep 19, 2024
1ecf426
name the file in itself
isplunke Sep 19, 2024
b35faa5
handle compression... this time?
isplunke Sep 19, 2024
3466ba5
use extractBits
isplunke Sep 20, 2024
9be0db5
Update DirectXTexSwizzle.cpp
walbourn Sep 24, 2024
e5395d8
Update DirectXTexSwizzle.cpp
walbourn Sep 24, 2024
d70fef1
Update DirectXTexSwizzle.cpp
walbourn Sep 25, 2024
6f19a5a
Update DirectXTexSwizzle.cpp
walbourn Sep 25, 2024
93cb5a2
Update CMakeLists.txt
walbourn Sep 25, 2024
a41c71e
Update remaining vcxproj for new file
walbourn Sep 25, 2024
68b9cc7
StandardSwizzle3D merged into main function
walbourn Sep 25, 2024
94fc437
More work on 3D swizzle
walbourn Sep 26, 2024
74f7445
More code review
walbourn Sep 26, 2024
c0e91fc
Attempt to fix CodeQL warning
walbourn Nov 5, 2024
0cbb90b
Add 3D case for linear to swizzle
walbourn Mar 8, 2025
97dbf1a
Add DIRECTX_TEX_API to StandardSwizzle functions
walbourn Mar 9, 2025
f46356d
Implement 3D swizzle to linear
walbourn Mar 10, 2025
d3192d8
Delete DirectXTex/DirectXTex_Desktop_2019.vcxproj
walbourn Aug 6, 2026
1e31208
Delete DirectXTex/DirectXTex_Desktop_2019.vcxproj.filters
walbourn Aug 6, 2026
6dad807
Delete DirectXTex/DirectXTex_Desktop_2019_Win10.vcxproj
walbourn Aug 6, 2026
65f061a
Delete DirectXTex/DirectXTex_Desktop_2019_Win10.vcxproj.filters
walbourn Aug 6, 2026
2c64427
Delete DirectXTex/DirectXTex_GDK_2019.vcxproj
walbourn Aug 6, 2026
ef8492d
Delete DirectXTex/DirectXTex_GDK_2019.vcxproj.filters
walbourn Aug 6, 2026
9d3dddc
Delete DirectXTex/DirectXTex_GXDK_PC_2019.vcxproj
walbourn Aug 6, 2026
88fa825
Delete DirectXTex/DirectXTex_GXDK_PC_2019.vcxproj.filters
walbourn Aug 6, 2026
2c4abc8
Revert all vcxproj changes
walbourn Aug 6, 2026
1467da9
Code review feedback
walbourn Aug 6, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@ set(LIBRARY_SOURCES
DirectXTex/DirectXTexMipmaps.cpp
DirectXTex/DirectXTexMisc.cpp
DirectXTex/DirectXTexNormalMaps.cpp
DirectXTex/DirectXTexSwizzle.cpp

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've reverted all the vcxproj changes for now. I'll do those in a follow-up PR after finishing this one.

DirectXTex/DirectXTexPMAlpha.cpp
DirectXTex/DirectXTexResize.cpp
DirectXTex/DirectXTexTGA.cpp
Expand Down
7 changes: 7 additions & 0 deletions DirectXTex/DirectXTex.h
Original file line number Diff line number Diff line change
Expand Up @@ -730,6 +730,13 @@ namespace DirectX
_In_reads_(nimages) const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata, _In_ size_t item,
_In_ float alphaReference, _Inout_ ScratchImage& mipChain) noexcept;

DIRECTX_TEX_API HRESULT __cdecl StandardSwizzle(
_In_ const Image& srcImage, _In_ bool toSwizzle,
_Out_ ScratchImage& image) noexcept;
DIRECTX_TEX_API HRESULT __cdecl StandardSwizzle(
_In_reads_(nimages) const Image* srcImages, _In_ size_t nimages, _In_ const TexMetadata& metadata, _In_ bool toSwizzle,
_Out_ ScratchImage& result) noexcept;
// Performs row-major linear <-> z-order curve swizzling

enum TEX_PMALPHA_FLAGS : unsigned long
{
Expand Down
Loading
Loading