Nux

Merge lp://qastaging/~3v1n0/nux/fallback-texture into lp://qastaging/nux

fallback-texture
Merge into trunk

Proposed by Marco Trevisan (Treviño) on 2013-07-03

Status:

Merged

Approved by:

Andrea Azzarone on 2013-07-03

Approved revision:

808

Merged at revision:

799

Proposed branch:

lp://qastaging/~3v1n0/nux/fallback-texture

Merge into:

lp://qastaging/nux

Diff against target:

239 lines (+86/-18)

4 files modified

NuxGraphics/GLTextureResourceManager.cpp (+33/-13)
NuxGraphics/ImageSurface.cpp (+1/-0)
tests/Makefile.am (+1/-4)
tests/gtest-nuxgraphics-texture.cpp (+51/-1)

To merge this branch:

bzr merge lp://qastaging/~3v1n0/nux/fallback-texture

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2013-07-04
Andrea Azzarone (community)		2013-07-03	Approve on 2013-07-03
Review via email: mp+172927@code.qastaging.launchpad.net

Commit message

GLTextureResourceManager: always return an empty (but non-NULL) texture if env var is set

Specifically, if NUX_FALLBACK_TEXTURE env variable is set, then we always try to
generate a valid texture. This is nice for testing purposes

Description of the change

When generating new textures from a local file or a pixbuf, Nux returns a new (not-NULL) BaseTexture only if the pixbuf is valid or the file exists. This is generally ok, but for testing purposes we sometimes (such as in tests) we need to ignore this and try to return a non-NULL (but empty) texture.
So, now setting the NUX_FALLBACK_TEXTURE to any value, makes Nux to be less strict on this, and always return an empty BaseTexture.

New tests added. Improved logging as well.

Revision history for this message