Skip to content

Commit ddc9909

Browse files
committed
Followed OpenGLRaw's naming and typing fixes.
1 parent a79c123 commit ddc9909

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

src/Graphics/Rendering/OpenGL/GL/Shaders/Program.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ data GetProgramPName =
6363
| TessGenSpacing
6464
| TessGenVertexOrder
6565
| TessGenPointMode
66-
| ComputeLocalWorkSize -- 3 integers!
66+
| ComputeWorkGroupSize -- 3 integers!
6767
| ProgramSeparable
6868
| ProgramBinaryRetrievableHint
6969
| ActiveAtomicCounterBuffers
@@ -94,7 +94,7 @@ marshalGetProgramPName x = case x of
9494
TessGenSpacing -> gl_TESS_GEN_SPACING
9595
TessGenVertexOrder -> gl_TESS_GEN_VERTEX_ORDER
9696
TessGenPointMode -> gl_TESS_GEN_POINT_MODE
97-
ComputeLocalWorkSize -> gl_COMPUTE_LOCAL_WORK_SIZE
97+
ComputeWorkGroupSize -> 0x8267 -- gl_COMPUTE_WORK_GROUP_SIZE a.k.a. gl_COMPUTE_LOCAL_WORK_SIZE
9898
ProgramSeparable -> gl_PROGRAM_SEPARABLE
9999
ProgramBinaryRetrievableHint -> gl_PROGRAM_BINARY_RETRIEVABLE_HINT
100100
ActiveAtomicCounterBuffers -> gl_ACTIVE_ATOMIC_COUNTER_BUFFERS

src/Graphics/Rendering/OpenGL/GL/Texturing/Specification.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ texImage2DMultisample :: TextureTarget2DMultisample
299299
-> IO ()
300300
texImage2DMultisample target proxy (Samples s) int (TextureSize2D w h) loc =
301301
glTexImage2DMultisample
302-
(marshalMultisample proxy target) s (marshalPixelInternalFormat int)
302+
(marshalMultisample proxy target) s (fromIntegral (marshalPixelInternalFormat int))
303303
w h (marshalSampleLocations loc)
304304

305305
marshalMultisample :: ParameterizedTextureTarget t => Proxy -> t -> GLenum
@@ -316,7 +316,7 @@ texImage3DMultisample :: TextureTarget2DMultisampleArray
316316
-> IO ()
317317
texImage3DMultisample target proxy (Samples s) int (TextureSize3D w h d) loc =
318318
glTexImage3DMultisample
319-
(marshalMultisample proxy target) s (marshalPixelInternalFormat int)
319+
(marshalMultisample proxy target) s (fromIntegral (marshalPixelInternalFormat int))
320320
w h d (marshalSampleLocations loc)
321321

322322
--------------------------------------------------------------------------------

0 commit comments

Comments
 (0)