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.

Sign up for GitHub

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

Fix transcoding crunch to DXT in IE11 #5057

Merged
merged 4 commits into from
Mar 1, 2017
Merged

Fix transcoding crunch to DXT in IE11 #5057

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e965292
Fix transcoding crunch to DXT in IE11.
bagnell Mar 1, 2017
36b48c8
Use TypedArray.set instead of iterating over the array.
bagnell Mar 1, 2017
4696148
Merge branch 'master' into fix-crunch-ie11
bagnell Mar 1, 2017
b28cab0
Update CHANGES.md.
bagnell Mar 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
Change Log
==========

### 1.32 - 2017-04-03

* Fix crunch compressed textures in IE11. [#5057](https://github.com/AnalyticalGraphicsInc/cesium/pull/5057)

### 1.31 - 2017-03-01

* Deprecated
Expand Down
5 changes: 4 additions & 1 deletion Source/Workers/transcodeCRNToDXT.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,10 @@ define([

// Mipmaps are unsupported, so copy the level 0 texture
// When mipmaps are supported, a copy will still be necessary as dxtData is a view on the heap.
var level0DXTData = dxtData.slice(0, PixelFormat.compressedTextureSize(format, width, height));
var length = PixelFormat.compressedTextureSize(format, width, height);
var level0DXTData = new Uint8Array(length);
level0DXTData.set(dxtData, 0);

transferableObjects.push(level0DXTData.buffer);
return new CompressedTextureBuffer(format, width, height, level0DXTData);
}
Expand Down