github/wgpu
1
1
Fork 0
mirror of https://github.com/gfx-rs/wgpu.git synced 2026-04-22 03:02:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Mipmap example shader and code fixes

Browse Source
This commit is contained in:
Dzmitry Malyshau
2019-06-14 10:06:04 -04:00
parent e9f687014b
commit 3f29a6d957
3 changed files with 25 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/mipmap/draw.frag
View File

@@ -6,7 +6,5 @@ layout(set = 0, binding = 1) uniform texture2D t_Color;
layout(set = 0, binding = 2) uniform sampler s_Color;
void main() {
vec4 tex = texture(sampler2D(t_Color, s_Color), v_TexCoord);
float mag = length(v_TexCoord-vec2(0.5));
o_Target = mix(tex, vec4(0.0), mag*mag);
o_Target = texture(sampler2D(t_Color, s_Color), v_TexCoord);
}

2
examples/mipmap/draw.vert
View File

@@ -8,7 +8,7 @@ layout(set = 0, binding = 0) uniform Locals {
};
void main() {
v_TexCoord = a_Pos.xy / 10.0;
v_TexCoord = a_Pos.xy / 20.0 + 0.5;
gl_Position = u_Transform * a_Pos;
// convert from -1,1 Z to 0,1
gl_Position.z = 0.5 * (gl_Position.z + gl_Position.w);

35
examples/mipmap/main.rs
View File

@@ -1,7 +1,7 @@
#[path = "../framework.rs"]
mod framework;
const TEXTURE_FORMAT: wgpu::TextureFormat = wgpu::TextureFormat::R8Unorm;
const TEXTURE_FORMAT: wgpu::TextureFormat = wgpu::TextureFormat::Rgba8Unorm;
#[derive(Clone, Copy)]
struct Vertex {
@@ -26,14 +26,25 @@ fn create_vertices() -> Vec<Vertex> {
]
}
fn create_texels(size: usize) -> Vec<u8> {
fn create_texels(size: usize, cx: f32, cy: f32) -> Vec<u8> {
use std::iter;
(0 .. size * size)
.map(|id| {
if (id + id / size) % 2 == 1 {
0xFF
} else {
0
.flat_map(|id| {
// get high five for recognizing this ;)
let mut x = 4.0 * (id % size) as f32 / (size - 1) as f32 - 2.0;
let mut y = 2.0 * (id / size) as f32 / (size - 1) as f32 - 1.0;
let mut count = 0;
while count < 0xFF && x * x + y * y < 4.0 {
let old_x = x;
x = x * x - y * y + cx;
y = 2.0 * old_x * y + cy;
count += 1;
}
iter::once(0xFF - (count * 2) as u8)
.chain(iter::once(0xFF - (count * 5) as u8))
.chain(iter::once(0xFF - (count * 13) as u8))
.chain(iter::once(1))
})
.collect()
}
@@ -50,7 +61,7 @@ impl Example {
let mx_projection = cgmath::perspective(cgmath::Deg(45f32), aspect_ratio, 1.0, 1000.0);
let mx_view = cgmath::Matrix4::look_at(
cgmath::Point3::new(0f32, 0.0, 10.0),
cgmath::Point3::new(0f32, 100.0, 0.0),
cgmath::Point3::new(0f32, 50.0, 0.0),
-cgmath::Vector3::unit_z(),
);
mx_projection * mx_view
@@ -123,7 +134,7 @@ impl Example {
address_mode_v: wgpu::AddressMode::ClampToEdge,
address_mode_w: wgpu::AddressMode::ClampToEdge,
mag_filter: wgpu::FilterMode::Nearest,
min_filter: wgpu::FilterMode::Nearest,
min_filter: wgpu::FilterMode::Linear,
mipmap_filter: wgpu::FilterMode::Nearest,
lod_min_clamp: -100.0,
lod_max_clamp: 100.0,
@@ -219,9 +230,9 @@ impl framework::Example for Example {
});
// Create the texture
let mip_level_count = 10;
let mip_level_count = 9;
let size = 1 << mip_level_count;
let texels = create_texels(size as usize);
let texels = create_texels(size as usize, -0.8, 0.156);
let texture_extent = wgpu::Extent3d {
width: size,
height: size,
@@ -244,7 +255,7 @@ impl framework::Example for Example {
wgpu::BufferCopyView {
buffer: &temp_buf,
offset: 0,
row_pitch: 1 * size,
row_pitch: 4 * size,
image_height: size,
},
wgpu::TextureCopyView {