lp:~glmark2-dev/glmark2/bilinear-shader

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:glmark2/2011.11 at revision 172

Jesse Barker: Approve on 2011-11-29

Diff: 278 lines (+122/-45)

6 files modified

data/shaders/light-basic-tex-bilinear.frag (+31/-0)
src/canvas-x11.cpp (+28/-20)
src/canvas-x11.h (+1/-0)
src/scene-texture.cpp (+41/-25)
src/shader-source.cpp (+19/-0)
src/shader-source.h (+2/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

174. By Alexandros Frantzis on 2011-11-29

SceneTexture: Add validation for "linear-shader" filtering method.

173. By Alexandros Frantzis on 2011-11-29

SceneTexture: Add support for bilinear filtering implemented in the fragment shader

172. By Alexandros Frantzis on 2011-11-29

ShaderSource: Add a vec2 version of the add_const() method

171. By Alexandros Frantzis on 2011-11-24

CanvasX11: Call glViewport() only after binding a GL context.

170. By Alexandros Frantzis on 2011-11-16

Build,Doc: Update files for 2011.11 release.

169. By Alexandros Frantzis on 2011-11-16

Mesh,Model: Remove trailing whitespace.

168. By Alexandros Frantzis on 2011-11-15

SceneBump: Implement bump mapping using a tangent space normal map and a height map.

167. By Alexandros Frantzis on 2011-11-11

*: Merge cleanup branch part 2.

166. By Alexandros Frantzis on 2011-11-11

Scene: Don't include a trailing space in the scene information string.

165. By Alexandros Frantzis on 2011-11-11

Log: Skip the log continuation character when displaying info messages in normal mode.