Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
vkd3d
Manage
Activity
Members
Labels
Plan
Wiki
Bugzilla
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
wine
vkd3d
Commits
c9426e93
Commit
c9426e93
authored
7 years ago
by
Józef Kucia
Browse files
Options
Downloads
Patches
Plain Diff
libs/vkd3d: Reduce width of format tables.
parent
39ff9e48
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
libs/vkd3d/utils.c
+60
-52
60 additions, 52 deletions
libs/vkd3d/utils.c
with
60 additions
and
52 deletions
libs/vkd3d/utils.c
+
60
−
52
View file @
c9426e93
...
...
@@ -18,66 +18,74 @@
#include
"vkd3d_private.h"
#define COLOR (VK_IMAGE_ASPECT_COLOR_BIT)
#define DEPTH (VK_IMAGE_ASPECT_DEPTH_BIT)
#define STENCIL (VK_IMAGE_ASPECT_STENCIL_BIT)
#define DEPTH_STENCIL (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)
static
const
struct
vkd3d_format
vkd3d_formats
[]
=
{
{
DXGI_FORMAT_R32G32B32A32_FLOAT
,
VK_FORMAT_R32G32B32A32_SFLOAT
,
16
,
1
,
1
,
1
,
VK_IMAGE_ASPECT_
COLOR
_BIT
},
{
DXGI_FORMAT_R32G32B32A32_UINT
,
VK_FORMAT_R32G32B32A32_UINT
,
16
,
1
,
1
,
1
,
VK_IMAGE_ASPECT_
COLOR
_BIT
},
{
DXGI_FORMAT_R32G32B32A32_SINT
,
VK_FORMAT_R32G32B32A32_SINT
,
16
,
1
,
1
,
1
,
VK_IMAGE_ASPECT_
COLOR
_BIT
},
{
DXGI_FORMAT_R32G32B32_FLOAT
,
VK_FORMAT_R32G32B32_SFLOAT
,
12
,
1
,
1
,
1
,
VK_IMAGE_ASPECT_
COLOR
_BIT
},
{
DXGI_FORMAT_R32G32_FLOAT
,
VK_FORMAT_R32G32_SFLOAT
,
8
,
1
,
1
,
1
,
VK_IMAGE_ASPECT_
COLOR
_BIT
},
{
DXGI_FORMAT_R16G16B16A16_FLOAT
,
VK_FORMAT_R16G16B16A16_SFLOAT
,
8
,
1
,
1
,
1
,
VK_IMAGE_ASPECT_
COLOR
_BIT
},
{
DXGI_FORMAT_R16G16B16A16_UINT
,
VK_FORMAT_R16G16B16A16_UINT
,
8
,
1
,
1
,
1
,
VK_IMAGE_ASPECT_
COLOR
_BIT
},
{
DXGI_FORMAT_R10G10B10A2_UNORM
,
VK_FORMAT_A2B10G10R10_UNORM_PACK32
,
4
,
1
,
1
,
1
,
VK_IMAGE_ASPECT_
COLOR
_BIT
},
{
DXGI_FORMAT_R11G11B10_FLOAT
,
VK_FORMAT_B10G11R11_UFLOAT_PACK32
,
4
,
1
,
1
,
1
,
VK_IMAGE_ASPECT_
COLOR
_BIT
},
{
DXGI_FORMAT_R8G8B8A8_TYPELESS
,
VK_FORMAT_R8G8B8A8_UNORM
,
4
,
1
,
1
,
1
,
VK_IMAGE_ASPECT_
COLOR
_BIT
},
{
DXGI_FORMAT_R8G8B8A8_UNORM
,
VK_FORMAT_R8G8B8A8_UNORM
,
4
,
1
,
1
,
1
,
VK_IMAGE_ASPECT_
COLOR
_BIT
},
{
DXGI_FORMAT_R8G8B8A8_UNORM_SRGB
,
VK_FORMAT_R8G8B8A8_SRGB
,
4
,
1
,
1
,
1
,
VK_IMAGE_ASPECT_
COLOR
_BIT
},
{
DXGI_FORMAT_R32_TYPELESS
,
VK_FORMAT_R32_UINT
,
4
,
1
,
1
,
1
,
VK_IMAGE_ASPECT_
COLOR
_BIT
},
{
DXGI_FORMAT_D32_FLOAT
,
VK_FORMAT_D32_SFLOAT
,
4
,
1
,
1
,
1
,
VK_IMAGE_ASPECT_
DEPTH
_BIT
},
{
DXGI_FORMAT_R32_FLOAT
,
VK_FORMAT_R32_SFLOAT
,
4
,
1
,
1
,
1
,
VK_IMAGE_ASPECT_
COLOR
_BIT
},
{
DXGI_FORMAT_R32_UINT
,
VK_FORMAT_R32_UINT
,
4
,
1
,
1
,
1
,
VK_IMAGE_ASPECT_
COLOR
_BIT
},
{
DXGI_FORMAT_R16_TYPELESS
,
VK_FORMAT_R16_UINT
,
2
,
1
,
1
,
1
,
VK_IMAGE_ASPECT_
COLOR
_BIT
},
{
DXGI_FORMAT_R16_FLOAT
,
VK_FORMAT_R16_SFLOAT
,
2
,
1
,
1
,
1
,
VK_IMAGE_ASPECT_
COLOR
_BIT
},
{
DXGI_FORMAT_D16_UNORM
,
VK_FORMAT_D16_UNORM
,
2
,
1
,
1
,
1
,
VK_IMAGE_ASPECT_
DEPTH
_BIT
},
{
DXGI_FORMAT_R16_UNORM
,
VK_FORMAT_R16_UNORM
,
2
,
1
,
1
,
1
,
VK_IMAGE_ASPECT_
COLOR
_BIT
},
{
DXGI_FORMAT_R8_UNORM
,
VK_FORMAT_R8_UNORM
,
1
,
1
,
1
,
1
,
VK_IMAGE_ASPECT_
COLOR
_BIT
},
{
DXGI_FORMAT_R8_UINT
,
VK_FORMAT_R8_UINT
,
1
,
1
,
1
,
1
,
VK_IMAGE_ASPECT_
COLOR
_BIT
},
{
DXGI_FORMAT_R8_SNORM
,
VK_FORMAT_R8_SNORM
,
1
,
1
,
1
,
1
,
VK_IMAGE_ASPECT_
COLOR
_BIT
},
{
DXGI_FORMAT_B8G8R8A8_UNORM
,
VK_FORMAT_B8G8R8A8_UNORM
,
4
,
1
,
1
,
1
,
VK_IMAGE_ASPECT_
COLOR
_BIT
},
{
DXGI_FORMAT_B8G8R8A8_TYPELESS
,
VK_FORMAT_B8G8R8A8_UNORM
,
4
,
1
,
1
,
1
,
VK_IMAGE_ASPECT_
COLOR
_BIT
},
{
DXGI_FORMAT_B8G8R8A8_UNORM_SRGB
,
VK_FORMAT_B8G8R8A8_SRGB
,
4
,
1
,
1
,
1
,
VK_IMAGE_ASPECT_
COLOR
_BIT
},
{
DXGI_FORMAT_BC1_UNORM
,
VK_FORMAT_BC1_RGB_UNORM_BLOCK
,
1
,
4
,
4
,
8
,
VK_IMAGE_ASPECT_
COLOR
_BIT
},
{
DXGI_FORMAT_BC1_UNORM_SRGB
,
VK_FORMAT_BC1_RGB_SRGB_BLOCK
,
1
,
4
,
4
,
8
,
VK_IMAGE_ASPECT_
COLOR
_BIT
},
{
DXGI_FORMAT_BC2_UNORM
,
VK_FORMAT_BC2_UNORM_BLOCK
,
1
,
4
,
4
,
16
,
VK_IMAGE_ASPECT_
COLOR
_BIT
},
{
DXGI_FORMAT_BC2_UNORM_SRGB
,
VK_FORMAT_BC2_SRGB_BLOCK
,
1
,
4
,
4
,
16
,
VK_IMAGE_ASPECT_
COLOR
_BIT
},
{
DXGI_FORMAT_BC3_UNORM
,
VK_FORMAT_BC3_UNORM_BLOCK
,
1
,
4
,
4
,
16
,
VK_IMAGE_ASPECT_
COLOR
_BIT
},
{
DXGI_FORMAT_BC3_UNORM_SRGB
,
VK_FORMAT_BC3_SRGB_BLOCK
,
1
,
4
,
4
,
16
,
VK_IMAGE_ASPECT_
COLOR
_BIT
},
{
DXGI_FORMAT_BC4_UNORM
,
VK_FORMAT_BC4_UNORM_BLOCK
,
1
,
4
,
4
,
8
,
VK_IMAGE_ASPECT_
COLOR
_BIT
},
{
DXGI_FORMAT_BC4_SNORM
,
VK_FORMAT_BC4_SNORM_BLOCK
,
1
,
4
,
4
,
8
,
VK_IMAGE_ASPECT_
COLOR
_BIT
},
{
DXGI_FORMAT_BC5_UNORM
,
VK_FORMAT_BC5_UNORM_BLOCK
,
1
,
4
,
4
,
16
,
VK_IMAGE_ASPECT_
COLOR
_BIT
},
{
DXGI_FORMAT_BC5_SNORM
,
VK_FORMAT_BC5_SNORM_BLOCK
,
1
,
4
,
4
,
16
,
VK_IMAGE_ASPECT_
COLOR
_BIT
},
{
DXGI_FORMAT_BC6H_UF16
,
VK_FORMAT_BC6H_UFLOAT_BLOCK
,
1
,
4
,
4
,
16
,
VK_IMAGE_ASPECT_
COLOR
_BIT
},
{
DXGI_FORMAT_BC6H_SF16
,
VK_FORMAT_BC6H_SFLOAT_BLOCK
,
1
,
4
,
4
,
16
,
VK_IMAGE_ASPECT_
COLOR
_BIT
},
{
DXGI_FORMAT_BC7_UNORM
,
VK_FORMAT_BC7_UNORM_BLOCK
,
1
,
4
,
4
,
16
,
VK_IMAGE_ASPECT_
COLOR
_BIT
},
{
DXGI_FORMAT_BC7_UNORM_SRGB
,
VK_FORMAT_BC7_SRGB_BLOCK
,
1
,
4
,
4
,
16
,
VK_IMAGE_ASPECT_
COLOR
_BIT
},
{
DXGI_FORMAT_R32G32B32A32_FLOAT
,
VK_FORMAT_R32G32B32A32_SFLOAT
,
16
,
1
,
1
,
1
,
COLOR
},
{
DXGI_FORMAT_R32G32B32A32_UINT
,
VK_FORMAT_R32G32B32A32_UINT
,
16
,
1
,
1
,
1
,
COLOR
},
{
DXGI_FORMAT_R32G32B32A32_SINT
,
VK_FORMAT_R32G32B32A32_SINT
,
16
,
1
,
1
,
1
,
COLOR
},
{
DXGI_FORMAT_R32G32B32_FLOAT
,
VK_FORMAT_R32G32B32_SFLOAT
,
12
,
1
,
1
,
1
,
COLOR
},
{
DXGI_FORMAT_R32G32_FLOAT
,
VK_FORMAT_R32G32_SFLOAT
,
8
,
1
,
1
,
1
,
COLOR
},
{
DXGI_FORMAT_R16G16B16A16_FLOAT
,
VK_FORMAT_R16G16B16A16_SFLOAT
,
8
,
1
,
1
,
1
,
COLOR
},
{
DXGI_FORMAT_R16G16B16A16_UINT
,
VK_FORMAT_R16G16B16A16_UINT
,
8
,
1
,
1
,
1
,
COLOR
},
{
DXGI_FORMAT_R10G10B10A2_UNORM
,
VK_FORMAT_A2B10G10R10_UNORM_PACK32
,
4
,
1
,
1
,
1
,
COLOR
},
{
DXGI_FORMAT_R11G11B10_FLOAT
,
VK_FORMAT_B10G11R11_UFLOAT_PACK32
,
4
,
1
,
1
,
1
,
COLOR
},
{
DXGI_FORMAT_R8G8B8A8_TYPELESS
,
VK_FORMAT_R8G8B8A8_UNORM
,
4
,
1
,
1
,
1
,
COLOR
},
{
DXGI_FORMAT_R8G8B8A8_UNORM
,
VK_FORMAT_R8G8B8A8_UNORM
,
4
,
1
,
1
,
1
,
COLOR
},
{
DXGI_FORMAT_R8G8B8A8_UNORM_SRGB
,
VK_FORMAT_R8G8B8A8_SRGB
,
4
,
1
,
1
,
1
,
COLOR
},
{
DXGI_FORMAT_R32_TYPELESS
,
VK_FORMAT_R32_UINT
,
4
,
1
,
1
,
1
,
COLOR
},
{
DXGI_FORMAT_D32_FLOAT
,
VK_FORMAT_D32_SFLOAT
,
4
,
1
,
1
,
1
,
DEPTH
},
{
DXGI_FORMAT_R32_FLOAT
,
VK_FORMAT_R32_SFLOAT
,
4
,
1
,
1
,
1
,
COLOR
},
{
DXGI_FORMAT_R32_UINT
,
VK_FORMAT_R32_UINT
,
4
,
1
,
1
,
1
,
COLOR
},
{
DXGI_FORMAT_R16_TYPELESS
,
VK_FORMAT_R16_UINT
,
2
,
1
,
1
,
1
,
COLOR
},
{
DXGI_FORMAT_R16_FLOAT
,
VK_FORMAT_R16_SFLOAT
,
2
,
1
,
1
,
1
,
COLOR
},
{
DXGI_FORMAT_D16_UNORM
,
VK_FORMAT_D16_UNORM
,
2
,
1
,
1
,
1
,
DEPTH
},
{
DXGI_FORMAT_R16_UNORM
,
VK_FORMAT_R16_UNORM
,
2
,
1
,
1
,
1
,
COLOR
},
{
DXGI_FORMAT_R8_UNORM
,
VK_FORMAT_R8_UNORM
,
1
,
1
,
1
,
1
,
COLOR
},
{
DXGI_FORMAT_R8_UINT
,
VK_FORMAT_R8_UINT
,
1
,
1
,
1
,
1
,
COLOR
},
{
DXGI_FORMAT_R8_SNORM
,
VK_FORMAT_R8_SNORM
,
1
,
1
,
1
,
1
,
COLOR
},
{
DXGI_FORMAT_B8G8R8A8_UNORM
,
VK_FORMAT_B8G8R8A8_UNORM
,
4
,
1
,
1
,
1
,
COLOR
},
{
DXGI_FORMAT_B8G8R8A8_TYPELESS
,
VK_FORMAT_B8G8R8A8_UNORM
,
4
,
1
,
1
,
1
,
COLOR
},
{
DXGI_FORMAT_B8G8R8A8_UNORM_SRGB
,
VK_FORMAT_B8G8R8A8_SRGB
,
4
,
1
,
1
,
1
,
COLOR
},
{
DXGI_FORMAT_BC1_UNORM
,
VK_FORMAT_BC1_RGB_UNORM_BLOCK
,
1
,
4
,
4
,
8
,
COLOR
},
{
DXGI_FORMAT_BC1_UNORM_SRGB
,
VK_FORMAT_BC1_RGB_SRGB_BLOCK
,
1
,
4
,
4
,
8
,
COLOR
},
{
DXGI_FORMAT_BC2_UNORM
,
VK_FORMAT_BC2_UNORM_BLOCK
,
1
,
4
,
4
,
16
,
COLOR
},
{
DXGI_FORMAT_BC2_UNORM_SRGB
,
VK_FORMAT_BC2_SRGB_BLOCK
,
1
,
4
,
4
,
16
,
COLOR
},
{
DXGI_FORMAT_BC3_UNORM
,
VK_FORMAT_BC3_UNORM_BLOCK
,
1
,
4
,
4
,
16
,
COLOR
},
{
DXGI_FORMAT_BC3_UNORM_SRGB
,
VK_FORMAT_BC3_SRGB_BLOCK
,
1
,
4
,
4
,
16
,
COLOR
},
{
DXGI_FORMAT_BC4_UNORM
,
VK_FORMAT_BC4_UNORM_BLOCK
,
1
,
4
,
4
,
8
,
COLOR
},
{
DXGI_FORMAT_BC4_SNORM
,
VK_FORMAT_BC4_SNORM_BLOCK
,
1
,
4
,
4
,
8
,
COLOR
},
{
DXGI_FORMAT_BC5_UNORM
,
VK_FORMAT_BC5_UNORM_BLOCK
,
1
,
4
,
4
,
16
,
COLOR
},
{
DXGI_FORMAT_BC5_SNORM
,
VK_FORMAT_BC5_SNORM_BLOCK
,
1
,
4
,
4
,
16
,
COLOR
},
{
DXGI_FORMAT_BC6H_UF16
,
VK_FORMAT_BC6H_UFLOAT_BLOCK
,
1
,
4
,
4
,
16
,
COLOR
},
{
DXGI_FORMAT_BC6H_SF16
,
VK_FORMAT_BC6H_SFLOAT_BLOCK
,
1
,
4
,
4
,
16
,
COLOR
},
{
DXGI_FORMAT_BC7_UNORM
,
VK_FORMAT_BC7_UNORM_BLOCK
,
1
,
4
,
4
,
16
,
COLOR
},
{
DXGI_FORMAT_BC7_UNORM_SRGB
,
VK_FORMAT_BC7_SRGB_BLOCK
,
1
,
4
,
4
,
16
,
COLOR
},
};
/* Each depth/stencil format is only compatible with itself in Vulkan. */
static
const
struct
vkd3d_format
vkd3d_depth_stencil_formats
[]
=
{
{
DXGI_FORMAT_R32G8X24_TYPELESS
,
VK_FORMAT_D32_SFLOAT_S8_UINT
,
8
,
1
,
1
,
1
,
VK_IMAGE_ASPECT_DEPTH_BIT
|
VK_IMAGE_ASPECT
_STENCIL
_BIT
},
{
DXGI_FORMAT_D32_FLOAT_S8X24_UINT
,
VK_FORMAT_D32_SFLOAT_S8_UINT
,
8
,
1
,
1
,
1
,
VK_IMAGE_ASPECT_DEPTH_BIT
|
VK_IMAGE_ASPECT
_STENCIL
_BIT
},
{
DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS
,
VK_FORMAT_D32_SFLOAT_S8_UINT
,
8
,
1
,
1
,
1
,
VK_IMAGE_ASPECT_
DEPTH
_BIT
},
{
DXGI_FORMAT_X32_TYPELESS_G8X24_UINT
,
VK_FORMAT_D32_SFLOAT_S8_UINT
,
8
,
1
,
1
,
1
,
VK_IMAGE_ASPECT_
STENCIL
_BIT
},
{
DXGI_FORMAT_R32_TYPELESS
,
VK_FORMAT_D32_SFLOAT
,
4
,
1
,
1
,
1
,
VK_IMAGE_ASPECT_
DEPTH
_BIT
},
{
DXGI_FORMAT_R32_FLOAT
,
VK_FORMAT_D32_SFLOAT
,
4
,
1
,
1
,
1
,
VK_IMAGE_ASPECT_
DEPTH
_BIT
},
{
DXGI_FORMAT_R24G8_TYPELESS
,
VK_FORMAT_D24_UNORM_S8_UINT
,
4
,
1
,
1
,
1
,
VK_IMAGE_ASPECT_DEPTH_BIT
|
VK_IMAGE_ASPECT
_STENCIL
_BIT
},
{
DXGI_FORMAT_D24_UNORM_S8_UINT
,
VK_FORMAT_D24_UNORM_S8_UINT
,
4
,
1
,
1
,
1
,
VK_IMAGE_ASPECT_DEPTH_BIT
|
VK_IMAGE_ASPECT
_STENCIL
_BIT
},
{
DXGI_FORMAT_R24_UNORM_X8_TYPELESS
,
VK_FORMAT_D24_UNORM_S8_UINT
,
4
,
1
,
1
,
1
,
VK_IMAGE_ASPECT_
DEPTH
_BIT
},
{
DXGI_FORMAT_X24_TYPELESS_G8_UINT
,
VK_FORMAT_D24_UNORM_S8_UINT
,
4
,
1
,
1
,
1
,
VK_IMAGE_ASPECT_
STENCIL
_BIT
},
{
DXGI_FORMAT_R16_TYPELESS
,
VK_FORMAT_D16_UNORM
,
2
,
1
,
1
,
1
,
VK_IMAGE_ASPECT_
DEPTH
_BIT
},
{
DXGI_FORMAT_R16_UNORM
,
VK_FORMAT_D16_UNORM
,
2
,
1
,
1
,
1
,
VK_IMAGE_ASPECT_
DEPTH
_BIT
},
{
DXGI_FORMAT_R32G8X24_TYPELESS
,
VK_FORMAT_D32_SFLOAT_S8_UINT
,
8
,
1
,
1
,
1
,
DEPTH
_STENCIL
},
{
DXGI_FORMAT_D32_FLOAT_S8X24_UINT
,
VK_FORMAT_D32_SFLOAT_S8_UINT
,
8
,
1
,
1
,
1
,
DEPTH
_STENCIL
},
{
DXGI_FORMAT_R32_FLOAT_X8X24_TYPELESS
,
VK_FORMAT_D32_SFLOAT_S8_UINT
,
8
,
1
,
1
,
1
,
DEPTH
},
{
DXGI_FORMAT_X32_TYPELESS_G8X24_UINT
,
VK_FORMAT_D32_SFLOAT_S8_UINT
,
8
,
1
,
1
,
1
,
STENCIL
},
{
DXGI_FORMAT_R32_TYPELESS
,
VK_FORMAT_D32_SFLOAT
,
4
,
1
,
1
,
1
,
DEPTH
},
{
DXGI_FORMAT_R32_FLOAT
,
VK_FORMAT_D32_SFLOAT
,
4
,
1
,
1
,
1
,
DEPTH
},
{
DXGI_FORMAT_R24G8_TYPELESS
,
VK_FORMAT_D24_UNORM_S8_UINT
,
4
,
1
,
1
,
1
,
DEPTH
_STENCIL
},
{
DXGI_FORMAT_D24_UNORM_S8_UINT
,
VK_FORMAT_D24_UNORM_S8_UINT
,
4
,
1
,
1
,
1
,
DEPTH
_STENCIL
},
{
DXGI_FORMAT_R24_UNORM_X8_TYPELESS
,
VK_FORMAT_D24_UNORM_S8_UINT
,
4
,
1
,
1
,
1
,
DEPTH
},
{
DXGI_FORMAT_X24_TYPELESS_G8_UINT
,
VK_FORMAT_D24_UNORM_S8_UINT
,
4
,
1
,
1
,
1
,
STENCIL
},
{
DXGI_FORMAT_R16_TYPELESS
,
VK_FORMAT_D16_UNORM
,
2
,
1
,
1
,
1
,
DEPTH
},
{
DXGI_FORMAT_R16_UNORM
,
VK_FORMAT_D16_UNORM
,
2
,
1
,
1
,
1
,
DEPTH
},
};
#undef COLOR
#undef DEPTH
#undef STENCIL
#undef DEPTH_STENCIL
/* We use overrides for depth/stencil formats. This is required in order to
* properly support typeless formats because depth/stencil formats are only
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment