Followed OpenGLRaw's naming and typing fixes.

haskell-opengl · Feb 3, 2015 · ddc9909 · ddc9909
1 parent a79c123
commit ddc9909
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Graphics/Rendering/OpenGL/GL/Shaders/Program.hs b/src/Graphics/Rendering/OpenGL/GL/Shaders/Program.hs
@@ -63,7 +63,7 @@ data GetProgramPName =
    | TessGenSpacing
    | TessGenVertexOrder
    | TessGenPointMode
-   | ComputeLocalWorkSize  -- 3 integers!
+   | ComputeWorkGroupSize  -- 3 integers!
    | ProgramSeparable
    | ProgramBinaryRetrievableHint
    | ActiveAtomicCounterBuffers
@@ -94,7 +94,7 @@ marshalGetProgramPName x = case x of
    TessGenSpacing -> gl_TESS_GEN_SPACING
    TessGenVertexOrder -> gl_TESS_GEN_VERTEX_ORDER
    TessGenPointMode -> gl_TESS_GEN_POINT_MODE
-   ComputeLocalWorkSize -> gl_COMPUTE_LOCAL_WORK_SIZE
+   ComputeWorkGroupSize ->  0x8267 -- gl_COMPUTE_WORK_GROUP_SIZE a.k.a. gl_COMPUTE_LOCAL_WORK_SIZE
    ProgramSeparable -> gl_PROGRAM_SEPARABLE
    ProgramBinaryRetrievableHint -> gl_PROGRAM_BINARY_RETRIEVABLE_HINT
    ActiveAtomicCounterBuffers -> gl_ACTIVE_ATOMIC_COUNTER_BUFFERS

diff --git a/src/Graphics/Rendering/OpenGL/GL/Texturing/Specification.hs b/src/Graphics/Rendering/OpenGL/GL/Texturing/Specification.hs
@@ -299,7 +299,7 @@ texImage2DMultisample :: TextureTarget2DMultisample
                       -> IO ()
 texImage2DMultisample target proxy (Samples s) int (TextureSize2D w h) loc =
    glTexImage2DMultisample
-      (marshalMultisample proxy target) s (marshalPixelInternalFormat int)
+      (marshalMultisample proxy target) s (fromIntegral (marshalPixelInternalFormat int))
       w h (marshalSampleLocations loc)
 
 marshalMultisample :: ParameterizedTextureTarget t => Proxy -> t -> GLenum
@@ -316,7 +316,7 @@ texImage3DMultisample :: TextureTarget2DMultisampleArray
                       -> IO ()
 texImage3DMultisample target proxy (Samples s) int (TextureSize3D w h d) loc =
    glTexImage3DMultisample
-      (marshalMultisample proxy target) s (marshalPixelInternalFormat int)
+      (marshalMultisample proxy target) s (fromIntegral (marshalPixelInternalFormat int))
       w h d (marshalSampleLocations loc)
 
 --------------------------------------------------------------------------------