Skip to content

/ servo

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.

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

Implement WebGL TexSubImage2D #11168

Merged
merged 3 commits into from Jun 10, 2016
+755 −125
Merged

Implement WebGL TexSubImage2D #11168

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9dab669
Enable texSubImage2D API
daoshengmu May 26, 2016
9f563e9
Implement texSubImage2D API
daoshengmu May 26, 2016
fd32bd5
Mark fail tests that are not made by texSubImage2D
daoshengmu Jun 7, 2016
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

403 components/script/dom/webglrenderingcontext.rs
View file
Open in desktop

Large diffs are not rendered by default.

11 components/script/dom/webgltexture.rs
View file
Open in desktop
@@ -109,13 +109,15 @@ impl WebGLTexture {
height: u32,
depth: u32,
internal_format: u32,
level: u32) -> WebGLResult<()> {
level: u32,
data_type: Option<u32>) -> WebGLResult<()> {
let image_info = ImageInfo {
width: width,
height: height,
depth: depth,
internal_format: Some(internal_format),
is_initialized: true,
data_type: data_type,
};

let face = match target {
@@ -274,6 +276,7 @@ impl WebGLTexture {
depth: 0,
internal_format: base_image_info.internal_format,
is_initialized: base_image_info.is_initialized(),
data_type: base_image_info.data_type,
};

self.set_image_infos_at_level(level, image_info);
@@ -346,6 +349,7 @@ pub struct ImageInfo {
depth: u32,
internal_format: Option<u32>,
is_initialized: bool,
data_type: Option<u32>,
}

impl ImageInfo {
@@ -356,6 +360,7 @@ impl ImageInfo {
depth: 0,
internal_format: None,
is_initialized: false,
data_type: None,
}
}

@@ -371,6 +376,10 @@ impl ImageInfo {
self.internal_format
}

pub fn data_type(&self) -> Option<u32> {
self.data_type
}

fn is_power_of_two(&self) -> bool {
self.width.is_power_of_two() && self.height.is_power_of_two() && self.depth.is_power_of_two()
}
10 components/script/dom/webidls/WebGLRenderingContext.webidl
View file
Open in desktop
@@ -646,11 +646,11 @@ interface WebGLRenderingContextBase
void texParameterf(GLenum target, GLenum pname, GLfloat param);
void texParameteri(GLenum target, GLenum pname, GLint param);

//void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
// GLsizei width, GLsizei height,
// GLenum format, GLenum type, ArrayBufferView? pixels);
//void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
// GLenum format, GLenum type, TexImageSource? source); // May throw DOMException
void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
GLsizei width, GLsizei height,
GLenum format, GLenum type, optional object data);
void texSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
GLenum format, GLenum type, TexImageSource? source); // May throw DOMException

void uniform1f(WebGLUniformLocation? location, GLfloat x);
//void uniform1fv(WebGLUniformLocation? location, Float32Array v);
5 ...metadata/webgl/conformance-1.0.3/conformance/more/functions/texSubImage2DBadArgs.html.ini
View file
Open in desktop

This file was deleted.

5 ...data/webgl/conformance-1.0.3/conformance/more/functions/texSubImage2DHTMLBadArgs.html.ini
View file
Open in desktop

This file was deleted.

99 ...nce-1.0.3/conformance/textures/tex-image-and-sub-image-2d-with-array-buffer-view.html.ini
View file
Open in desktop
@@ -1,20 +1,107 @@
[tex-image-and-sub-image-2d-with-array-buffer-view.html]
type: testharness
[WebGL test #0: successfullyParsed should be true. Was false.]

[WebGL test #0: at (0, 0) expected: 0,255,0,255 was 255,0,0,255]
expected: FAIL

[WebGL test #0: Unable to fetch WebGL rendering context for Canvas]
[WebGL test #1: at (0, 8) expected: 255,0,0,255 was 0,255,0,255]
expected: FAIL

[WebGL test #1: successfullyParsed should be true. Was false.]
[WebGL test #2: at (0, 0) expected: 0,0,255,255 was 255,0,0,255]
expected: FAIL

[WebGL test #0: at (0, 0) expected: 0,255,0,255 was 255,0,0,255]
[WebGL test #3: at (0, 4) expected: 255,0,0,255 was 0,0,255,255]
expected: FAIL

[WebGL test #1: at (0, 8) expected: 255,0,0,255 was 0,255,0,255]
[WebGL test #4: at (8, 0) expected: 0,255,0,255 was 255,0,0,255]
expected: FAIL

[WebGL test #5: at (0, 8) expected: 255,0,0,255 was 0,255,0,255]
expected: FAIL

[WebGL test #6: at (0, 0) expected: 0,0,255,255 was 255,0,0,255]
expected: FAIL

[WebGL test #7: at (0, 4) expected: 255,0,0,255 was 0,0,255,255]
expected: FAIL

[WebGL test #8: at (8, 0) expected: 0,255,0,255 was 255,0,0,255]
expected: FAIL

[WebGL test #9: at (0, 8) expected: 255,0,0,255 was 0,255,0,255]
expected: FAIL

[WebGL test #10: at (8, 8) expected: 0,0,255,255 was 255,0,0,255]
expected: FAIL

[WebGL test #11: at (8, 12) expected: 255,0,0,255 was 0,0,255,255]
expected: FAIL

[WebGL test #12: GL error before texture upload]
expected: FAIL

[WebGL test #25: GL error before texture upload]
expected: FAIL

[WebGL test #26: at (0, 0) expected: 0,0,0,255 was 255,0,0,255]
expected: FAIL

[WebGL test #27: at (0, 8) expected: 255,0,0,255 was 0,255,0,255]
expected: FAIL

[WebGL test #28: at (0, 0) expected: 0,0,0,255 was 255,0,0,255]
expected: FAIL

[WebGL test #29: at (0, 4) expected: 255,0,0,255 was 0,0,255,255]
expected: FAIL

[WebGL test #2: successfullyParsed should be true. Was false.]
[WebGL test #30: at (8, 0) expected: 0,0,0,255 was 255,0,0,255]
expected: FAIL

[WebGL test #31: at (0, 8) expected: 255,0,0,255 was 0,255,0,255]
expected: FAIL

[WebGL test #32: at (0, 0) expected: 0,0,0,255 was 255,0,0,255]
expected: FAIL

[WebGL test #33: at (0, 4) expected: 255,0,0,255 was 0,0,255,255]
expected: FAIL

[WebGL test #34: at (8, 0) expected: 0,0,0,255 was 255,0,0,255]
expected: FAIL

[WebGL test #35: at (0, 8) expected: 255,0,0,255 was 0,255,0,255]
expected: FAIL

[WebGL test #36: at (8, 8) expected: 0,0,0,255 was 255,0,0,255]
expected: FAIL

[WebGL test #37: at (8, 12) expected: 255,0,0,255 was 0,0,255,255]
expected: FAIL

[WebGL test #38: GL error before texture upload]
expected: FAIL

[WebGL test #40: at (0, 8) expected: 0,0,0,255 was 0,255,0,255]
expected: FAIL

[WebGL test #42: at (0, 4) expected: 0,0,0,255 was 0,0,255,255]
expected: FAIL

[WebGL test #44: at (0, 8) expected: 0,0,0,255 was 0,255,0,255]
expected: FAIL

[WebGL test #46: at (0, 4) expected: 0,0,0,255 was 0,0,255,255]
expected: FAIL

[WebGL test #48: at (0, 8) expected: 0,0,0,255 was 0,255,0,255]
expected: FAIL

[WebGL test #50: at (8, 12) expected: 0,0,0,255 was 0,0,255,255]
expected: FAIL

[WebGL test #51: GL error before texture upload]
expected: FAIL

[WebGL test #52: successfullyParsed should be true. Was false.]
expected: FAIL
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.