Some upload cleanup #203
Open
Some upload cleanup #203
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
nadako
reviewed
Sep 29, 2020
| @@ -34,16 +34,19 @@ class GLCubeTexture { | |||
|
|
|||
| var hasTexture = false; | |||
|
|
|||
| reader.readTextures(function(side, level, gpuFormat, width, height, blockLength, bytes) { | |||
| reader.readTextures(function(side, level, gpuFormat, size, unused, blockLength, bytes) { | |||
There was a problem hiding this comment.
Normally in Haxe we use _ for "unused" stuff :)
There was a problem hiding this comment.
I was actually looking for that and I think I tried exactly that and it failed 🤔 Does it maybe interfer with our global _ from the game?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This makes the code for stage3d texture and vertex/index buffer upload consistent, except that for CubeTexture there is no null buffer upload by the constructor (which we might want to add, but so far it isn't needed). And for RectangleTexture there is no dimension check.
This PR also has a fix for uploading compressed rectangular mipmaps (e.g. 1024x512). The problem is that such mipmaps have the following final dimensions and buffers:
0 = 1024x512
...
n-2 = 2x1
n-1 = 1x1
The n-1 dimension is interesting, as the code by bitshift produces 1x0, while the buffer contains data for 1x1. That's why we apply the same dimension check (and correction) as we have for non-compressed mipmaps.
While cleaning this up I was wondering about the fake data upload for compressed textures again. As we also don't upload anything special in case other texture uploads fail (e.g. fail by dimension check), I'm not sure if we really want to upload fake data when the texture file doesn't contain proper compressed data... Anyhow, I haven't touched it for now