mirror of
https://github.com/BinomialLLC/basis_universal.git
synced 2026-06-08 08:33:53 +00:00
ASTC 6x6 HDR/6x6 HDR intermediate update
This commit is contained in:
@@ -111,6 +111,7 @@ static bool encode_etc1s()
|
||||
|
||||
// basis_compress() is a simple wrapper around the basis_compressor_params and basis_compressor classes.
|
||||
void* pKTX2_data = basis_compress(
|
||||
basist::basis_tex_format::cETC1S,
|
||||
source_images,
|
||||
quality_level | cFlagSRGB | cFlagGenMipsClamp | cFlagThreaded | cFlagPrintStats | cFlagDebug | cFlagPrintStatus | cFlagUseOpenCL, 0.0f,
|
||||
&file_size,
|
||||
@@ -147,15 +148,16 @@ static bool encode_uastc_ldr()
|
||||
|
||||
// basis_compress() is a simple wrapper around the basis_compressor_params and basis_compressor classes.
|
||||
void* pKTX2_data = basis_compress(
|
||||
basist::basis_tex_format::cUASTC4x4,
|
||||
source_images,
|
||||
cFlagThreaded | cFlagUASTC | cFlagPrintStats | cFlagDebug | cFlagPrintStatus, 0.0f,
|
||||
cFlagThreaded | cFlagPrintStats | cFlagDebug | cFlagPrintStatus, 0.0f,
|
||||
&file_size,
|
||||
nullptr);
|
||||
|
||||
if (!pKTX2_data)
|
||||
return false;
|
||||
|
||||
if (!write_data_to_file("test_uastc_ldr.ktx2", pKTX2_data, file_size))
|
||||
if (!write_data_to_file("test_uastc_ldr_4x4.ktx2", pKTX2_data, file_size))
|
||||
{
|
||||
basis_free_data(pKTX2_data);
|
||||
return false;
|
||||
@@ -185,7 +187,7 @@ static bool encode_uastc_hdr()
|
||||
basis_compressor_params params;
|
||||
params.m_hdr = true;
|
||||
params.m_source_images_hdr.push_back(img);
|
||||
params.m_uastc_hdr_options.set_quality_level(3);
|
||||
params.m_uastc_hdr_4x4_options.set_quality_level(3);
|
||||
params.m_debug = true;
|
||||
//params.m_debug_images = true;
|
||||
params.m_status_output = true;
|
||||
@@ -239,7 +241,7 @@ static bool transcode_hdr()
|
||||
basist::ktx2_transcoder transcoder;
|
||||
|
||||
// Initialize the transcoder.
|
||||
if (!transcoder.init(ktx2_file_data.data(), ktx2_file_data.size()))
|
||||
if (!transcoder.init(ktx2_file_data.data(), ktx2_file_data.size_u32()))
|
||||
return false;
|
||||
|
||||
const uint32_t width = transcoder.get_width();
|
||||
@@ -289,7 +291,7 @@ static bool transcode_hdr()
|
||||
basisu::vector<uint16_t> half_img(width * 4 * height);
|
||||
|
||||
bool status = transcoder.transcode_image_level(0, 0, 0,
|
||||
half_img.get_ptr(), half_img.size() / 4,
|
||||
half_img.get_ptr(), half_img.size_u32() / 4,
|
||||
basist::transcoder_texture_format::cTFRGBA_HALF, 0);
|
||||
if (!status)
|
||||
return false;
|
||||
|
||||
@@ -29,28 +29,28 @@
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<PlatformToolset>v143</PlatformToolset>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v143</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<PlatformToolset>v143</PlatformToolset>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v143</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>true</UseDebugLibraries>
|
||||
<PlatformToolset>v143</PlatformToolset>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v143</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||
<ConfigurationType>Application</ConfigurationType>
|
||||
<UseDebugLibraries>false</UseDebugLibraries>
|
||||
<PlatformToolset>v143</PlatformToolset>
|
||||
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset>v143</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||
<ImportGroup Label="ExtensionSettings">
|
||||
@@ -83,6 +83,7 @@
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions);BASISU_SUPPORT_SSE=1;BASISU_SUPPORT_OPENCL=1;_HAS_EXCEPTIONS=0</PreprocessorDefinitions>
|
||||
<ConformanceMode>true</ConformanceMode>
|
||||
<AdditionalIncludeDirectories>..\OpenCL</AdditionalIncludeDirectories>
|
||||
<LanguageStandard>stdcpp17</LanguageStandard>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
@@ -103,6 +104,7 @@
|
||||
<EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
|
||||
<ExceptionHandling>false</ExceptionHandling>
|
||||
<BufferSecurityCheck>false</BufferSecurityCheck>
|
||||
<LanguageStandard>stdcpp17</LanguageStandard>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
@@ -115,13 +117,14 @@
|
||||
</ItemDefinitionGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
<ClCompile>
|
||||
<WarningLevel>Level4</WarningLevel>
|
||||
<SDLCheck>false</SDLCheck>
|
||||
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions);BASISU_SUPPORT_SSE=1;BASISU_SUPPORT_OPENCL=1;</PreprocessorDefinitions>
|
||||
<ConformanceMode>true</ConformanceMode>
|
||||
<EnableEnhancedInstructionSet>AdvancedVectorExtensions</EnableEnhancedInstructionSet>
|
||||
<BufferSecurityCheck>false</BufferSecurityCheck>
|
||||
<AdditionalIncludeDirectories>..\OpenCL</AdditionalIncludeDirectories>
|
||||
<WarningLevel>Level4</WarningLevel>
|
||||
<LanguageStandard>stdcpp17</LanguageStandard>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
@@ -145,6 +148,7 @@
|
||||
<FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
|
||||
<OmitFramePointers>true</OmitFramePointers>
|
||||
<AdditionalIncludeDirectories>..\OpenCL</AdditionalIncludeDirectories>
|
||||
<LanguageStandard>stdcpp17</LanguageStandard>
|
||||
</ClCompile>
|
||||
<Link>
|
||||
<SubSystem>Console</SubSystem>
|
||||
|
||||
Reference in New Issue
Block a user