Join GitHub today
GitHub is home to over 50 million developers working together to host and review code, manage projects, and build software together.
Sign upwebgl: texture size validation fixes #13898
Merged
Conversation
texture-size-limit.html is using a large array for all of its calls at various sizes, and we were throwing errors on the calls that should have passed.
We were checking to see if it was too big to be level 0, but we really want to see if it's too big to be the given level. This was the last remaining failure in texture-size-limit.html.
highfive
commented
Oct 24, 2016
|
Heads up! This PR modifies the following files:
|
| // GL_INVALID_VALUE is generated if width or height is greater than | ||
| // GL_MAX_TEXTURE_SIZE when target is GL_TEXTURE_2D or | ||
| // GL_MAX_CUBE_MAP_TEXTURE_SIZE when target is not GL_TEXTURE_2D. | ||
| if self.width as u32 > max_size || self.height as u32 > max_size { | ||
| if width > max_size >> level || height > max_size >> level { |
This comment has been minimized.
This comment has been minimized.
|
@bors-servo: r+ |
|
|
bors-servo
added a commit
that referenced
this pull request
Oct 24, 2016
webgl: texture size validation fixes <!-- Please describe your changes on the following line: --> This pull request fixes the errors in texture-size-limit.html. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [ ] These changes fix #__ (github issue number if applicable). <!-- Either: --> - [X] There are tests for these changes OR - [ ] These changes do not require tests because _____ <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/13898) <!-- Reviewable:end -->
|
|
|
@bors-servo: retry |
|
|
|
|
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.
anholt commentedOct 24, 2016
•
edited by larsbergstrom
This pull request fixes the errors in texture-size-limit.html.
./mach build -ddoes not report any errors./mach test-tidydoes not report any errorsThis change is