GPipe 1.1.1 → 1.1.2

raw patch · 2 files changed

+28/−4 lines, 2 filesdep ~Booleandep ~Vecdep ~Vec-Boolean

Dependency ranges changed: Boolean, Vec, Vec-Boolean

Files

• GPipe.cabal +4/−3
• src/Resources.hs +24/−1

@@ -1,13 +1,14 @@ name: GPipe-version: 1.1.1+version: 1.1.2 cabal-version: >= 1.2.3 build-type: Simple license: BSD3 license-file: "" copyright: Tobias Bexelius maintainer: Tobias Bexelius-build-depends: Boolean -any, GLUT >=2.2.2.0, OpenGL >=2.4.0.1,-               Vec -any, Vec-Boolean -any, base == 4.1.0.0, containers -any, mtl -any, list-tries -any+build-depends: containers -any, mtl -any, list-tries -any,+               GLUT >=2.2.2.0, OpenGL >=2.4.0.1,+               Boolean == 0.0.1, Vec == 0.9.6, Vec-Boolean == 1.0.1, base == 4.1.0.0 stability: Experimental homepage: http://www.haskell.org/haskellwiki/GPipe package-url: http://hackage.haskell.org/package/GPipe

@@ -365,7 +365,14 @@     cache <- getCurrentOrSetHiddenContext
     [tex] <- genObjectNames 1
     -- putStrLn $ "Created texture " ++ show tex
-    rowAlignment Unpack $= 1 -- Set to no padding
+    swapBytes Unpack $= False
+    lsbFirst Unpack $= False
+    rowLength Unpack $= 0
+    skipRows Unpack $= 0
+    skipPixels Unpack $= 0
+    rowAlignment Unpack $= 1  -- Set to no padding
+    imageHeight Unpack $= 0
+    skipImages Unpack $= 0
     ionew tex cache     ref <- newIORef $ Map.singleton (contextWindow cache) tex     mkWeakIORef ref $ do m <- readIORef ref@@ -386,6 +393,22 @@                           textureBinding target $= Just t
                           ft <- get $ textureLevelRange target
                           f <- get $ textureInternalFormat (Left target) 0
+                          swapBytes Unpack $= False
+                          lsbFirst Unpack $= False
+                          rowLength Unpack $= 0
+                          skipRows Unpack $= 0
+                          skipPixels Unpack $= 0
+                          rowAlignment Unpack $= 1  -- Set to no padding
+                          imageHeight Unpack $= 0
+                          skipImages Unpack $= 0
+                          swapBytes Pack $= False
+                          lsbFirst Pack $= False
+                          rowLength Pack $= 0
+                          skipRows Pack $= 0
+                          skipPixels Pack $= 0
+                          rowAlignment Pack $= 1  -- Set to no padding
+                          imageHeight Pack $= 0
+                          skipImages Pack $= 0
                           tex <- transferTexture s ft f
                           textureLevelRange target $= ft
                           -- putStrLn $ "Transferred texture " ++ show tex