Basic texture implementation pt2 #63

dati91 · 2018-02-14T11:31:06Z

A followup pr of #58.

With this, we can now draw into textures and use them in a later render pass.

zakorgy · 2018-02-14T11:36:09Z

webrender/src/device.rs

        }
    }

+    fn bind_texture(&mut self, device: &Device<B, hal::Graphics>, id: &TextureId, sampler: &TextureFilter, binding: String) {


Use &str instead of String

kvark

Great stuff! Left a few notes here

kvark · 2018-02-14T15:14:36Z

webrender/src/device.rs

@@ -46,6 +46,12 @@ pub const TEXTURE_HEIGHT: usize = 8;
 pub const MAX_INSTANCE_COUNT: usize = 1024;

 pub type TextureId = u32;
+pub type FBOId = u32;


any reason we can't keep using the old types here? we need to keep the changes to the minimum

kvark · 2018-02-14T15:15:11Z

webrender/src/device.rs

-            ]);
+            self.bind_texture(device, &device.bound_textures[0], &device.bound_sampler[0], "Color0");
+        }
+        if device.bound_textures[1] != 0 {


nit: could just do this in a loop

kvark · 2018-02-14T15:15:35Z

webrender/src/device.rs

+            &TextureFilter::Linear => &device.sampler_linear,
+            &TextureFilter::Nearest=> &device.sampler_nearest,
+        };
+        device.device.update_descriptor_sets::<Range<_>>(&[


in the future, we should call this less (i.e. combine multiple updates)

kvark · 2018-02-14T15:19:44Z

webrender/src/device.rs

@@ -1402,7 +1472,10 @@ pub struct Device<B: hal::Backend, C> {
    blend_color: ColorF,
    // device state
    images: FastHashMap<TextureId, Image<B>>,
+    fbos: FastHashMap<FBOId, Framebuffer<B>>,


in the future, we'll think about getting rid of those maps

kvark · 2018-02-14T15:20:50Z

webrender/src/device.rs

+        let mut fbo_id = DEFAULT_DRAW_FBO + 1;
+        for _ in 0..count {
+            while self.fbos.contains_key(&fbo_id) || fboids.contains(&fbo_id) {
+                fbo_id = rng.gen_range::<u32>(DEFAULT_DRAW_FBO + 1, u32::max_value());


heh, that's tricky.
I think what we need is just a Vec<Option<B::something>> addressable by index, and so this generation routine would just pick the first unused index there, or allocate a new one

kvark · 2018-02-14T15:23:11Z

webrender/src/device.rs

@@ -2215,18 +2307,42 @@ impl<B: hal::Backend> Device<B, hal::Graphics> {
        texture.filter = filter;
        texture.layer_count = layer_count;
        texture.render_target = render_target;
+        //println!("texture.width={:?}", texture.width);


I recommend to use the log macros. It's already hooked up, all you need is to use debug!,warn!,info! macros and become familiar with how to see it (e.g. RUST_LOG=webrender=debug cargo run ...)

kvark · 2018-02-14T15:23:50Z

webrender/src/device.rs

+                .push(
+                    self.images
+                        .get_mut(&texture.id)
+                        .expect("Texture not found.")


can just do self.images[&texture.id] for short, since the error handling doesn't do anything fancy here

We need it mutable, but HashMap does not have IndexMut.

kvark · 2018-02-14T15:25:32Z

webrender/src/renderer.rs

@@ -3334,7 +3358,13 @@ impl Renderer {
                            BlendMode::SubpixelConstantTextColor(color) => {
                                self.device.set_blend_mode_subpixel_constant_text_color(color);
                                let mut program = self.ps_text_run.get(glyph_format, transform_kind, &mut self.device).unwrap();
-                                // TODO: bind textures: batch.key.textures
+                                for i in 0 .. batch.key.textures.colors.len() {


nit: for (i, texture) in batch.key.textures.colors.iter().enumerate() {...}

kvark · 2018-02-14T15:26:58Z

webrender/src/renderer.rs

@@ -4066,7 +4121,7 @@ impl Renderer {
                            alpha.max_size.height as f32,
                            ORTHO_NEAR_PLANE,
                            ORTHO_FAR_PLANE,
-                        );
+                        ).post_scale(1.0, -1.0, 1.0);


let's put a big fat comment here saying why the scaling is needed. Or better - modify the parameters to ortho so that scaling is not needed :)

kvark · 2018-02-14T15:27:23Z

webrender/src/renderer.rs

+                }
+                program.bind_instances(
+                    &self.device.device,
+                    &instances.iter().map(|pi| pi.into()).collect::<Vec<PrimitiveInstance>>(),


can we have bind_instances accepting an iterator to avoid collections?

I just fixed the indentation here, but sure. I made a note for myself (actually for @zakorgy :) ) to look into this.

zakorgy · 2018-02-15T10:57:45Z

lgtm, I will look into the iterator part.

dati91 self-assigned this Feb 14, 2018

dati91 requested a review from zakorgy February 14, 2018 11:31

dati91 added the in progress label Feb 14, 2018

zakorgy reviewed Feb 14, 2018

View reviewed changes

dati91 mentioned this pull request Feb 14, 2018

Handle blitting #50

Closed

basic image implementation part 2

67e8615

dati91 force-pushed the impl_textures branch from 7fccd90 to 67e8615 Compare February 14, 2018 14:22

dati91 changed the title ~~[WIP] Basic texture implementation pt2~~ Basic texture implementation pt2 Feb 14, 2018

dati91 mentioned this pull request Feb 14, 2018

Test coverage #45

Open

kvark approved these changes Feb 14, 2018

View reviewed changes

dati91 added 6 commits February 14, 2018 16:52

fix vflip

c2dbf80

iter textures properly

2595b04

restore FBOId structure

19fbdf9

remove leftover prints

a4de3db

loop bind textures

9c6a5e1

replace get with index operator

500035e

zakorgy closed this Feb 15, 2018

zakorgy removed the in progress label Feb 15, 2018

zakorgy reopened this Feb 15, 2018

zakorgy added the in progress label Feb 15, 2018

zakorgy merged commit b04d40a into szeged:master Feb 15, 2018

zakorgy removed the in progress label Feb 15, 2018

dati91 mentioned this pull request Feb 15, 2018

Implement an Image structure #47

Closed

zakorgy mentioned this pull request Feb 21, 2018

Run WebRender with DX12 #73

Closed

4 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Basic texture implementation pt2 #63

Basic texture implementation pt2 #63

dati91 commented Feb 14, 2018

zakorgy Feb 14, 2018

kvark left a comment

kvark Feb 14, 2018

kvark Feb 14, 2018

kvark Feb 14, 2018

kvark Feb 14, 2018

kvark Feb 14, 2018

kvark Feb 14, 2018

kvark Feb 14, 2018

dati91 Feb 14, 2018

kvark Feb 14, 2018

kvark Feb 14, 2018

kvark Feb 14, 2018

dati91 Feb 14, 2018

zakorgy commented Feb 15, 2018

Basic texture implementation pt2 #63

Basic texture implementation pt2 #63

Conversation

dati91 commented Feb 14, 2018

Choose a reason for hiding this comment

kvark left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zakorgy commented Feb 15, 2018