Changeset 503 for trunk/src/gl

Timestamp:

06/28/16 21:09:19 (9 years ago)

Author:

epyon

Message:

• nv::random - support for different rng sources
• nv::types - fixes and better support
• nv::mesh_creator - full range transform
• nv::context - buffer mask as separate type
• nv::lua - initializations from lua::state instead of lua_State
• nv::lua - initial support for rtti

Location:

trunk/src/gl

Files:

• gl_context.cc (modified) (4 diffs)
• gl_enum.cc (modified) (1 diff)

trunk/src/gl/gl_context.cc

@@ -201 +201 @@
 }
 
-void nv::gl_context::blit( framebuffer f, clear_state::buffers_type mask, ivec2 src1, ivec2 src2, ivec2 dst1, ivec2 dst2 )
+void nv::gl_context::blit( framebuffer f, buffer_mask mask, ivec2 src1, ivec2 src2, ivec2 dst1, ivec2 dst2 )
 {
         gl_framebuffer_info* info  = m_framebuffers.get( f );
@@ -207 +207 @@
         {
                 glBindFramebuffer( GL_FRAMEBUFFER, info->glid );
-                unsigned filter = mask == clear_state::COLOR_BUFFER ? GL_LINEAR : GL_NEAREST;
+                unsigned filter = mask == buffer_mask::COLOR_BUFFER ? GL_LINEAR : GL_NEAREST;
                 glBlitFramebuffer( src1.x, src1.y, src2.x, src2.y, dst1.x, dst1.y, dst2.x, dst2.y, clear_state_buffers_to_mask( mask ), filter );
         }
@@ -213 +213 @@
 
 
-void nv::gl_context::blit( framebuffer from, framebuffer to, clear_state::buffers_type mask, ivec2 src1, ivec2 src2, ivec2 dst1, ivec2 dst2 )
+void nv::gl_context::blit( framebuffer from, framebuffer to, buffer_mask mask, ivec2 src1, ivec2 src2, ivec2 dst1, ivec2 dst2 )
 {
         gl_framebuffer_info* finfo = m_framebuffers.get( from );
@@ -221 +221 @@
                 glBindFramebuffer( GL_READ_FRAMEBUFFER, finfo->glid );
                 glBindFramebuffer( GL_DRAW_FRAMEBUFFER, tinfo ? tinfo->glid : 0 );
-                unsigned filter = mask == clear_state::COLOR_BUFFER ? GL_LINEAR : GL_NEAREST;
+                unsigned filter = mask == buffer_mask::COLOR_BUFFER ? GL_LINEAR : GL_NEAREST;
                 glBlitFramebuffer( src1.x, src1.y, src2.x, src2.y, dst1.x, dst1.y, dst2.x, dst2.y, clear_state_buffers_to_mask( mask ), filter );
                 glBindFramebuffer( GL_READ_FRAMEBUFFER, 0 );

trunk/src/gl/gl_enum.cc

@@ -28 +28 @@
 }
 
-unsigned int nv::clear_state_buffers_to_mask( clear_state::buffers_type type )
+unsigned int nv::clear_state_buffers_to_mask( buffer_mask type )
 {
         unsigned int mask = 0;
-        if ( (type & clear_state::COLOR_BUFFER) != 0 )   mask |= GL_COLOR_BUFFER_BIT;
-        if ( (type & clear_state::DEPTH_BUFFER) != 0 )   mask |= GL_DEPTH_BUFFER_BIT;
-        if ( (type & clear_state::STENCIL_BUFFER) != 0 ) mask |= GL_STENCIL_BUFFER_BIT;
+        if ( (type & buffer_mask::COLOR_BUFFER) != 0 )   mask |= GL_COLOR_BUFFER_BIT;
+        if ( (type & buffer_mask::DEPTH_BUFFER) != 0 )   mask |= GL_DEPTH_BUFFER_BIT;
+        if ( (type & buffer_mask::STENCIL_BUFFER) != 0 ) mask |= GL_STENCIL_BUFFER_BIT;
         return mask;
 }