Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 14:55:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1510490 - Add versioning support for serialized shaders. r=mattwoodrow

Browse Source 
Depends on D13442

Differential Revision: https://phabricator.services.mozilla.com/D13443
This commit is contained in:
Bobby Holley 2018-12-01 03:06:08 +00:00
parent ad2ca6363c
commit 8b03f93115
1 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
gfx/webrender_bindings/src/program_cache.rs
View File

@ -21,17 +21,24 @@ fn deserialize_program_binary(path: &PathBuf) -> Result<Arc<ProgramBinary>, Erro
let mut file = File::open(path)?;
file.read_to_end(&mut buf)?;
if buf.len() <= 8 {
if buf.len() <= 8 + 4 {
return Err(Error::new(ErrorKind::InvalidData, "File size is too small"));
}
let hash = &buf[0 .. 8];
let data = &buf[8 ..];
let magic = &buf[0 .. 4];
let hash = &buf[4 .. 8 + 4];
let data = &buf[8 + 4 ..];
// Check if magic + version are correct.
let mv:u32 = bincode::deserialize(&magic).unwrap();
if mv != MAGIC_AND_VERSION {
return Err(Error::new(ErrorKind::InvalidData, "File data is invalid (magic+version)"));
}
// Check if hash is correct
let hash:u64 = bincode::deserialize(&hash).unwrap();
let hash_data = fxhash::hash64(&data);
if hash != hash_data {
return Err(Error::new(ErrorKind::InvalidData, "File data is invalid"));
return Err(Error::new(ErrorKind::InvalidData, "File data is invalid (hash)"));
}
// Deserialize ProgramBinary
@ -84,6 +91,11 @@ struct WrProgramBinaryDiskCache {
workers: Arc<ThreadPool>,
}
// Magic number + version. Increment the version when the binary format changes.
const MAGIC: u32 = 0xB154AD30; // BI-SHADE + version.
const VERSION: u32 = 2;
const MAGIC_AND_VERSION: u32 = MAGIC + VERSION;
impl WrProgramBinaryDiskCache {
#[allow(dead_code)]
fn new(prof_path: &nsAString, workers: &Arc<ThreadPool>) -> Self {
@ -147,6 +159,17 @@ impl WrProgramBinaryDiskCache {
}
};
// Write magic + version.
let mv = MAGIC_AND_VERSION;
let mv = bincode::serialize(&mv).unwrap();
assert!(mv.len() == 4);
match file.write_all(&mv) {
Err(err) => {
error!("Failed to write magic+version to file error: {}", err);
}
_ => {},
};
// Write hash
let hash = fxhash::hash64(&data);
let hash = bincode::serialize(&hash).unwrap();