Ubuntu UI Toolkit

Merge lp://staging/~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-opengles-mipmap-path-fix into lp://staging/ubuntu-ui-toolkit/staging

ubuntu-ui-toolkit-opengles-mipmap-path-fix
Merge into staging

Proposed by Loïc Molinari on 2015-10-12

Status:

Merged

Approved by:

Tim Peeters on 2015-10-13

Approved revision:

1682

Merged at revision:

1684

Proposed branch:

lp://staging/~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-opengles-mipmap-path-fix

Merge into:

lp://staging/ubuntu-ui-toolkit/staging

Diff against target:

194 lines (+98/-30)

3 files modified

src/Ubuntu/Components/plugin/ucubuntushape.cpp (+0/-1)
src/Ubuntu/Components/plugin/ucubuntushapetexture.h (+57/-3)
src/Ubuntu/Components/tools/createshapetextures.cpp (+41/-26)

To merge this branch:

bzr merge lp://staging/~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-opengles-mipmap-path-fix

High

Triaged

Link a bug report

Reviewer	Review Type	Date Requested	Status
Tim Peeters		2015-10-12	Approve on 2015-10-13
PS Jenkins bot	continuous-integration		Approve on 2015-10-12
Review via email: mp+274176@code.staging.launchpad.net

Commit message

Fixed OpenGL ES 2 mipmap fallback.

OpenGL ES 2 doesn't support GL_TEXTURE_MAX_LEVEL by default, it is only available via an extension. It was working on the devices where this extension is available but not on the emulator.

Description of the change

Fixed OpenGL ES 2 mipmap fallback.

OpenGL ES 2 doesn't support GL_TEXTURE_MAX_LEVEL by default, it is only available via an extension. It was working on the devices where this extension is available but not on the emulator.

Revision history for this message