aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/webglrenderingcontext.rs
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2019-10-08 11:56:11 -0400
committerGitHub <noreply@github.com>2019-10-08 11:56:11 -0400
commita7d48dca80497083e8ad6db059536fc1f3b96701 (patch)
tree05f59c87f05a835237acb51b590f87c126a5a172 /components/script/dom/webglrenderingcontext.rs
parent26e5281bfc9c5f91ec75fde8c39480bda993a83f (diff)
parent26df1962c38421251a998b8acc7d6652116d4866 (diff)
downloadservo-a7d48dca80497083e8ad6db059536fc1f3b96701.tar.gz
servo-a7d48dca80497083e8ad6db059536fc1f3b96701.zip
Auto merge of #24333 - mmatyas:webgl_fns_samplers, r=jdm
Add WebGLSampler support Reference: https://www.khronos.org/registry/webgl/specs/latest/2.0/#3.7.13 <!-- Please describe your changes on the following line: --> cc @jdm @zakorgy --- <!-- 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 ___ <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- 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/24333) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/webglrenderingcontext.rs')
-rw-r--r--components/script/dom/webglrenderingcontext.rs12
1 files changed, 1 insertions, 11 deletions
diff --git a/components/script/dom/webglrenderingcontext.rs b/components/script/dom/webglrenderingcontext.rs
index d6d46eee0ef..06141d5b5e7 100644
--- a/components/script/dom/webglrenderingcontext.rs
+++ b/components/script/dom/webglrenderingcontext.rs
@@ -104,16 +104,6 @@ macro_rules! handle_object_deletion {
};
}
-macro_rules! optional_root_object_to_js_or_null {
- ($cx: expr, $binding:expr) => {{
- rooted!(in($cx) let mut rval = NullValue());
- if let Some(object) = $binding {
- object.to_jsval($cx, rval.handle_mut());
- }
- rval.get()
- }};
-}
-
fn has_invalid_blend_constants(arg1: u32, arg2: u32) -> bool {
match (arg1, arg2) {
(constants::CONSTANT_COLOR, constants::CONSTANT_ALPHA) => true,
@@ -4267,7 +4257,7 @@ impl Textures {
}
}
- fn active_unit_enum(&self) -> u32 {
+ pub fn active_unit_enum(&self) -> u32 {
self.active_unit.get() + constants::TEXTURE0
}