updated texconv to fix a bug that cubemap images will be written on n…

…on-zeroed buffers
matyalatte · Jan 19, 2023 · 6b0d55c · 6b0d55c
1 parent 58d5458
commit 6b0d55c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -62,13 +62,13 @@ jobs:
         if: runner.os=='Windows'
         run: |
           cd external/Texconv-Custom-DLL/batch_files
-          ./build_dds_full_support.bat
+          ./build_small.bat
       
       - name: build shared library (for Unix)
         if: runner.os!='Windows'
         run: |
           cd external/Texconv-Custom-DLL/shell_scripts
-          bash build_dds_full_support.sh
+          bash build_small.sh
 
       - name: Copy files
         run: |

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -77,13 +77,13 @@ jobs:
       - name: build dll (for Windows)
         if: runner.os=='Windows'
         run: |
-          external/Texconv-Custom-DLL/batch_files/build_dds_full_support.bat
+          external/Texconv-Custom-DLL/batch_files/build_small.bat
           cp external/Texconv-Custom-DLL/texconv.dll addons/blender_dds_addon/directx
       
       - name: build shared library (for Unix)
         if: runner.os!='Windows'
         run: |
-          bash external/Texconv-Custom-DLL/shell_scripts/build_dds_full_support.sh
+          bash external/Texconv-Custom-DLL/shell_scripts/build_small.sh
           cp external/Texconv-Custom-DLL/libtexconv.* addons/blender_dds_addon/directx
       
       - name: Set up Python v${{ matrix.python-version }}

diff --git a/changelog.txt b/changelog.txt
@@ -2,6 +2,7 @@ ver 0.2.0
 - Added "Import from a Directory" operation
 - Added "Export All Images" operation
 - Added custom properties to store meta data
+- Updated texconv to fix a bug that cubemap images will be written on non-zeroed buffers
 - Refined codes
 
 ver 0.1.3

diff --git a/docs/How-To-Build.md b/docs/How-To-Build.md
@@ -41,13 +41,13 @@ It'll download the file and place it in a proper location.
 ### for Windows
 
 Move to `./Blender-DDS-Addon/external/Texconv-Custom-DLL/batch_files`.  
-Then, type `build_dds_full_support.bat`.  
+Then, type `build_small.bat`.  
 `texconv.dll` will be generated in `./Blender-DDS-Addon/external/Texconv-Custom-DLL/`  
 
 ### for Unix
 
 Move to `./Blender-DDS-Addon/external/Texconv-Custom-DLL/shell_scripts`.  
-Then, type `bash build_dds_full_support.sh`.  
+Then, type `bash build_small.sh`.  
 `libtexconv.so` (or `libtexconv.dylib`) will be generated in `./Blender-DDS-Addon/external/Texconv-Custom-DLL/`  
 
 ## 4. Copy Texconv

diff --git a/external/Texconv-Custom-DLL b/external/Texconv-Custom-DLL
+2 −0		.github/workflows/build_all.yml
+98 −48		CMakeLists.txt
+1 −1		DirectXTex
+18 −16		Dockerfile_Alpine
+37 −0		Dockerfile_Ubuntu
+15 −0		TexconvDLL/DirectXTexConvert.cpp
+3 −0		TexconvDLL/DirectXTexImage.cpp
+0 −3		TexconvDLL/config.h.in
+11 −15		TexconvDLL/texassemble.cpp
+14 −14		TexconvDLL/texconv.cpp
+2 −0		TexconvDLL/tool_util.cpp
+1 −0		TexconvDLL/tool_util.h
+2 −1		batch_files/build.bat
+4 −3		batch_files/build_as_exe.bat
+20 −0		batch_files/build_minimal.bat
+1 −1		batch_files/build_small.bat
+0 −25		batch_files/build_texassemble.bat
+27 −0		batch_files/build_wic_support.bat
+8 −0		changelog.txt
+3 −8		docs/Build-on-Unix.md
+4 −9		docs/Build-on-Windows.md
+10 −6		docs/CMake-Options.md
+18 −19		docs/README.md
+0 −4		docs/Usage.md
+1 −0		shell_scripts/build.sh
+4 −3		shell_scripts/build_as_exe.sh
+16 −0		shell_scripts/build_minimal.sh
+1 −1		shell_scripts/build_small.sh
+0 −20		shell_scripts/build_texassemble.sh
+1 −1		unix_external/DirectX-Headers
+1 −1		unix_external/DirectXMath
+1 −1		unix_external/safestringlib