Support loading 1D textures

Author: einarf

demosys/opengl/shader.py

@@ -195,6 +195,12 @@ def uniform_sampler_2d(self, unit, name, texture):
         texture.bind()
         GL.glUniform1i(uniform.location, unit)
 
+    def uniform_sampler_1d(self, unit, name, texture):
+        uniform = self.uniform(name)
+        GL.glActiveTexture(GL.GL_TEXTURE0 + unit)
+        texture.bind()
+        GL.glUniform1i(uniform.location, unit)
+
 
 class ShaderSource:
     def __init__(self, type, name, source):

demosys/opengl/texture.py

@@ -64,17 +64,29 @@ def _build(self, width, height, depth, target=GL.GL_TEXTURE_2D, lod=0,
         GL.glTexParameteri(self.target, GL.GL_TEXTURE_MAG_FILTER, GL.GL_LINEAR)
         GL.glTexParameteri(self.target, GL.GL_TEXTURE_WRAP_S, GL.GL_REPEAT)
         GL.glTexParameteri(self.target, GL.GL_TEXTURE_WRAP_T, GL.GL_REPEAT)
-        GL.glTexImage2D(self.target, self.lod, self.internal_format,
-                        self.width, self.height, 0,
-                        self.format, self.type, data)
-        # GL.glBindTexture(GL.GL_TEXTURE_2D, 0)
+
+        if self.target == GL.GL_TEXTURE_2D:
+            GL.glTexImage2D(self.target, self.lod, self.internal_format,
+                            self.width, self.height, 0,
+                            self.format, self.type, data)
+        elif self.target == GL.GL_TEXTURE_1D:
+            if self.width > self.height:
+                GL.glTexImage1D(self.target, self.lod, self.internal_format,
+                                self.width, 0, self.format, self.type, data)
+            else:
+                GL.glTexImage1D(self.target, self.lod, self.internal_format,
+                                self.height, 0, self.format, self.type, data)
 
     def set_image(self, image):
         """Set image data using a PIL/Pillow image"""
         image_flipped = image.transpose(Image.FLIP_TOP_BOTTOM)
         data = image_flipped.convert("RGBA").tobytes()
         self.width, self.height = image.size
-        self._build(self.width, self.height, 0, data=data)
+        if self.width == 1 or self.height == 1:
+            self.target = GL.GL_TEXTURE_1D
+        else:
+            self.target = GL.GL_TEXTURE_2D
+        self._build(self.width, self.height, 0, data=data, target=self.target)
 
     def set_texture_repeat(self, mode):
         self.bind()