michael/pathfinder
michael
/
pathfinder
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Try to fix RGBA atlas generation in OpenGL

This commit is contained in:
Patrick Walton 2017-02-13 12:32:15 -08:00
parent b000f6d882
commit 731360bc9d
3 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resources/shaders/accum.cs.glsl
View File

@ -23,7 +23,7 @@
layout(local_size_x = 1024) in;
layout(r8, binding = 0) uniform restrict writeonly image2DRect uImage;
layout(IMAGE_FORMAT, binding = 0) uniform restrict writeonly image2DRect uImage;
layout(r32f, binding = 1) uniform restrict readonly image2DRect uCoverage;
layout(location = 2) uniform uvec4 uAtlasRect;
layout(location = 3) uniform uint uAtlasShelfHeight;

4
src/error.rs
View File

@ -55,5 +55,9 @@ pub enum RasterError {
GlError(GlError),
/// An error occurred during GPU compute.
ComputeError(compute_shader::error::Error),
/// An destination image with an unsupported format was supplied.
///
/// Currently supported formats are R8 and RGBA8.
UnsupportedImageFormat,
}

26
src/rasterizer.rs
View File

@ -12,7 +12,7 @@
use atlas::Atlas;
use compute_shader::device::Device;
use compute_shader::image::Image;
use compute_shader::image::{Format, Image};
use compute_shader::instance::{Instance, ShadingLanguage};
use compute_shader::profile_event::ProfileEvent;
use compute_shader::program::Program;
@ -46,7 +46,8 @@ pub struct Rasterizer {
queue: Queue,
shading_language: ShadingLanguage,
draw_program: GLuint,
accum_program: Program,
accum_program_r8: Program,
accum_program_rgba8: Program,
draw_vertex_array: GLuint,
draw_position_attribute: GLint,
draw_glyph_index_attribute: GLint,
@ -168,15 +169,21 @@ impl Rasterizer {
return Err(InitError::CompileFailed("Compute shader", "Invalid UTF-8".to_string()))
}
let accum_program = try!(device.create_program(&accum_source)
.map_err(InitError::ComputeError));
let accum_source_r8 = format!("#define IMAGE_FORMAT r8\n{}", accum_source);
let accum_source_rgba8 = format!("#define IMAGE_FORMAT rgba8\n{}", accum_source);
let accum_program_r8 = try!(device.create_program(&accum_source_r8)
.map_err(InitError::ComputeError));
let accum_program_rgba8 = try!(device.create_program(&accum_source_rgba8)
.map_err(InitError::ComputeError));
Ok(Rasterizer {
device: device,
queue: queue,
shading_language: shading_language,
draw_program: draw_program,
accum_program: accum_program,
accum_program_r8: accum_program_r8,
accum_program_rgba8: accum_program_rgba8,
draw_vertex_array: draw_vertex_array,
draw_position_attribute: draw_position_attribute,
draw_glyph_index_attribute: draw_glyph_index_attribute,
@ -291,7 +298,14 @@ impl Rasterizer {
(3, Uniform::U32(atlas.shelf_height())),
];
let accum_event = try!(self.queue.submit_compute(&self.accum_program,
let accum_program = match image.format() {
Ok(Format::R8) => &self.accum_program_r8,
Ok(Format::RGBA8) => &self.accum_program_rgba8,
Ok(_) => return Err(RasterError::UnsupportedImageFormat),
Err(err) => return Err(RasterError::ComputeError(err)),
};
let accum_event = try!(self.queue.submit_compute(accum_program,
&[atlas.shelf_columns()],
&accum_uniforms,
&[]).map_err(RasterError::ComputeError));