Skip to content

/ webrender

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switch layers to use VTF instead of UBO. #390

Merged
merged 1 commit into from Sep 6, 2016
+159 −303
Merged

Switch layers to use VTF instead of UBO. #390

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

34 webrender/res/prim_shared.glsl
View file
Open in desktop
@@ -30,6 +30,8 @@
#define MAX_STOPS_PER_ANGLE_GRADIENT 8

#ifdef WR_VERTEX_SHADER
uniform sampler2D sLayers;

struct Layer {
mat4 transform;
mat4 inv_transform;
@@ -45,31 +47,27 @@ layout(std140) uniform Tiles {
vec4 tiles[WR_MAX_UBO_VECTORS];
};

layout(std140) uniform Layers {
vec4 layers[WR_MAX_UBO_VECTORS];
};

Layer fetch_layer(int index) {
Layer layer;

int offset = index * 13;
ivec2 uv = ivec2(0, index);

layer.transform[0] = layers[offset + 0];
layer.transform[1] = layers[offset + 1];
layer.transform[2] = layers[offset + 2];
layer.transform[3] = layers[offset + 3];
layer.transform[0] = texelFetchOffset(sLayers, uv, 0, ivec2(0, 0));
layer.transform[1] = texelFetchOffset(sLayers, uv, 0, ivec2(1, 0));
layer.transform[2] = texelFetchOffset(sLayers, uv, 0, ivec2(2, 0));
layer.transform[3] = texelFetchOffset(sLayers, uv, 0, ivec2(3, 0));

layer.inv_transform[0] = layers[offset + 4];
layer.inv_transform[1] = layers[offset + 5];
layer.inv_transform[2] = layers[offset + 6];
layer.inv_transform[3] = layers[offset + 7];
layer.inv_transform[0] = texelFetchOffset(sLayers, uv, 0, ivec2(4, 0));
layer.inv_transform[1] = texelFetchOffset(sLayers, uv, 0, ivec2(5, 0));
layer.inv_transform[2] = texelFetchOffset(sLayers, uv, 0, ivec2(6, 0));
layer.inv_transform[3] = texelFetchOffset(sLayers, uv, 0, ivec2(7, 0));

layer.local_clip_rect = layers[offset + 8];
layer.local_clip_rect = texelFetchOffset(sLayers, uv, 0, ivec2(8, 0));

layer.screen_vertices[0] = layers[offset + 9];
layer.screen_vertices[1] = layers[offset + 10];
layer.screen_vertices[2] = layers[offset + 11];
layer.screen_vertices[3] = layers[offset + 12];
layer.screen_vertices[0] = texelFetchOffset(sLayers, uv, 0, ivec2(9, 0));
layer.screen_vertices[1] = texelFetchOffset(sLayers, uv, 0, ivec2(10, 0));
layer.screen_vertices[2] = texelFetchOffset(sLayers, uv, 0, ivec2(11, 0));
layer.screen_vertices[3] = texelFetchOffset(sLayers, uv, 0, ivec2(12, 0));

return layer;
}
4 webrender/src/debug_render.rs
View file
Open in desktop
@@ -7,7 +7,7 @@ use device::{Device, ProgramId, VAOId, TextureId, VertexFormat};
use device::{TextureFilter, VertexUsageHint};
use euclid::{Matrix4D, Point2D, Size2D, Rect};
use gleam::gl;
use internal_types::{ORTHO_NEAR_PLANE, ORTHO_FAR_PLANE, DevicePixel};
use internal_types::{ORTHO_NEAR_PLANE, ORTHO_FAR_PLANE, DevicePixel, TextureSampler};
use internal_types::{DebugFontVertex, DebugColorVertex, RenderTargetMode, PackedColor};
use std::f32;
use webrender_traits::{ColorF, ImageFormat};
@@ -198,7 +198,7 @@ impl DebugRenderer {

// Glyphs
device.bind_program(self.font_program_id, &projection);
device.bind_color_texture(self.font_texture_id);
device.bind_texture(TextureSampler::Color, self.font_texture_id);
device.bind_vao(self.font_vao);
device.update_vao_indices(self.font_vao,
&self.font_indices,
152 webrender/src/device.rs
View file
Open in desktop
@@ -741,10 +741,7 @@ impl FileWatcherThread {

pub struct Device {
// device state
bound_color_texture: TextureId,
bound_mask_texture: TextureId,
bound_layer_textures: [TextureId; 8],
bound_cache_texture: TextureId,
bound_textures: [TextureId; 4],
bound_program: ProgramId,
bound_vao: VAOId,
bound_fbo: FBOId,
@@ -788,18 +785,12 @@ impl Device {
device_pixel_ratio: device_pixel_ratio,
inside_frame: false,

bound_color_texture: TextureId(0),
bound_mask_texture: TextureId(0),
bound_cache_texture: TextureId(0),
bound_layer_textures: [ TextureId(0),
TextureId(0),
TextureId(0),
TextureId(0),
TextureId(0),
TextureId(0),
TextureId(0),
TextureId(0),
],
bound_textures: [
TextureId(0),
TextureId(0),
TextureId(0),
TextureId(0),
],
bound_program: ProgramId(0),
bound_vao: VAOId(0),
bound_fbo: FBOId(0),
@@ -859,21 +850,9 @@ impl Device {
self.default_fbo = default_fbo as gl::GLuint;

// Texture state
self.bound_color_texture = TextureId(0);
gl::active_texture(gl::TEXTURE0);
gl::bind_texture(gl::TEXTURE_2D, 0);

self.bound_mask_texture = TextureId(0);
gl::active_texture(gl::TEXTURE1);
gl::bind_texture(gl::TEXTURE_2D, 0);

self.bound_cache_texture = TextureId(0);
gl::active_texture(gl::TEXTURE2);
gl::bind_texture(gl::TEXTURE_2D, 0);

for i in 0..self.bound_layer_textures.len() {
self.bound_layer_textures[i] = TextureId(0);
gl::active_texture(gl::TEXTURE3 + i as u32);
for i in 0..self.bound_textures.len() {
self.bound_textures[i] = TextureId(0);
gl::active_texture(gl::TEXTURE0 + i as gl::GLuint);
gl::bind_texture(gl::TEXTURE_2D, 0);
}

@@ -895,43 +874,13 @@ impl Device {
gl::active_texture(gl::TEXTURE0);
}

pub fn bind_color_texture(&mut self, texture_id: TextureId) {
debug_assert!(self.inside_frame);

if self.bound_color_texture != texture_id {
self.bound_color_texture = texture_id;
texture_id.bind();
}
}

pub fn bind_mask_texture(&mut self, texture_id: TextureId) {
pub fn bind_texture(&mut self, sampler: TextureSampler, texture_id: TextureId) {
debug_assert!(self.inside_frame);

if self.bound_mask_texture != texture_id {
self.bound_mask_texture = texture_id;
gl::active_texture(gl::TEXTURE1);
texture_id.bind();
gl::active_texture(gl::TEXTURE0);
}
}

pub fn bind_cache_texture(&mut self, texture_id: TextureId) {
debug_assert!(self.inside_frame);

if self.bound_cache_texture != texture_id {
self.bound_cache_texture = texture_id;
gl::active_texture(gl::TEXTURE2);
texture_id.bind();
gl::active_texture(gl::TEXTURE0);
}
}

pub fn bind_layer_texture(&mut self, layer: usize, texture_id: TextureId) {
debug_assert!(self.inside_frame);

if self.bound_layer_textures[layer] != texture_id {
self.bound_layer_textures[layer] = texture_id;
gl::active_texture(gl::TEXTURE3 + layer as u32);
let sampler_index = sampler as usize;
if self.bound_textures[sampler_index] != texture_id {
self.bound_textures[sampler_index] = texture_id;
gl::active_texture(gl::TEXTURE0 + sampler_index as gl::GLuint);
texture_id.bind();
gl::active_texture(gl::TEXTURE0);
}
@@ -1038,14 +987,15 @@ impl Device {
height: u32,
internal_format: u32,
format: u32,
type_: u32,
pixels: Option<&[u8]>) {
gl::tex_image_2d(gl::TEXTURE_2D,
0,
internal_format as gl::GLint,
width as gl::GLint, height as gl::GLint,
0,
format,
gl::UNSIGNED_BYTE,
type_,
pixels);
}

@@ -1096,14 +1046,20 @@ impl Device {
(gl::RGBA, GL_FORMAT_BGRA)
}
}
ImageFormat::RGBAF32 => (gl::RGBA32F, gl::RGBA),
ImageFormat::Invalid => unreachable!(),
};

let type_ = match format {
ImageFormat::RGBAF32 => gl::FLOAT,
_ => gl::UNSIGNED_BYTE,
};

match mode {
RenderTargetMode::RenderTarget => {
self.bind_color_texture(texture_id);
self.bind_texture(TextureSampler::Color, texture_id);
self.set_texture_parameters(filter);
self.upload_texture_image(width, height, internal_format, gl_format, None);
self.upload_texture_image(width, height, internal_format, gl_format, type_, None);
self.create_fbo_for_texture_if_necessary(texture_id);
}
RenderTargetMode::None => {
@@ -1113,6 +1069,7 @@ impl Device {
self.upload_texture_image(width, height,
internal_format,
gl_format,
type_,
pixels);
}
}
@@ -1156,7 +1113,7 @@ impl Device {
self.create_fbo_for_texture_if_necessary(temp_texture_id);

self.bind_render_target(Some(texture_id));
self.bind_color_texture(temp_texture_id);
self.bind_texture(TextureSampler::Color, temp_texture_id);

gl::copy_tex_sub_image_2d(gl::TEXTURE_2D,
0,
@@ -1171,7 +1128,7 @@ impl Device {
self.init_texture(texture_id, new_width, new_height, format, filter, mode, None);
self.create_fbo_for_texture_if_necessary(texture_id);
self.bind_render_target(Some(temp_texture_id));
self.bind_color_texture(texture_id);
self.bind_texture(TextureSampler::Color, texture_id);

gl::copy_tex_sub_image_2d(gl::TEXTURE_2D,
0,
@@ -1189,7 +1146,7 @@ impl Device {
pub fn deinit_texture(&mut self, texture_id: TextureId) {
debug_assert!(self.inside_frame);

self.bind_color_texture(texture_id);
self.bind_texture(TextureSampler::Color, texture_id);
self.deinit_texture_image();

let texture = self.textures.get_mut(&texture_id).unwrap();
@@ -1344,55 +1301,20 @@ impl Device {
if u_mask != -1 {
gl::uniform_1i(u_mask, TextureSampler::Mask as i32);
}
let u_diffuse2d = gl::get_uniform_location(program.id, "sDiffuse2D");
if u_diffuse2d != -1 {
gl::uniform_1i(u_diffuse2d, TextureSampler::Color as i32);
}
let u_mask2d = gl::get_uniform_location(program.id, "sMask2D");
if u_mask2d != -1 {
gl::uniform_1i(u_mask2d, TextureSampler::Mask as i32);
}
let u_device_pixel_ratio = gl::get_uniform_location(program.id, "uDevicePixelRatio");
if u_device_pixel_ratio != -1 {
gl::uniform_1f(u_device_pixel_ratio, self.device_pixel_ratio);
}

let u_layer0 = gl::get_uniform_location(program.id, "sLayer0");
if u_layer0 != -1 {
gl::uniform_1i(u_layer0, TextureSampler::CompositeLayer0 as i32);
}
let u_layer1 = gl::get_uniform_location(program.id, "sLayer1");
if u_layer1 != -1 {
gl::uniform_1i(u_layer1, TextureSampler::CompositeLayer1 as i32);
}
let u_layer2 = gl::get_uniform_location(program.id, "sLayer2");
if u_layer2 != -1 {
gl::uniform_1i(u_layer2, TextureSampler::CompositeLayer2 as i32);
}
let u_layer3 = gl::get_uniform_location(program.id, "sLayer3");
if u_layer3 != -1 {
gl::uniform_1i(u_layer3, TextureSampler::CompositeLayer3 as i32);
}
let u_layer4 = gl::get_uniform_location(program.id, "sLayer4");
if u_layer4 != -1 {
gl::uniform_1i(u_layer4, TextureSampler::CompositeLayer4 as i32);
}
let u_layer5 = gl::get_uniform_location(program.id, "sLayer5");
if u_layer5 != -1 {
gl::uniform_1i(u_layer5, TextureSampler::CompositeLayer5 as i32);
}
let u_layer6 = gl::get_uniform_location(program.id, "sLayer6");
if u_layer6 != -1 {
gl::uniform_1i(u_layer6, TextureSampler::CompositeLayer6 as i32);
}
let u_layer7 = gl::get_uniform_location(program.id, "sLayer7");
if u_layer7 != -1 {
gl::uniform_1i(u_layer7, TextureSampler::CompositeLayer7 as i32);
}
let u_cache = gl::get_uniform_location(program.id, "sCache");
if u_cache != -1 {
gl::uniform_1i(u_cache, TextureSampler::Cache as i32);
}

let u_layers = gl::get_uniform_location(program.id, "sLayers");
if u_layers != -1 {
gl::uniform_1i(u_layers, TextureSampler::Layers as i32);
}
}
}
}
@@ -1511,12 +1433,12 @@ impl Device {
}
ImageFormat::RGB8 => (gl::RGB, 3, data),
ImageFormat::RGBA8 => (GL_FORMAT_BGRA, 4, data),
ImageFormat::Invalid => unreachable!(),
ImageFormat::Invalid | ImageFormat::RGBAF32 => unreachable!(),
};

assert!(data.len() as u32 == bpp * width * height);

self.bind_color_texture(texture_id);
self.bind_texture(TextureSampler::Color, texture_id);
self.update_image_for_2d_texture(x0 as gl::GLint,
y0 as gl::GLint,
width as gl::GLint,
@@ -1533,7 +1455,7 @@ impl Device {
src_y: i32,
width: i32,
height: i32) {
self.bind_color_texture(texture_id);
self.bind_texture(TextureSampler::Color, texture_id);
gl::copy_tex_sub_image_2d(gl::TEXTURE_2D,
0,
dest_x,
11 webrender/src/internal_types.rs
View file
Open in desktop
@@ -94,17 +94,8 @@ pub type DrawListId = FreeListItemId;
pub enum TextureSampler {
Color,
Mask,

Cache,

CompositeLayer0,
CompositeLayer1,
CompositeLayer2,
CompositeLayer3,
CompositeLayer4,
CompositeLayer5,
CompositeLayer6,
CompositeLayer7,
Layers,
}

pub enum VertexAttribute {
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.