Skip to content
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

Split text runs into chunks of 32 glyphs each, and only pack primitives in the visible rect. #324

Closed
wants to merge 2 commits into from

Conversation

@pcwalton
Copy link
Collaborator

pcwalton commented Aug 3, 2016

r? @glennw


This change is Reviewable

let glyph_index = gl::get_uniform_block_index(program_id.0, "Glyphs");
gl::uniform_block_binding(program_id.0, glyph_index, UBO_BIND_GLYPHS);

println!("PrimShader {}: items={}/{} tiles={}/{} layers={}/{} glyphs={}",

This comment has been minimized.

@glennw

glennw Aug 3, 2016

Member

change to debug!

};

struct Glyph {
vec4 local_rect;
vec4 color;

This comment has been minimized.

@glennw

glennw Aug 3, 2016

Member

Move the color to the text struct?

@@ -3,24 +3,42 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */

This comment has been minimized.

@glennw

glennw Aug 3, 2016

Member

Add a fixme / assert / debug log when the glyph UBO overflows?

@pcwalton pcwalton force-pushed the pcwalton:wr2-glyph-optimizations branch from 421af4f to af0d188 Aug 4, 2016
wip
@pcwalton pcwalton force-pushed the pcwalton:wr2-glyph-optimizations branch from af0d188 to f5ed4e3 Aug 4, 2016
@glennw
Copy link
Member

glennw commented Aug 5, 2016

@pcwalton Let me know when this is complete and ready for review.

@bors-servo
Copy link
Contributor

bors-servo commented Aug 11, 2016

The latest upstream changes (presumably #338) made this pull request unmergeable. Please resolve the merge conflicts.

@glennw glennw closed this Aug 16, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

3 participants
You can’t perform that action at this time.