Skip to content

Commit

Permalink
Fix the format problem for Vulkan Depth Attachment (#301)
Browse files Browse the repository at this point in the history 
* Fix the format problem for Vulkan Depth Attachment

This bring back the depth buffer

In short, when we copy the depth data from a depth_stencil format image,
we need to extract only the depth part, so we need a mapping from
depth_stencil format to the corresponding pure depth format.

But when we create the staging image, we still need to use the
depth_stencil format, as vkCmdBlitImage requires the src image and dst
image to be generally the same (if either of srcImage or dstImage was
created with a depth/stencil format, the other must also have been
created with EXACTLY the same format.

Also, when the source image is a depth/stencil image, the filter of
vkCmdBlitImage must be VK_FILTER_NEAREST

* Add new formats in test

* Use unicode to label Channel_Undefined, fix format test
  • Loading branch information
@Qining
Qining committed Apr 27, 2017
1 parent d769508 commit 2bba744
Show file tree
Hide file tree
Showing 6 changed files with 222 additions and 155 deletions.
2 changes: 2 additions & 0 deletions core/stream/channel.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ func (c Channel) Format(w fmt.State, r rune) {
fmt.Fprint(w, "Y")
case Channel_Z:
fmt.Fprint(w, "Z")
case Channel_Undefined:
fmt.Fprint(w, "Ж")
default:
fmt.Fprint(w, "?")
}
Expand Down
14 changes: 14 additions & 0 deletions core/stream/fmts/d.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,18 @@ var (
Channel: stream.Channel_Depth,
}},
}

ЖD_U8U24_NORM = &stream.Format{
// According to Vulkan Spec, the first 8 bit is not used,
// the following 24 bits are used for depth.
Components: []*stream.Component{{
DataType: &stream.U8,
Sampling: stream.LinearNormalized,
Channel: stream.Channel_Undefined,
}, {
DataType: &stream.U24,
Sampling: stream.LinearNormalized,
Channel: stream.Channel_Depth,
}},
}
)
24 changes: 24 additions & 0 deletions core/stream/fmts/ds.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,18 @@ var (
}},
}

DS_NU16S8 = &stream.Format{
Components: []*stream.Component{{
DataType: &stream.U16,
Sampling: stream.LinearNormalized,
Channel: stream.Channel_Depth,
}, {
DataType: &stream.S8,
Sampling: stream.Linear,
Channel: stream.Channel_Stencil,
}},
}

DS_NU24U8 = &stream.Format{
Components: []*stream.Component{{
DataType: &stream.U24,
Expand All @@ -41,6 +53,18 @@ var (
}},
}

DS_NU24S8 = &stream.Format{
Components: []*stream.Component{{
DataType: &stream.U24,
Sampling: stream.LinearNormalized,
Channel: stream.Channel_Depth,
}, {
DataType: &stream.S8,
Sampling: stream.Linear,
Channel: stream.Channel_Stencil,
}},
}

DS_F32U8 = &stream.Format{
Components: []*stream.Component{{
DataType: &stream.F32,
Expand Down
287 changes: 145 additions & 142 deletions core/stream/fmts/fmts_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,148 +28,151 @@ func TestFormatNames(t *testing.T) {
assert := assert.To(t)

for n, f := range map[string]*stream.Format{
"ABGR_U8": fmts.ABGR_U8,
"ABGR_S8": fmts.ABGR_S8,
"ABGR_U8_NORM": fmts.ABGR_U8_NORM,
"ABGR_S8_NORM": fmts.ABGR_S8_NORM,
"ABGR_NU8N_sRGBU8N_sRGBU8N_sRGBU8": fmts.ABGR_NU8N_sRGBU8N_sRGBU8N_sRGBU8,
"ABGR_U2U10U10U10": fmts.ABGR_U2U10U10U10,
"ABGR_S2S10S10S10": fmts.ABGR_S2S10S10S10,
"ABGR_U2U10U10U10_NORM": fmts.ABGR_U2U10U10U10_NORM,
"ABGR_S2S10S10S10_NORM": fmts.ABGR_S2S10S10S10_NORM,
"ARGB_U1U5U5U5_NORM": fmts.ARGB_U1U5U5U5_NORM,
"ARGB_U2U10U10U10": fmts.ARGB_U2U10U10U10,
"ARGB_S2S10S10S10": fmts.ARGB_S2S10S10S10,
"ARGB_U2U10U10U10_NORM": fmts.ARGB_U2U10U10U10_NORM,
"ARGB_S2S10S10S10_NORM": fmts.ARGB_S2S10S10S10_NORM,
"A_U16_NORM": fmts.A_U16_NORM,
"A_U8_NORM": fmts.A_U8_NORM,
"BGR_U5U6U5_NORM": fmts.BGR_U5U6U5_NORM,
"BGR_F10F11F11": fmts.BGR_F10F11F11,
"BGR_U8": fmts.BGR_U8,
"BGR_S8": fmts.BGR_S8,
"BGR_U8_NORM": fmts.BGR_U8_NORM,
"BGR_S8_NORM": fmts.BGR_S8_NORM,
"BGR_U8_NORM_sRGB": fmts.BGR_U8_NORM_sRGB,
"BGRA_U4_NORM": fmts.BGRA_U4_NORM,
"BGRA_U5U5U5U1_NORM": fmts.BGRA_U5U5U5U1_NORM,
"BGRA_U8": fmts.BGRA_U8,
"BGRA_S8": fmts.BGRA_S8,
"BGRA_U8_NORM": fmts.BGRA_U8_NORM,
"BGRA_S8_NORM": fmts.BGRA_S8_NORM,
"BGRA_N_sRGBU8N_sRGBU8N_sRGBU8NU8": fmts.BGRA_N_sRGBU8N_sRGBU8N_sRGBU8NU8,
"D_F32": fmts.D_F32,
"D_U16_NORM": fmts.D_U16_NORM,
"DS_F32U8": fmts.DS_F32U8,
"DS_NU16U8": fmts.DS_NU16U8,
"DS_NU24U8": fmts.DS_NU24U8,
"Gray_U16_NORM": fmts.Gray_U16_NORM,
"Gray_U8_NORM": fmts.Gray_U8_NORM,
"L_F32": fmts.L_F32,
"L_U8_NORM": fmts.L_U8_NORM,
"LA_U8_NORM": fmts.LA_U8_NORM,
"R_U16_NORM": fmts.R_U16_NORM,
"R_U8": fmts.R_U8,
"R_S8": fmts.R_S8,
"R_U8_NORM": fmts.R_U8_NORM,
"R_S8_NORM": fmts.R_S8_NORM,
"R_U8_NORM_sRGB": fmts.R_U8_NORM_sRGB,
"R_U16": fmts.R_U16,
"R_S16": fmts.R_S16,
"R_S16_NORM": fmts.R_S16_NORM,
"R_F16": fmts.R_F16,
"R_U32": fmts.R_U32,
"R_S32": fmts.R_S32,
"R_F32": fmts.R_F32,
"R_U64": fmts.R_U64,
"R_S64": fmts.R_S64,
"R_F64": fmts.R_F64,
"RG_U4_NORM": fmts.RG_U4_NORM,
"RG_S8": fmts.RG_S8,
"RG_F16": fmts.RG_F16,
"RG_F32": fmts.RG_F32,
"RG_U8_NORM": fmts.RG_U8_NORM,
"RG_S8_NORM": fmts.RG_S8_NORM,
"RG_U8": fmts.RG_U8,
"RG_U8_NORM_sRGB": fmts.RG_U8_NORM_sRGB,
"RG_U16": fmts.RG_U16,
"RG_S16": fmts.RG_S16,
"RG_U16_NORM": fmts.RG_U16_NORM,
"RG_S16_NORM": fmts.RG_S16_NORM,
"RG_U32": fmts.RG_U32,
"RG_S32": fmts.RG_S32,
"RG_U64": fmts.RG_U64,
"RG_S64": fmts.RG_S64,
"RG_F64": fmts.RG_F64,
"RGB_U1_NORM": fmts.RGB_U1_NORM,
"RGB_U1": fmts.RGB_U1,
"RGB_U4_NORM": fmts.RGB_U4_NORM,
"RGB_U4": fmts.RGB_U4,
"RGB_U5_NORM": fmts.RGB_U5_NORM,
"RGB_U5U6U5_NORM": fmts.RGB_U5U6U5_NORM,
"RGB_U8": fmts.RGB_U8,
"RGB_S8": fmts.RGB_S8,
"RGB_U8_NORM": fmts.RGB_U8_NORM,
"RGB_S8_NORM": fmts.RGB_S8_NORM,
"RGB_U8_NORM_sRGB": fmts.RGB_U8_NORM_sRGB,
"RGB_S16": fmts.RGB_S16,
"RGB_U16": fmts.RGB_U16,
"RGB_U16_NORM": fmts.RGB_U16_NORM,
"RGB_S16_NORM": fmts.RGB_S16_NORM,
"RGB_F16": fmts.RGB_F16,
"RGB_S32": fmts.RGB_S32,
"RGB_U32": fmts.RGB_U32,
"RGB_F32": fmts.RGB_F32,
"RGB_S64": fmts.RGB_S64,
"RGB_U64": fmts.RGB_U64,
"RGB_F64": fmts.RGB_F64,
"RGBA_U10U10U10U2_NORM": fmts.RGBA_U10U10U10U2_NORM,
"RGBA_U4_NORM": fmts.RGBA_U4_NORM,
"RGBA_U5U5U5U1_NORM": fmts.RGBA_U5U5U5U1_NORM,
"RGBA_U8": fmts.RGBA_U8,
"RGBA_S8": fmts.RGBA_S8,
"RGBA_U8_NORM": fmts.RGBA_U8_NORM,
"RGBA_S8_NORM": fmts.RGBA_S8_NORM,
"RGBA_N_sRGBU8N_sRGBU8N_sRGBU8NU8": fmts.RGBA_N_sRGBU8N_sRGBU8N_sRGBU8NU8,
"RGBA_U16": fmts.RGBA_U16,
"RGBA_S16": fmts.RGBA_S16,
"RGBA_U16_NORM": fmts.RGBA_U16_NORM,
"RGBA_S16_NORM": fmts.RGBA_S16_NORM,
"RGBA_F16": fmts.RGBA_F16,
"RGBA_U32": fmts.RGBA_U32,
"RGBA_S32": fmts.RGBA_S32,
"RGBA_F32": fmts.RGBA_F32,
"RGBA_U64": fmts.RGBA_U64,
"RGBA_S64": fmts.RGBA_S64,
"RGBA_F64": fmts.RGBA_F64,
"SD_U8F32": fmts.SD_U8F32,
"SD_U8NU16": fmts.SD_U8NU16,
"SD_U8NU24": fmts.SD_U8NU24,
"XY_F32": fmts.XY_F32,
"XYZ_F32": fmts.XYZ_F32,
"XYZ_F64": fmts.XYZ_F64,
"XYZ_S16_NORM": fmts.XYZ_S16_NORM,
"XYZ_S16": fmts.XYZ_S16,
"XYZ_S8_NORM": fmts.XYZ_S8_NORM,
"XYZ_S8": fmts.XYZ_S8,
"XYZW_F32": fmts.XYZW_F32,
"XYZW_F64": fmts.XYZW_F64,
"XYZW_S10S10S10S2_NORM": fmts.XYZW_S10S10S10S2_NORM,
"XYZW_S10S10S10S2": fmts.XYZW_S10S10S10S2,
"XYZW_S16_NORM": fmts.XYZW_S16_NORM,
"XYZW_S16": fmts.XYZW_S16,
"XYZW_S32_NORM": fmts.XYZW_S32_NORM,
"XYZW_S32": fmts.XYZW_S32,
"XYZW_S8_NORM": fmts.XYZW_S8_NORM,
"XYZW_S8": fmts.XYZW_S8,
"XYZW_U10U10U10U2_NORM": fmts.XYZW_U10U10U10U2_NORM,
"XYZW_U10U10U10U2": fmts.XYZW_U10U10U10U2,
"XYZW_U16_NORM": fmts.XYZW_U16_NORM,
"XYZW_U16": fmts.XYZW_U16,
"XYZW_U32_NORM": fmts.XYZW_U32_NORM,
"XYZW_U32": fmts.XYZW_U32,
"XYZW_U8_NORM": fmts.XYZW_U8_NORM,
"XYZW_U8": fmts.XYZW_U8,
"ABGR_U8": fmts.ABGR_U8,
"ABGR_S8": fmts.ABGR_S8,
"ABGR_U8_NORM": fmts.ABGR_U8_NORM,
"ABGR_S8_NORM": fmts.ABGR_S8_NORM,
"ABGR_NU8N_sRGBU8N_sRGBU8N_sRGBU8": fmts.ABGR_NU8N_sRGBU8N_sRGBU8N_sRGBU8,
"ABGR_U2U10U10U10": fmts.ABGR_U2U10U10U10,
"ABGR_S2S10S10S10": fmts.ABGR_S2S10S10S10,
"ABGR_U2U10U10U10_NORM": fmts.ABGR_U2U10U10U10_NORM,
"ABGR_S2S10S10S10_NORM": fmts.ABGR_S2S10S10S10_NORM,
"ARGB_U1U5U5U5_NORM": fmts.ARGB_U1U5U5U5_NORM,
"ARGB_U2U10U10U10": fmts.ARGB_U2U10U10U10,
"ARGB_S2S10S10S10": fmts.ARGB_S2S10S10S10,
"ARGB_U2U10U10U10_NORM": fmts.ARGB_U2U10U10U10_NORM,
"ARGB_S2S10S10S10_NORM": fmts.ARGB_S2S10S10S10_NORM,
"A_U16_NORM": fmts.A_U16_NORM,
"A_U8_NORM": fmts.A_U8_NORM,
"BGR_U5U6U5_NORM": fmts.BGR_U5U6U5_NORM,
"BGR_F10F11F11": fmts.BGR_F10F11F11,
"BGR_U8": fmts.BGR_U8,
"BGR_S8": fmts.BGR_S8,
"BGR_U8_NORM": fmts.BGR_U8_NORM,
"BGR_S8_NORM": fmts.BGR_S8_NORM,
"BGR_U8_NORM_sRGB": fmts.BGR_U8_NORM_sRGB,
"BGRA_U4_NORM": fmts.BGRA_U4_NORM,
"BGRA_U5U5U5U1_NORM": fmts.BGRA_U5U5U5U1_NORM,
"BGRA_U8": fmts.BGRA_U8,
"BGRA_S8": fmts.BGRA_S8,
"BGRA_U8_NORM": fmts.BGRA_U8_NORM,
"BGRA_S8_NORM": fmts.BGRA_S8_NORM,
"BGRA_N_sRGBU8N_sRGBU8N_sRGBU8NU8": fmts.BGRA_N_sRGBU8N_sRGBU8N_sRGBU8NU8,
"D_F32": fmts.D_F32,
"D_U16_NORM": fmts.D_U16_NORM,
"ЖD_U8U24_NORM": fmts.ЖD_U8U24_NORM,
"DS_F32U8": fmts.DS_F32U8,
"DS_NU16U8": fmts.DS_NU16U8,
"DS_NU16S8": fmts.DS_NU16S8,
"DS_NU24U8": fmts.DS_NU24U8,
"DS_NU24S8": fmts.DS_NU24S8,
"Gray_U16_NORM": fmts.Gray_U16_NORM,
"Gray_U8_NORM": fmts.Gray_U8_NORM,
"L_F32": fmts.L_F32,
"L_U8_NORM": fmts.L_U8_NORM,
"LA_U8_NORM": fmts.LA_U8_NORM,
"R_U16_NORM": fmts.R_U16_NORM,
"R_U8": fmts.R_U8,
"R_S8": fmts.R_S8,
"R_U8_NORM": fmts.R_U8_NORM,
"R_S8_NORM": fmts.R_S8_NORM,
"R_U8_NORM_sRGB": fmts.R_U8_NORM_sRGB,
"R_U16": fmts.R_U16,
"R_S16": fmts.R_S16,
"R_S16_NORM": fmts.R_S16_NORM,
"R_F16": fmts.R_F16,
"R_U32": fmts.R_U32,
"R_S32": fmts.R_S32,
"R_F32": fmts.R_F32,
"R_U64": fmts.R_U64,
"R_S64": fmts.R_S64,
"R_F64": fmts.R_F64,
"RG_U4_NORM": fmts.RG_U4_NORM,
"RG_S8": fmts.RG_S8,
"RG_F16": fmts.RG_F16,
"RG_F32": fmts.RG_F32,
"RG_U8_NORM": fmts.RG_U8_NORM,
"RG_S8_NORM": fmts.RG_S8_NORM,
"RG_U8": fmts.RG_U8,
"RG_U8_NORM_sRGB": fmts.RG_U8_NORM_sRGB,
"RG_U16": fmts.RG_U16,
"RG_S16": fmts.RG_S16,
"RG_U16_NORM": fmts.RG_U16_NORM,
"RG_S16_NORM": fmts.RG_S16_NORM,
"RG_U32": fmts.RG_U32,
"RG_S32": fmts.RG_S32,
"RG_U64": fmts.RG_U64,
"RG_S64": fmts.RG_S64,
"RG_F64": fmts.RG_F64,
"RGB_U1_NORM": fmts.RGB_U1_NORM,
"RGB_U1": fmts.RGB_U1,
"RGB_U4_NORM": fmts.RGB_U4_NORM,
"RGB_U4": fmts.RGB_U4,
"RGB_U5_NORM": fmts.RGB_U5_NORM,
"RGB_U5U6U5_NORM": fmts.RGB_U5U6U5_NORM,
"RGB_U8": fmts.RGB_U8,
"RGB_S8": fmts.RGB_S8,
"RGB_U8_NORM": fmts.RGB_U8_NORM,
"RGB_S8_NORM": fmts.RGB_S8_NORM,
"RGB_U8_NORM_sRGB": fmts.RGB_U8_NORM_sRGB,
"RGB_S16": fmts.RGB_S16,
"RGB_U16": fmts.RGB_U16,
"RGB_U16_NORM": fmts.RGB_U16_NORM,
"RGB_S16_NORM": fmts.RGB_S16_NORM,
"RGB_F16": fmts.RGB_F16,
"RGB_S32": fmts.RGB_S32,
"RGB_U32": fmts.RGB_U32,
"RGB_F32": fmts.RGB_F32,
"RGB_S64": fmts.RGB_S64,
"RGB_U64": fmts.RGB_U64,
"RGB_F64": fmts.RGB_F64,
"RGBA_U10U10U10U2_NORM": fmts.RGBA_U10U10U10U2_NORM,
"RGBA_U4_NORM": fmts.RGBA_U4_NORM,
"RGBA_U5U5U5U1_NORM": fmts.RGBA_U5U5U5U1_NORM,
"RGBA_U8": fmts.RGBA_U8,
"RGBA_S8": fmts.RGBA_S8,
"RGBA_U8_NORM": fmts.RGBA_U8_NORM,
"RGBA_S8_NORM": fmts.RGBA_S8_NORM,
"RGBA_N_sRGBU8N_sRGBU8N_sRGBU8NU8": fmts.RGBA_N_sRGBU8N_sRGBU8N_sRGBU8NU8,
"RGBA_U16": fmts.RGBA_U16,
"RGBA_S16": fmts.RGBA_S16,
"RGBA_U16_NORM": fmts.RGBA_U16_NORM,
"RGBA_S16_NORM": fmts.RGBA_S16_NORM,
"RGBA_F16": fmts.RGBA_F16,
"RGBA_U32": fmts.RGBA_U32,
"RGBA_S32": fmts.RGBA_S32,
"RGBA_F32": fmts.RGBA_F32,
"RGBA_U64": fmts.RGBA_U64,
"RGBA_S64": fmts.RGBA_S64,
"RGBA_F64": fmts.RGBA_F64,
"SD_U8F32": fmts.SD_U8F32,
"SD_U8NU16": fmts.SD_U8NU16,
"SD_U8NU24": fmts.SD_U8NU24,
"XY_F32": fmts.XY_F32,
"XYZ_F32": fmts.XYZ_F32,
"XYZ_F64": fmts.XYZ_F64,
"XYZ_S16_NORM": fmts.XYZ_S16_NORM,
"XYZ_S16": fmts.XYZ_S16,
"XYZ_S8_NORM": fmts.XYZ_S8_NORM,
"XYZ_S8": fmts.XYZ_S8,
"XYZW_F32": fmts.XYZW_F32,
"XYZW_F64": fmts.XYZW_F64,
"XYZW_S10S10S10S2_NORM": fmts.XYZW_S10S10S10S2_NORM,
"XYZW_S10S10S10S2": fmts.XYZW_S10S10S10S2,
"XYZW_S16_NORM": fmts.XYZW_S16_NORM,
"XYZW_S16": fmts.XYZW_S16,
"XYZW_S32_NORM": fmts.XYZW_S32_NORM,
"XYZW_S32": fmts.XYZW_S32,
"XYZW_S8_NORM": fmts.XYZW_S8_NORM,
"XYZW_S8": fmts.XYZW_S8,
"XYZW_U10U10U10U2_NORM": fmts.XYZW_U10U10U10U2_NORM,
"XYZW_U10U10U10U2": fmts.XYZW_U10U10U10U2,
"XYZW_U16_NORM": fmts.XYZW_U16_NORM,
"XYZW_U16": fmts.XYZW_U16,
"XYZW_U32_NORM": fmts.XYZW_U32_NORM,
"XYZW_U32": fmts.XYZW_U32,
"XYZW_U8_NORM": fmts.XYZW_U8_NORM,
"XYZW_U8": fmts.XYZW_U8,
} {
if assert.For("name").ThatString(n).Equals(fmt.Sprint(f)) {
for _, c := range f.Components {
Expand Down
Loading

0 comments on commit 2bba744

Please sign in to comment.