1084607 - SurfaceTextureImage not declared in GLImages.ccp

Status: RESOLVED INVALID

(Core :: Graphics: Layers, defect)

Description

[Ralph Giles (:rillian)]

Problem with unified build:

/builds/slave/m-in-and-nu-000000000000000000/build/gfx/layers/GLImages.cpp:19:1: error: 'SurfaceTextureImage' has not been declared

Comment 1

[Ralph Giles (:rillian)]

I get other errors locally.

 0:08.54 In file included from /home/giles/mozilla/firefox/gfx/layers/client/CanvasClient.cpp:21:0:
 0:08.54 ../../dist/include/mozilla/layers/TextureClientOGL.h:77:24: error: 'AndroidSurfaceTexture' has not been declared
 0:08.54                         AndroidSurfaceTexture* aSurfTex,

Comment 2

[Legacy TBPL/Treeherder Robot]

submit_timestamp: 2014-10-17T14:35:24
log: https://treeherder.mozilla.org/ui/logviewer.html#?repo=mozilla-inbound&job_id=3103731
repository: mozilla-inbound
who: giles[at]mozilla[dot]com
machine: bld-linux64-spot-413
buildname: Android 2.3 mozilla-inbound non-unified
revision: 5aea4fbbb47d

/builds/slave/m-in-and-nu-000000000000000000/build/gfx/layers/GLImages.cpp:19:1: error: 'SurfaceTextureImage' has not been declared
/builds/slave/m-in-and-nu-000000000000000000/build/gfx/layers/GLImages.cpp:38:33: error: 'mData' was not declared in this scope
/builds/slave/m-in-and-nu-000000000000000000/build/gfx/layers/GLImages.cpp:47:33: error: invalid use of 'this' in non-member function
/builds/slave/m-in-and-nu-000000000000000000/build/gfx/layers/GLImages.cpp:50:10: error: 'DataSourceSurface' was not declared in this scope
/builds/slave/m-in-and-nu-000000000000000000/build/gfx/layers/GLImages.cpp:50:27: error: template argument 1 is invalid
/builds/slave/m-in-and-nu-000000000000000000/build/gfx/layers/GLImages.cpp:50:36: error: invalid type in declaration before '=' token
/builds/slave/m-in-and-nu-000000000000000000/build/gfx/layers/GLImages.cpp:51:9: error: 'Factory' has not been declared
/builds/slave/m-in-and-nu-000000000000000000/build/gfx/layers/GLImages.cpp:56:53: error: invalid conversion from 'int' to 'mozilla::gfx::DataSourceSurface*' [-fpermissive]
../../dist/include/GLReadTexImageHelper.h:31:6: error:   initializing argument 2 of 'void mozilla::gl::ReadPixelsIntoDataSurface(mozilla::gl::GLContext*, mozilla::gfx::DataSourceSurface*)' [-fpermissive]
/builds/slave/m-in-and-nu-000000000000000000/build/gfx/layers/GLImages.cpp:57:17: error: request for member 'forget' in 'source', which is of non-class type 'int'
/builds/slave/m-in-and-nu-000000000000000000/build/gfx/layers/GLImages.cpp:58:1: error: control reaches end of non-void function [-Werror=return-type]
make[5]: *** [GLImages.o] Error 1
make[4]: *** [gfx/layers/target] Error 2
make[4]: *** Waiting for unfinished jobs....
make[3]: *** [compile] Error 2
make[2]: *** [default] Error 2
make[1]: *** [realbuild] Error 2
make: *** [build] Error 2

Comment 3

[Legacy TBPL/Treeherder Robot]

submit_timestamp: 2014-10-17T14:35:51
log: https://treeherder.mozilla.org/ui/logviewer.html#?repo=mozilla-inbound&job_id=3103732
repository: mozilla-inbound
who: giles[at]mozilla[dot]com
machine: bld-linux64-spot-1010
buildname: Android 2.3 Debug mozilla-inbound non-unified
revision: 5aea4fbbb47d

/builds/slave/m-in-and-d-nu-0000000000000000/build/gfx/layers/GLImages.cpp:19:1: error: 'SurfaceTextureImage' has not been declared
/builds/slave/m-in-and-d-nu-0000000000000000/build/gfx/layers/GLImages.cpp:38:33: error: 'mData' was not declared in this scope
/builds/slave/m-in-and-d-nu-0000000000000000/build/gfx/layers/GLImages.cpp:47:33: error: invalid use of 'this' in non-member function
/builds/slave/m-in-and-d-nu-0000000000000000/build/gfx/layers/GLImages.cpp:50:10: error: 'DataSourceSurface' was not declared in this scope
/builds/slave/m-in-and-d-nu-0000000000000000/build/gfx/layers/GLImages.cpp:50:27: error: template argument 1 is invalid
/builds/slave/m-in-and-d-nu-0000000000000000/build/gfx/layers/GLImages.cpp:50:36: error: invalid type in declaration before '=' token
/builds/slave/m-in-and-d-nu-0000000000000000/build/gfx/layers/GLImages.cpp:51:9: error: 'Factory' has not been declared
/builds/slave/m-in-and-d-nu-0000000000000000/build/gfx/layers/GLImages.cpp:56:53: error: invalid conversion from 'int' to 'mozilla::gfx::DataSourceSurface*' [-fpermissive]
../../dist/include/GLReadTexImageHelper.h:31:6: error:   initializing argument 2 of 'void mozilla::gl::ReadPixelsIntoDataSurface(mozilla::gl::GLContext*, mozilla::gfx::DataSourceSurface*)' [-fpermissive]
/builds/slave/m-in-and-d-nu-0000000000000000/build/gfx/layers/GLImages.cpp:57:17: error: request for member 'forget' in 'source', which is of non-class type 'int'
/builds/slave/m-in-and-d-nu-0000000000000000/build/gfx/layers/GLImages.cpp:58:1: error: control reaches end of non-void function [-Werror=return-type]
make[5]: *** [GLImages.o] Error 1
make[4]: *** [gfx/layers/target] Error 2
make[4]: *** Waiting for unfinished jobs....
make[3]: *** [compile] Error 2
make[2]: *** [default] Error 2
make[1]: *** [realbuild] Error 2
make: *** [build] Error 2

Comment 4

[Ralph Giles (:rillian)]

Attachment: Add missing namespace references.

Also fixes another AndroidSurfaceTexture issue.

Comment 5

[Kelsey Gilbert [:jgilbert]]

Comment on attachment 8507206 [details] [diff] [review]
Add missing namespace references.

Review of attachment 8507206 [details] [diff] [review]:
-----------------------------------------------------------------

::: gfx/layers/GLImages.cpp
@@ +13,2 @@
>  using namespace mozilla::gl;
> +using namespace mozilla::layers;

FWIW, using `using` tends to cause more unified build problems in the future.

Comment 6

[Ralph Giles (:rillian)]

Would you prefer prefixes instead?

Comment 7

[Ralph Giles (:rillian)]

https://hg.mozilla.org/integration/mozilla-inbound/rev/e3fe86623065

Comment 8

[Kelsey Gilbert [:jgilbert]]

(In reply to Ralph Giles (:rillian) from comment #6)
> Would you prefer prefixes instead?

Prefixes are better for unified builds, since they don't leak across (what would normally be) TUs.

Comment 9

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

I had to back out bug 1014614 for bustage, and this was getting in my way, so it's backed out in https://hg.mozilla.org/integration/mozilla-inbound/rev/34f6b30b6dfa

Comment 10

[Ralph Giles (:rillian)]

James, can I leave these fixes to you now that time pressure is off? Let me know if you want any help or testing?

Comment 11

[James Willcox (:snorp) ([e-mail]) (he/him)]

Yeah I fixed this in the relanding. Thanks!