GLUT 2.7.0.1 → 2.7.0.2

raw patch · 7 files changed

+24/−24 lines, 7 filesdep ~OpenGLPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: OpenGL

API changes (from Hackage documentation)

Files

• GLUT.cabal +4/−4
• examples/Misc/ColorTriangle/ColorTriangle.hs +1/−1
• examples/Misc/ColorTriangle/color_triangles.frac +0/−10
• examples/Misc/ColorTriangle/color_triangles.frag +10/−0
• examples/RedBook8/Chapter01/Triangles.hs +1/−1
• examples/RedBook8/Chapter01/triangles.frac +0/−8
• examples/RedBook8/Chapter01/triangles.frag +8/−0

@@ -1,5 +1,5 @@ name: GLUT-version: 2.7.0.1+version: 2.7.0.2 synopsis: A binding for the OpenGL Utility Toolkit description:   A Haskell binding for the OpenGL Utility Toolkit, a window system independent@@ -38,7 +38,7 @@    examples/Misc/ARBOcclude.hs    examples/Misc/ColorTriangle/ColorTriangle.hs    examples/Misc/ColorTriangle/Makefile-   examples/Misc/ColorTriangle/color_triangles.frac+   examples/Misc/ColorTriangle/color_triangles.frag    examples/Misc/ColorTriangle/color_triangles.vert    examples/Misc/ExtractContours.hs    examples/Misc/Gears.hs@@ -130,7 +130,7 @@    examples/RedBook4/Wrap.hs    examples/RedBook8/00-README    examples/RedBook8/Chapter01/Makefile-   examples/RedBook8/Chapter01/triangles.frac+   examples/RedBook8/Chapter01/triangles.frag    examples/RedBook8/Chapter01/Triangles.hs    examples/RedBook8/Chapter01/triangles.vert    examples/RedBook8/common/LoadShaders.hs@@ -180,7 +180,7 @@     transformers >= 0.2  && < 0.5,     StateVar     >= 1.1  && < 1.2,     OpenGLRaw    >= 2.3  && < 2.6,-    OpenGL       >= 2.12 && < 2.13+    OpenGL       >= 2.12 && < 2.14   default-language: Haskell2010   other-extensions: CPP   ghc-options: -Wall

@@ -58,7 +58,7 @@    program <- loadShaders [      ShaderInfo VertexShader (FileSource "color_triangles.vert"),-     ShaderInfo FragmentShader (FileSource "color_triangles.frac")]+     ShaderInfo FragmentShader (FileSource "color_triangles.frag")]   currentProgram $= Just program    let firstIndex = 0

@@ -1,10 +0,0 @@-#version 430 core--in vec4 color;-out vec4 fColor;--void-main()-{-   fColor = color;-}

@@ -0,0 +1,10 @@+#version 430 core++in vec4 color;+out vec4 fColor;++void+main()+{+   fColor = color;+}

@@ -43,7 +43,7 @@    program <- loadShaders [      ShaderInfo VertexShader (FileSource "triangles.vert"),-     ShaderInfo FragmentShader (FileSource "triangles.frac")]+     ShaderInfo FragmentShader (FileSource "triangles.frag")]   currentProgram $= Just program    let firstIndex = 0

@@ -1,8 +0,0 @@-#version 430 core--out vec4 fColor;-void-main()-{-   fColor = vec4(0.0, 0.0, 1.0, 1.0);-}

@@ -0,0 +1,8 @@+#version 430 core++out vec4 fColor;+void+main()+{+   fColor = vec4(0.0, 0.0, 1.0, 1.0);+}