Skip to content

Commit 5ea37bd

Browse files
committed
Fix RGBA8_UNORM and texture capture gamma stuff
1 parent ddf2bb9 commit 5ea37bd

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/gui/dxgi.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ impl DxgiFormat {
179179
// DxgiFormat::R8G8_SNORM => VkFormat::R8G8_SNORM,
180180
// DxgiFormat::R8G8_SINT => VkFormat::R8G8_SINT,
181181
DxgiFormat::R8G8B8A8_TYPELESS => wgpu::TextureFormat::Rgba8Unorm,
182-
DxgiFormat::R8G8B8A8_UNORM => wgpu::TextureFormat::Rgba8Unorm,
182+
DxgiFormat::R8G8B8A8_UNORM => wgpu::TextureFormat::Rgba8UnormSrgb, // cohae: Bungie interprets non-sRGB rgba8 as sRGB??
183183
DxgiFormat::R8G8B8A8_UNORM_SRGB => wgpu::TextureFormat::Rgba8UnormSrgb,
184184
DxgiFormat::R8G8B8A8_UINT => wgpu::TextureFormat::Rgba8Uint,
185185
DxgiFormat::R8G8B8A8_SNORM => wgpu::TextureFormat::Rgba8Snorm,

src/gui/texture.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -683,14 +683,14 @@ mod texture_capture {
683683
mip_level_count: 1,
684684
sample_count: 1,
685685
dimension: TextureDimension::D2,
686-
format: TextureFormat::Rgba8Unorm,
686+
format: TextureFormat::Rgba8UnormSrgb,
687687
usage: TextureUsages::COPY_SRC | TextureUsages::RENDER_ATTACHMENT,
688-
view_formats: &[TextureFormat::Rgba8Unorm],
688+
view_formats: &[TextureFormat::Rgba8UnormSrgb],
689689
});
690690

691691
let texture_view_wgpu = texture_wgpu.create_view(&TextureViewDescriptor {
692692
label: None,
693-
format: Some(TextureFormat::Rgba8Unorm),
693+
format: Some(TextureFormat::Rgba8UnormSrgb),
694694
dimension: Some(TextureViewDimension::D2),
695695
aspect: TextureAspect::All,
696696
base_mip_level: 0,
@@ -780,7 +780,7 @@ mod texture_capture {
780780
module: &copy_shader,
781781
entry_point: "fs_main",
782782
targets: &[Some(ColorTargetState {
783-
format: TextureFormat::Rgba8Unorm,
783+
format: TextureFormat::Rgba8UnormSrgb,
784784
blend: Some(BlendState::PREMULTIPLIED_ALPHA_BLENDING),
785785
write_mask: ColorWrites::all(),
786786
})],

0 commit comments

Comments
 (0)