Do division and mod on unsigned integers #2496
Merged
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
The hlsl compiler was complaining about doing division on signed integers being slow so we'll cast do our div and cast back. This fixes bug 1443747
kvark
requested changes
Mar 8, 2018
| @@ -100,7 +100,8 @@ void markCacheTexturesUsed() { | |||
| // TODO: convert back to a function once the driver issues are resolved, if ever. | |||
| // https://github.com/servo/webrender/pull/623 | |||
| // https://github.com/servo/servo/issues/13953 | |||
| #define get_fetch_uv(i, vpi) ivec2(vpi * (i % (WR_MAX_VERTEX_TEXTURE_WIDTH/vpi)), i / (WR_MAX_VERTEX_TEXTURE_WIDTH/vpi)) | |||
| // Do the division with unsigned ints because that's more efficient with D3D | |||
| #define get_fetch_uv(i, vpi) ivec2(int(uint(vpi) * (uint(i) % uint(WR_MAX_VERTEX_TEXTURE_WIDTH/vpi))), int(uint(i) / uint(WR_MAX_VERTEX_TEXTURE_WIDTH/vpi))) | |||
There was a problem hiding this comment.
I'm not certain this is correct. WR_MAX_VERTEX_TEXTURE_WIDTH is defined as a simple integer constant, so WR_MAX_VERTEX_TEXTURE_WIDTH / vpi is still integer division. Also, I don't think GLSL requires you to do uint(int(x), int(y)) as opposed to just uint(x, y).
There was a problem hiding this comment.
WR_MAX_VERTEX_TEXTURE_WIDTH / vpi gets constant folded so using integer division there shouldn't matter.
There was a problem hiding this comment.
Also uint(x, y) doesn't seem to work:
'constructor' : too many arguments
kvark
approved these changes
Mar 8, 2018
| @@ -100,7 +100,8 @@ void markCacheTexturesUsed() { | |||
| // TODO: convert back to a function once the driver issues are resolved, if ever. | |||
| // https://github.com/servo/webrender/pull/623 | |||
| // https://github.com/servo/servo/issues/13953 | |||
| #define get_fetch_uv(i, vpi) ivec2(vpi * (i % (WR_MAX_VERTEX_TEXTURE_WIDTH/vpi)), i / (WR_MAX_VERTEX_TEXTURE_WIDTH/vpi)) | |||
| // Do the division with unsigned ints because that's more efficient with D3D | |||
| #define get_fetch_uv(i, vpi) ivec2(int(uint(vpi) * (uint(i) % uint(WR_MAX_VERTEX_TEXTURE_WIDTH/vpi))), int(uint(i) / uint(WR_MAX_VERTEX_TEXTURE_WIDTH/vpi))) | |||
|
@bors-servo r+ |
|
📌 Commit fa1090c has been approved by |
bors-servo
pushed a commit
that referenced
this pull request
Mar 8, 2018
Do division and mod on unsigned integers The hlsl compiler was complaining about doing division on signed integers being slow so we'll cast do our div and cast back. This fixes bug 1443747 <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/webrender/2496) <!-- Reviewable:end -->
|
☀️ Test successful - status-appveyor, status-taskcluster, status-travis |
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.
The hlsl compiler was complaining about doing division on signed
integers being slow so we'll cast do our div and cast back.
This fixes bug 1443747
This change is