[glumpy] push by Nicolas.Rougier@gmail.com - Fix GL_ALPHA32F_ARB import (issue 13) on 2012-08-17 08:09 GMT

[glu...@googlecode.com]

Revision: cf40d63c9924
Author: Nicolas Rougier <Nicolas...@inria.fr>
Date: Fri Aug 17 01:09:12 2012
Log: Fix GL_ALPHA32F_ARB import (issue 13)

http://code.google.com/p/glumpy/source/detail?r=cf40d63c9924

Modified:
/glumpy/image/filter.py

=======================================
--- /glumpy/image/filter.py Wed Sep 21 06:55:48 2011
+++ /glumpy/image/filter.py Fri Aug 17 01:09:12 2012
@@ -79,6 +79,14 @@
import OpenGL.GL as gl
import OpenGL.GLUT as glut

+try:
+ from OpenGL.GL import GL_ALPHA32F_ARB
+except:
+ try:
+ from OpenGL.raw.GL.ARB.texture_float import GL_ALPHA32F_ARB
+ except:
+ raise(RuntimeError, "Cannot import GL_ALPHA32F_ARB")
+
from glumpy.graphics.shader import Shader
from glumpy.image.texture import Texture

@@ -257,7 +265,7 @@
gl.glTexParameterf (gl.GL_TEXTURE_1D,
gl.GL_TEXTURE_MAG_FILTER, gl.GL_NEAREST)
gl.glTexParameterf (gl.GL_TEXTURE_1D, gl.GL_TEXTURE_WRAP_S,
gl.GL_CLAMP)
gl.glTexParameterf (gl.GL_TEXTURE_1D, gl.GL_TEXTURE_WRAP_T,
gl.GL_CLAMP)
- gl.glTexImage1D (gl.GL_TEXTURE_1D, 0, gl.GL_ALPHA32F_ARB,
+ gl.glTexImage1D (gl.GL_TEXTURE_1D, 0, GL_ALPHA32F_ARB,
kernel.size, 0, gl.GL_ALPHA, gl.GL_FLOAT,
kernel)