Merge pull request #14 from tgfrerer/feature-elinuxProgrammableGL

optimise ofShader
Merge branch 'feature-elinuxProgrammableGL' of git://github.com/arturoc/openFrameworks into feature-elinuxProgrammableGL
ofAppNoWindow: refactor fps calculation
ofProgrammableGLRenderer -> ofGLProgrammableRenderer
ofAppNoWindow: remove unused variable
Merge branch 'feature-elinuxProgrammableGL' of git://github.com/arturoc/openFrameworks into feature-elinuxProgrammableGL
ofProgrammableGLRenderer->ofGLProgrammableRenderer
Merge branch 'feature-elinuxProgrammableGL' of git://github.com/arturoc/openFrameworks into feature-elinuxProgrammableGL
fix gl issue with glPushAttrib

+ glPush / Pop Attrib is deprecated and thus should only affect the fixed function GL pipeline.

+ this commit fixes this by making it dependent on getGlProgrammableRenderer()

Signed-off-by: tgfrerer <tim@poniesandlight.co.uk>
ofAppRunner: set default bg color
update openframeworks.xcodeproj for GLProgrammableRenderer name change

Signed-off-by: tgfrerer <tim@poniesandlight.co.uk>
fix nFrameCount not defined in #windows and #osx

+ seems to be a leftover from a refactor, only affecting windows and os x

we call ofGetFrameNum instead, that works.

Signed-off-by: tgfrerer <tim@poniesandlight.co.uk>
linux, vs and win_cb OF project: ofProgrammableRenderer -> ofGLProgrammableRenderer
Merge branch 'feature-elinuxProgrammableGL' of git://github.com/arturoc/openFrameworks into feature-elinuxProgrammableGL
Merge pull request #15 from tgfrerer/feature-elinuxProgrammableGL

Feature elinux programmable gl
Merge branch 'feature-elinuxProgrammableGL' of git://github.com/arturoc/openFrameworks into feature-elinuxProgrammableGL
ofxAssimp: ofProgrammableGL -> ofGLProgrammable
ofAppGLFWWindow: add linux icon
Merge branch 'feature-elinuxProgrammableGL' of github.com:arturoc/openFrameworks into feature-elinuxProgrammableGL
fix a critical bug for fixed function pipeline glDrawElements calls

+ if VAOs were not supported (GL2), no indices buffer was bound upon glDrawElements, which leads to bad things happening.

this fix takes care of that by binding the indices buffer if VAOs are not supported.

Signed-off-by: tgfrerer <tim@poniesandlight.co.uk>