Skip to content

Fix context restore for .ktx2 textures #10815

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

Merged
merged 3 commits into from
Aug 5, 2021
Merged

Fix context restore for .ktx2 textures #10815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce0433d
Fix context restore for .ktx2 textures
Popov72 Aug 5, 2021
4d18560
Fix effect not rebuilt when applyByPostProcess changes
Popov72 Aug 5, 2021
9d68d4c
linting
Popov72 Aug 5, 2021
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 materialsLibrary/src/sky/skyMaterial.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,10 @@ export class SkyMaterial extends PushMaterial {
// Attribs
MaterialHelper.PrepareDefinesForAttributes(mesh, defines, true, false);

if (defines.IMAGEPROCESSINGPOSTPROCESS !== scene.imageProcessingConfiguration.applyByPostProcess) {
defines.markAsMiscDirty();
}

// Get correct effect
if (defines.isDirty) {
defines.markAsProcessed();
Expand Down
2 changes: 1 addition & 1 deletion src/Materials/Textures/internalTexture.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ export class InternalTexture {
proxy._swapAndDie(this, false);
rebuildSamples();
this.isReady = true;
}, null, this._buffer, undefined, this.format, undefined, undefined, undefined, undefined, this._useSRGBBuffer);
}, null, this._buffer, undefined, this.format, this._extension, undefined, undefined, undefined, this._useSRGBBuffer);
return;

case InternalTextureSource.Raw:
Expand Down
1 change: 1 addition & 0 deletions src/Misc/khronosTextureContainer2.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,7 @@ export class KhronosTextureContainer2 {
}
}

internalTexture._extension = ".ktx2";
internalTexture.width = data.mipmaps[0].width;
internalTexture.height = data.mipmaps[0].height;
internalTexture.isReady = true;
Expand Down