zone/OpenAssetTools
zone/OpenAssetTools
2
0
Fork 0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2025-04-20 08:05:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move DXGI_FORMAT definition into separate namespace to make it compatible to existing definitions

Browse Source
This commit is contained in:
Jan 2024-01-06 20:41:50 +01:00
parent cd53c3cbe4
commit 44b0f4da5e
No known key found for this signature in database
GPG Key ID: 44B581F78FF5C57C
8 changed files with 160 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Common/Image/DdsTypes.h
View File

@ -103,7 +103,7 @@ enum DDS_HEADER_DXT10_MISC2
struct DDS_HEADER_DXT10 struct DDS_HEADER_DXT10
{ {
DXGI_FORMAT dxgiFormat; oat::DXGI_FORMAT dxgiFormat;
D3D10_RESOURCE_DIMENSION resourceDimension; D3D10_RESOURCE_DIMENSION resourceDimension;
uint32_t miscFlag; uint32_t miscFlag;
uint32_t arraySize; uint32_t arraySize;

5
src/Common/Image/DxgiFormat.h
View File

@ -1,5 +1,6 @@
#pragma once #pragma once
// Modified for OAT
/* /*
* Copyright 2016 Józef Kucia for CodeWeavers * Copyright 2016 Józef Kucia for CodeWeavers
* *
@ -18,8 +19,11 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/ */
namespace oat
{
const unsigned int DXGI_FORMAT_DEFINED = 1; const unsigned int DXGI_FORMAT_DEFINED = 1;
// This is a redefinition to make this enum available on platforms without DirectX headers
enum DXGI_FORMAT enum DXGI_FORMAT
{ {
DXGI_FORMAT_UNKNOWN = 0x00, DXGI_FORMAT_UNKNOWN = 0x00,
@ -145,3 +149,4 @@ enum DXGI_FORMAT
DXGI_FORMAT_FORCE_UINT = 0xffffffff, DXGI_FORMAT_FORCE_UINT = 0xffffffff,
}; };
} // namespace oat

34
src/Common/Image/ImageFormat.cpp
View File

@ -1,6 +1,6 @@
#include "ImageFormat.h" #include "ImageFormat.h"
ImageFormat::ImageFormat(const ImageFormatId id, const oat::D3DFORMAT d3dFormat, const DXGI_FORMAT dxgiFormat) ImageFormat::ImageFormat(const ImageFormatId id, const oat::D3DFORMAT d3dFormat, const oat::DXGI_FORMAT dxgiFormat)
: m_id(id), : m_id(id),
m_d3d_format(d3dFormat), m_d3d_format(d3dFormat),
m_dxgi_format(dxgiFormat) m_dxgi_format(dxgiFormat)
@ -17,14 +17,14 @@ oat::D3DFORMAT ImageFormat::GetD3DFormat() const
return m_d3d_format; return m_d3d_format;
} }
DXGI_FORMAT ImageFormat::GetDxgiFormat() const oat::DXGI_FORMAT ImageFormat::GetDxgiFormat() const
{ {
return m_dxgi_format; return m_dxgi_format;
} }
ImageFormatUnsigned::ImageFormatUnsigned(const ImageFormatId id, ImageFormatUnsigned::ImageFormatUnsigned(const ImageFormatId id,
const oat::D3DFORMAT d3dFormat, const oat::D3DFORMAT d3dFormat,
const DXGI_FORMAT dxgiFormat, const oat::DXGI_FORMAT dxgiFormat,
const unsigned bitsPerPixel, const unsigned bitsPerPixel,
const unsigned rOffset, const unsigned rOffset,
const unsigned rSize, const unsigned rSize,
@ -78,7 +78,7 @@ size_t ImageFormatUnsigned::GetSizeOfMipLevel(const unsigned mipLevel, const uns
} }
ImageFormatBlockCompressed::ImageFormatBlockCompressed( ImageFormatBlockCompressed::ImageFormatBlockCompressed(
const ImageFormatId id, const oat::D3DFORMAT d3dFormat, const DXGI_FORMAT dxgiFormat, const unsigned blockSize, const unsigned bitsPerBlock) const ImageFormatId id, const oat::D3DFORMAT d3dFormat, const oat::DXGI_FORMAT dxgiFormat, const unsigned blockSize, const unsigned bitsPerBlock)
: ImageFormat(id, d3dFormat, dxgiFormat), : ImageFormat(id, d3dFormat, dxgiFormat),
m_block_size(blockSize), m_block_size(blockSize),
m_bits_per_block(bitsPerBlock) m_bits_per_block(bitsPerBlock)
@ -140,23 +140,23 @@ bool ImageFormatUnsigned::HasA() const
return m_a_size > 0; return m_a_size > 0;
} }
const ImageFormatUnsigned ImageFormat::FORMAT_R8_G8_B8(ImageFormatId::R8_G8_B8, oat::D3DFMT_R8G8B8, DXGI_FORMAT_UNKNOWN, 24, 0, 8, 8, 8, 16, 8, 0, 0); const ImageFormatUnsigned ImageFormat::FORMAT_R8_G8_B8(ImageFormatId::R8_G8_B8, oat::D3DFMT_R8G8B8, oat::DXGI_FORMAT_UNKNOWN, 24, 0, 8, 8, 8, 16, 8, 0, 0);
const ImageFormatUnsigned const ImageFormatUnsigned
ImageFormat::FORMAT_B8_G8_R8_X8(ImageFormatId::B8_G8_R8_X8, oat::D3DFMT_X8R8G8B8, DXGI_FORMAT_B8G8R8X8_UNORM, 32, 16, 8, 8, 8, 0, 8, 0, 0); ImageFormat::FORMAT_B8_G8_R8_X8(ImageFormatId::B8_G8_R8_X8, oat::D3DFMT_X8R8G8B8, oat::DXGI_FORMAT_B8G8R8X8_UNORM, 32, 16, 8, 8, 8, 0, 8, 0, 0);
const ImageFormatUnsigned const ImageFormatUnsigned
ImageFormat::FORMAT_R8_G8_B8_A8(ImageFormatId::R8_G8_B8_A8, oat::D3DFMT_A8B8G8R8, DXGI_FORMAT_R8G8B8A8_UNORM, 32, 0, 8, 8, 8, 16, 8, 24, 8); ImageFormat::FORMAT_R8_G8_B8_A8(ImageFormatId::R8_G8_B8_A8, oat::D3DFMT_A8B8G8R8, oat::DXGI_FORMAT_R8G8B8A8_UNORM, 32, 0, 8, 8, 8, 16, 8, 24, 8);
const ImageFormatUnsigned const ImageFormatUnsigned
ImageFormat::FORMAT_B8_G8_R8_A8(ImageFormatId::B8_G8_R8_A8, oat::D3DFMT_A8R8G8B8, DXGI_FORMAT_B8G8R8A8_UNORM, 32, 16, 8, 8, 8, 0, 8, 24, 8); ImageFormat::FORMAT_B8_G8_R8_A8(ImageFormatId::B8_G8_R8_A8, oat::D3DFMT_A8R8G8B8, oat::DXGI_FORMAT_B8G8R8A8_UNORM, 32, 16, 8, 8, 8, 0, 8, 24, 8);
const ImageFormatUnsigned ImageFormat::FORMAT_A8(ImageFormatId::A8, oat::D3DFMT_A8, DXGI_FORMAT_A8_UNORM, 8, 0, 0, 0, 0, 0, 0, 0, 8); const ImageFormatUnsigned ImageFormat::FORMAT_A8(ImageFormatId::A8, oat::D3DFMT_A8, oat::DXGI_FORMAT_A8_UNORM, 8, 0, 0, 0, 0, 0, 0, 0, 8);
const ImageFormatUnsigned ImageFormat::FORMAT_R16_G16_B16_A16_FLOAT( const ImageFormatUnsigned ImageFormat::FORMAT_R16_G16_B16_A16_FLOAT(
ImageFormatId::R16_G16_B16_A16_FLOAT, oat::D3DFMT_A16B16G16R16F, DXGI_FORMAT_R16G16B16A16_FLOAT, 128, 0, 0, 0, 0, 0, 0, 0, 8); ImageFormatId::R16_G16_B16_A16_FLOAT, oat::D3DFMT_A16B16G16R16F, oat::DXGI_FORMAT_R16G16B16A16_FLOAT, 128, 0, 0, 0, 0, 0, 0, 0, 8);
const ImageFormatUnsigned ImageFormat::FORMAT_R8(ImageFormatId::R8, oat::D3DFMT_L8, DXGI_FORMAT_R8_UNORM, 8, 0, 8, 0, 0, 0, 0, 0, 0); const ImageFormatUnsigned ImageFormat::FORMAT_R8(ImageFormatId::R8, oat::D3DFMT_L8, oat::DXGI_FORMAT_R8_UNORM, 8, 0, 8, 0, 0, 0, 0, 0, 0);
const ImageFormatUnsigned ImageFormat::FORMAT_R8_A8(ImageFormatId::R8_A8, oat::D3DFMT_A8L8, DXGI_FORMAT_UNKNOWN, 16, 0, 8, 0, 0, 0, 0, 8, 8); const ImageFormatUnsigned ImageFormat::FORMAT_R8_A8(ImageFormatId::R8_A8, oat::D3DFMT_A8L8, oat::DXGI_FORMAT_UNKNOWN, 16, 0, 8, 0, 0, 0, 0, 8, 8);
const ImageFormatBlockCompressed ImageFormat::FORMAT_BC1(ImageFormatId::BC1, oat::D3DFMT_DXT1, DXGI_FORMAT_BC1_UNORM, 4, 64); const ImageFormatBlockCompressed ImageFormat::FORMAT_BC1(ImageFormatId::BC1, oat::D3DFMT_DXT1, oat::DXGI_FORMAT_BC1_UNORM, 4, 64);
const ImageFormatBlockCompressed ImageFormat::FORMAT_BC2(ImageFormatId::BC2, oat::D3DFMT_DXT3, DXGI_FORMAT_BC2_UNORM, 4, 128); const ImageFormatBlockCompressed ImageFormat::FORMAT_BC2(ImageFormatId::BC2, oat::D3DFMT_DXT3, oat::DXGI_FORMAT_BC2_UNORM, 4, 128);
const ImageFormatBlockCompressed ImageFormat::FORMAT_BC3(ImageFormatId::BC3, oat::D3DFMT_DXT5, DXGI_FORMAT_BC3_UNORM, 4, 128); const ImageFormatBlockCompressed ImageFormat::FORMAT_BC3(ImageFormatId::BC3, oat::D3DFMT_DXT5, oat::DXGI_FORMAT_BC3_UNORM, 4, 128);
const ImageFormatBlockCompressed ImageFormat::FORMAT_BC4(ImageFormatId::BC4, oat::D3DFMT_UNKNOWN, DXGI_FORMAT_BC4_UNORM, 4, 64); const ImageFormatBlockCompressed ImageFormat::FORMAT_BC4(ImageFormatId::BC4, oat::D3DFMT_UNKNOWN, oat::DXGI_FORMAT_BC4_UNORM, 4, 64);
const ImageFormatBlockCompressed ImageFormat::FORMAT_BC5(ImageFormatId::BC5, oat::D3DFMT_UNKNOWN, DXGI_FORMAT_BC5_UNORM, 4, 128); const ImageFormatBlockCompressed ImageFormat::FORMAT_BC5(ImageFormatId::BC5, oat::D3DFMT_UNKNOWN, oat::DXGI_FORMAT_BC5_UNORM, 4, 128);
const ImageFormat* const ImageFormat::ALL_FORMATS[static_cast<unsigned>(ImageFormatId::MAX)]{ const ImageFormat* const ImageFormat::ALL_FORMATS[static_cast<unsigned>(ImageFormatId::MAX)]{
&FORMAT_R8_G8_B8, &FORMAT_R8_G8_B8,

10
src/Common/Image/ImageFormat.h
View File

@ -40,17 +40,17 @@ class ImageFormat
{ {
ImageFormatId m_id; ImageFormatId m_id;
oat::D3DFORMAT m_d3d_format; oat::D3DFORMAT m_d3d_format;
DXGI_FORMAT m_dxgi_format; oat::DXGI_FORMAT m_dxgi_format;
protected: protected:
ImageFormat(ImageFormatId id, oat::D3DFORMAT d3dFormat, DXGI_FORMAT dxgiFormat); ImageFormat(ImageFormatId id, oat::D3DFORMAT d3dFormat, oat::DXGI_FORMAT dxgiFormat);
public: public:
virtual ~ImageFormat() = default; virtual ~ImageFormat() = default;
ImageFormatId GetId() const; ImageFormatId GetId() const;
oat::D3DFORMAT GetD3DFormat() const; oat::D3DFORMAT GetD3DFormat() const;
DXGI_FORMAT GetDxgiFormat() const; oat::DXGI_FORMAT GetDxgiFormat() const;
virtual ImageFormatType GetType() const = 0; virtual ImageFormatType GetType() const = 0;
virtual size_t GetPitch(unsigned mipLevel, unsigned width) const = 0; virtual size_t GetPitch(unsigned mipLevel, unsigned width) const = 0;
@ -87,7 +87,7 @@ public:
ImageFormatUnsigned(ImageFormatId id, ImageFormatUnsigned(ImageFormatId id,
oat::D3DFORMAT d3dFormat, oat::D3DFORMAT d3dFormat,
DXGI_FORMAT dxgiFormat, oat::DXGI_FORMAT dxgiFormat,
unsigned bitsPerPixel, unsigned bitsPerPixel,
unsigned rOffset, unsigned rOffset,
unsigned rSize, unsigned rSize,
@ -114,7 +114,7 @@ public:
unsigned m_block_size; unsigned m_block_size;
unsigned m_bits_per_block; unsigned m_bits_per_block;
ImageFormatBlockCompressed(ImageFormatId id, oat::D3DFORMAT d3dFormat, DXGI_FORMAT dxgiFormat, unsigned blockSize, unsigned bitsPerBlock); ImageFormatBlockCompressed(ImageFormatId id, oat::D3DFORMAT d3dFormat, oat::DXGI_FORMAT dxgiFormat, unsigned blockSize, unsigned bitsPerBlock);
ImageFormatType GetType() const override; ImageFormatType GetType() const override;
size_t GetPitch(unsigned mipLevel, unsigned width) const override; size_t GetPitch(unsigned mipLevel, unsigned width) const override;

2
src/ObjLoading/Game/T6/ObjLoaderT6.cpp
View File

@ -351,7 +351,7 @@ namespace T6
else else
textureLoader.Type(TextureType::T_2D); textureLoader.Type(TextureType::T_2D);
textureLoader.Format(static_cast<DXGI_FORMAT>(loadDef->format)); textureLoader.Format(static_cast<oat::DXGI_FORMAT>(loadDef->format));
textureLoader.HasMipMaps(!(loadDef->flags & iwi27::IMG_FLAG_NOMIPMAPS)); textureLoader.HasMipMaps(!(loadDef->flags & iwi27::IMG_FLAG_NOMIPMAPS));
Texture* loadedTexture = textureLoader.LoadTexture(image->texture.loadDef->data); Texture* loadedTexture = textureLoader.LoadTexture(image->texture.loadDef->data);

4
src/ObjLoading/Image/Dx12TextureLoader.cpp
View File

@ -4,7 +4,7 @@
Dx12TextureLoader::Dx12TextureLoader(MemoryManager* memoryManager) Dx12TextureLoader::Dx12TextureLoader(MemoryManager* memoryManager)
: m_memory_manager(memoryManager), : m_memory_manager(memoryManager),
m_format(DXGI_FORMAT_UNKNOWN), m_format(oat::DXGI_FORMAT_UNKNOWN),
m_type(TextureType::T_2D), m_type(TextureType::T_2D),
m_has_mip_maps(false), m_has_mip_maps(false),
m_width(1u), m_width(1u),
@ -24,7 +24,7 @@ const ImageFormat* Dx12TextureLoader::GetFormatForDx12Format() const
return nullptr; return nullptr;
} }
Dx12TextureLoader& Dx12TextureLoader::Format(const DXGI_FORMAT format) Dx12TextureLoader& Dx12TextureLoader::Format(const oat::DXGI_FORMAT format)
{ {
m_format = format; m_format = format;
return *this; return *this;

4
src/ObjLoading/Image/Dx12TextureLoader.h
View File

@ -12,7 +12,7 @@ class Dx12TextureLoader
static std::unordered_map<ImageFormatId, ImageFormatId> m_conversion_table; static std::unordered_map<ImageFormatId, ImageFormatId> m_conversion_table;
MemoryManager* m_memory_manager; MemoryManager* m_memory_manager;
DXGI_FORMAT m_format; oat::DXGI_FORMAT m_format;
TextureType m_type; TextureType m_type;
bool m_has_mip_maps; bool m_has_mip_maps;
size_t m_width; size_t m_width;
@ -24,7 +24,7 @@ class Dx12TextureLoader
public: public:
explicit Dx12TextureLoader(MemoryManager* memoryManager); explicit Dx12TextureLoader(MemoryManager* memoryManager);
Dx12TextureLoader& Format(DXGI_FORMAT format); Dx12TextureLoader& Format(oat::DXGI_FORMAT format);
Dx12TextureLoader& Type(TextureType textureType); Dx12TextureLoader& Type(TextureType textureType);
Dx12TextureLoader& HasMipMaps(bool hasMipMaps); Dx12TextureLoader& HasMipMaps(bool hasMipMaps);
Dx12TextureLoader& Width(size_t width); Dx12TextureLoader& Width(size_t width);

6
src/ObjWriting/Image/DdsWriter.cpp
View File

@ -39,13 +39,13 @@ class DdsWriterInternal
// Use standard pixel format for DXT1-5 for maximum compatibility and only otherwise use DX10 extension // Use standard pixel format for DXT1-5 for maximum compatibility and only otherwise use DX10 extension
switch (format->GetDxgiFormat()) switch (format->GetDxgiFormat())
{ {
case DXGI_FORMAT_BC1_UNORM: case oat::DXGI_FORMAT_BC1_UNORM:
pf.dwFourCC = MakeFourCc('D', 'X', 'T', '1'); pf.dwFourCC = MakeFourCc('D', 'X', 'T', '1');
break; break;
case DXGI_FORMAT_BC2_UNORM: case oat::DXGI_FORMAT_BC2_UNORM:
pf.dwFourCC = MakeFourCc('D', 'X', 'T', '3'); pf.dwFourCC = MakeFourCc('D', 'X', 'T', '3');
break; break;
case DXGI_FORMAT_BC3_UNORM: case oat::DXGI_FORMAT_BC3_UNORM:
pf.dwFourCC = MakeFourCc('D', 'X', 'T', '5'); pf.dwFourCC = MakeFourCc('D', 'X', 'T', '5');
break; break;
default: default: