diff options
author | Csaba Hruska <csaba.hruska@gmail.com> | 2016-12-24 22:17:31 +0100 |
---|---|---|
committer | Csaba Hruska <csaba.hruska@gmail.com> | 2016-12-24 22:17:31 +0100 |
commit | fc8c62752124549f9ac921a18ebc9cc08885a0a9 (patch) | |
tree | bbc9c35f893755487f32af4f97111710bd2d9b44 /src/LambdaCube/GL/Type.hs | |
parent | 24fb624fb50169c641d9aaa07a1f9c545ba2e195 (diff) |
fix DrawContext construction
Diffstat (limited to 'src/LambdaCube/GL/Type.hs')
-rw-r--r-- | src/LambdaCube/GL/Type.hs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/LambdaCube/GL/Type.hs b/src/LambdaCube/GL/Type.hs index 776a425..9769603 100644 --- a/src/LambdaCube/GL/Type.hs +++ b/src/LambdaCube/GL/Type.hs | |||
@@ -181,7 +181,7 @@ type GLUniformBinding = GLint | |||
181 | 181 | ||
182 | data GLSamplerUniform | 182 | data GLSamplerUniform |
183 | = GLSamplerUniform | 183 | = GLSamplerUniform |
184 | { glUniformBinding :: GLUniformBinding | 184 | { glUniformBinding :: !GLUniformBinding |
185 | , glUniformBindingRef :: IORef GLUniformBinding | 185 | , glUniformBindingRef :: IORef GLUniformBinding |
186 | } | 186 | } |
187 | 187 | ||
@@ -190,19 +190,19 @@ instance Eq GLSamplerUniform where | |||
190 | 190 | ||
191 | data GLDrawContext | 191 | data GLDrawContext |
192 | = GLDrawContext | 192 | = GLDrawContext |
193 | { glRasterContext :: RasterContext | 193 | { glRasterContext :: !RasterContext |
194 | , glAccumulationContext :: AccumulationContext | 194 | , glAccumulationContext :: !AccumulationContext |
195 | , glRenderTarget :: GLRenderTarget | 195 | , glRenderTarget :: !GLRenderTarget |
196 | , glProgram :: GLuint | 196 | , glProgram :: !GLuint |
197 | , glTextureMapping :: [(GLTextureUnit,GLTexture)] | 197 | , glTextureMapping :: ![(GLTextureUnit,GLTexture)] |
198 | , glSamplerMapping :: [(GLTextureUnit,GLSampler)] | 198 | , glSamplerMapping :: ![(GLTextureUnit,GLSampler)] |
199 | , glSamplerUniformMapping :: [(GLTextureUnit,GLSamplerUniform)] | 199 | , glSamplerUniformMapping :: ![(GLTextureUnit,GLSamplerUniform)] |
200 | } | 200 | } |
201 | 201 | ||
202 | data GLCommand | 202 | data GLCommand |
203 | = GLRenderSlot GLDrawContext SlotName ProgramName | 203 | = GLRenderSlot !GLDrawContext !SlotName !ProgramName |
204 | | GLRenderStream GLDrawContext StreamName ProgramName | 204 | | GLRenderStream !GLDrawContext !StreamName !ProgramName |
205 | | GLClearRenderTarget GLRenderTarget [ClearImage] | 205 | | GLClearRenderTarget !GLRenderTarget ![ClearImage] |
206 | 206 | ||
207 | instance Show (IORef GLint) where | 207 | instance Show (IORef GLint) where |
208 | show _ = "(IORef GLint)" | 208 | show _ = "(IORef GLint)" |