diff --git a/Cargo.toml b/Cargo.toml index 48f24d36..8acb184d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,6 +9,9 @@ byteorder = "1" euclid = "0.10" memmap = "0.5" +[dependencies.compute-shader] +git = "https://github.com/pcwalton/compute-shader.git" + [dev-dependencies] quickcheck = "0.4" diff --git a/examples/dump-outlines.rs b/examples/dump-outlines.rs index 3b745d60..b77de090 100644 --- a/examples/dump-outlines.rs +++ b/examples/dump-outlines.rs @@ -21,7 +21,7 @@ fn main() { let glyf = font.glyf_table().unwrap(); let head = font.head_table().unwrap(); let loca = font.loca_table(&head).unwrap(); - let codepoint_ranges = [CodepointRange::new('A' as u32, 'Z' as u32)]; + let codepoint_ranges = [CodepointRange::new('!' as u32, '~' as u32)]; let glyph_ranges = cmap.glyph_ranges_for_codepoint_ranges(&codepoint_ranges).unwrap(); for (codepoint, glyph_id) in codepoint_ranges.iter() diff --git a/resources/tests/nimbus-sans/COPYING b/resources/tests/nimbus-sans/COPYING new file mode 100644 index 00000000..d60c31a9 --- /dev/null +++ b/resources/tests/nimbus-sans/COPYING @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Library General +Public License instead of this License. diff --git a/resources/tests/nimbus-sans/NimbusSanL-Regu.ttf b/resources/tests/nimbus-sans/NimbusSanL-Regu.ttf new file mode 100644 index 00000000..b0cb4041 Binary files /dev/null and b/resources/tests/nimbus-sans/NimbusSanL-Regu.ttf differ diff --git a/resources/tests/nimbus-sans/README b/resources/tests/nimbus-sans/README new file mode 100644 index 00000000..e05577db --- /dev/null +++ b/resources/tests/nimbus-sans/README @@ -0,0 +1,51 @@ +Cyrillized free URW fonts. + +These fonts were made from the free URW fonts distributed with ghostcript. +There are NO changes in the latin part of them (I hope). +Cyrillic glyphs were added by copying suitable latin ones +and painting oulines of unique cyrillic glyphs in same style as the others. +For all modification pfaedit was used. +The license for result is (of course) same as for original fonts, +i.e. GPL with an exception that you can put these fonts in your own non-GPLed +documents. (Looks like LGPL from my point of view =). + +The "sources" of these fonts in the native pfaedit format are available +at ftp://ftp.gnome.ru/fonts/sources + +The great font editor pfaedit is available at http://pfaedit.sf.net. +That page also includes some links to fonts created by +George Williams -- the author of pfaedit. + +Acknowledgements: +I would like to thank George Williams, the pfaedit's author and developer. +He is the most bug-reporter/feature-requester friendly developer +I ever saw in my not so short life. At some moment in the future +I must write a book about him: "George Williams and my best experience +in bug-reporting." George also greatly helped me bug-hunting these fonts, +explained to me some very important things about fonts and font design, +quickly adopted pfaedit to my needs (or pointed me to The Right Place in +documentation where I found better way of doing things). + +I would like to thank Alexey Novodvorsky (aka AEN), who +pointed me to pfaedit and George Williams' fonts, explained +The Task to me. He is also one of the main participators in the +development of Sysiphus -- free repository of free software. +I didn't loose my time for compiling/installing and supporting +my linux box coz I used the result of Sysiphus developers' works. + +I would like to thank Sergey Vlasov, who tested these fonts and reported +about bugs. Also he help me to make some bug-reports to George about +pfaedit bugs. + +I would like Dmitry 40in, who did big QA for some font outlines, drawn some glyphs, +and explain some The Truths for me. + +I would like to thank Vlad Harchev (aka hvv), who +proofread this text for me. + +Also I have to thank RMS for GPL and URW for releasing the fonts +under it. + +Thank you very much! +Valek Filippov frob@df.ru +(C)opyLeft 2001 \ No newline at end of file diff --git a/src/buffers.rs b/src/buffers.rs new file mode 100644 index 00000000..4785266f --- /dev/null +++ b/src/buffers.rs @@ -0,0 +1,87 @@ +// Copyright 2017 The Servo Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +use compute_shader::buffer::Buffer; +use otf::glyf::GlyfTable; +use otf::loca::LocaTable; + +pub struct GlyphBuffers { + pub coordinates: Vec<(i16, i16)>, + pub operations: Vec, + pub descriptors: Vec, + pub cached_coordinates_buffer: Option, + pub cached_operations_buffer: Option, + pub cached_descriptors_buffer: Option, +} + +impl GlyphBuffers { + #[inline] + pub fn new() -> GlyphBuffers { + GlyphBuffers { + coordinates: vec![], + operations: vec![], + descriptors: vec![], + cached_coordinates_buffer: None, + cached_operations_buffer: None, + cached_descriptors_buffer: None, + } + } + + pub fn add_glyph(&mut self, glyph_id: u32, loca_table: &LocaTable, glyf_table: &GlyfTable) + -> Result<(), ()> { + self.cached_coordinates_buffer = None; + self.cached_operations_buffer = None; + self.cached_descriptors_buffer = None; + + let mut point_index = self.coordinates.len() / 2; + let mut operations = if point_index % 4 == 0 { + 0 + } else { + self.operations.pop().unwrap() + }; + + try!(glyf_table.for_each_point(loca_table, glyph_id, |point| { + self.coordinates.push((point.position.x, point.position.y)); + + let operation = if point.first_point_in_contour { + 0 + } else if point.on_curve { + 1 + } else { + 2 + }; + + operations |= operation << (point_index % 4 * 2); + + point_index += 1; + if point_index % 4 == 0 { + self.operations.push(operation) + } + })); + + if point_index % 4 != 0 { + self.operations.push(operations) + } + + Ok(()) + } +} + +#[repr(C)] +pub struct GlyphDescriptor { + pub left: i16, + pub bottom: i16, + pub width: i16, + pub height: i16, + pub units_per_em: u16, + pub point_count: u16, + pub index_of_first_point: u32, +} + diff --git a/src/lib.rs b/src/lib.rs index b4c0962c..b52b6f60 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -8,18 +8,27 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +#![cfg_attr(test, feature(test))] + #[macro_use] extern crate bitflags; extern crate byteorder; +extern crate compute_shader; extern crate euclid; #[cfg(test)] +extern crate memmap; +#[cfg(test)] #[macro_use] extern crate quickcheck; +#[cfg(test)] +extern crate test; pub mod atlas; pub mod batch; +pub mod buffers; pub mod charmap; pub mod otf; +pub mod rasterizer; mod util; #[cfg(test)] diff --git a/src/rasterizer.rs b/src/rasterizer.rs new file mode 100644 index 00000000..a7cc3fa5 --- /dev/null +++ b/src/rasterizer.rs @@ -0,0 +1,27 @@ +// Copyright 2017 The Servo Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +use compute_shader::device::Device; +use compute_shader::queue::Queue; + +pub struct Rasterizer { + device: Device, + queue: Queue, +} + +impl Rasterizer { + pub fn new(device: Device, queue: Queue) -> Result { + Ok(Rasterizer { + device: device, + queue: queue, + }) + } +} + diff --git a/src/tests/buffers.rs b/src/tests/buffers.rs new file mode 100644 index 00000000..e6295cf7 --- /dev/null +++ b/src/tests/buffers.rs @@ -0,0 +1,34 @@ +/* Any copyright is dedicated to the Public Domain. + * http://creativecommons.org/publicdomain/zero/1.0/ */ + +use batch::GlyphRange; +use buffers::GlyphBuffers; +use charmap::CodepointRange; +use memmap::{Mmap, Protection}; +use otf::FontData; +use test::Bencher; + +static TEST_FONT_PATH: &'static str = "resources/tests/nimbus-sans/NimbusSanL-Regu.ttf"; + +#[bench] +fn bench_add_glyphs(bencher: &mut Bencher) { + let file = Mmap::open_path(TEST_FONT_PATH, Protection::Read).expect("Couldn't open test font"); + unsafe { + let font = FontData::new(file.as_slice()); + let cmap = font.cmap_table().unwrap(); + let glyf = font.glyf_table().unwrap(); + let head = font.head_table().unwrap(); + let loca = font.loca_table(&head).unwrap(); + let codepoint_ranges = [CodepointRange::new('!' as u32, '~' as u32)]; + let glyph_ranges = cmap.glyph_ranges_for_codepoint_ranges(&codepoint_ranges) + .expect("Couldn't find glyph ranges"); + + bencher.iter(|| { + let mut buffers = GlyphBuffers::new(); + for glyph_id in glyph_ranges.iter().flat_map(GlyphRange::iter) { + buffers.add_glyph(glyph_id as u32, &loca, &glyf).unwrap() + } + }); + } +} + diff --git a/src/tests/mod.rs b/src/tests/mod.rs index abddfd58..b03ba9ad 100644 --- a/src/tests/mod.rs +++ b/src/tests/mod.rs @@ -9,4 +9,5 @@ // except according to those terms. mod atlas; +mod buffers;