Changeset 491 for trunk/src/gl/gl_device.cc

Timestamp:

04/29/16 12:42:28 (9 years ago)

Author:

epyon

Message:

• mass update (will try to do atomic from now)

File:

• trunk/src/gl/gl_device.cc (modified) (8 diffs)

trunk/src/gl/gl_device.cc

@@ -17 +17 @@
 gl_device::gl_device()
 {
-        m_shader_header.append( "#version 330\n" );
+        m_shader_header.append( "#version 330 core\n" );
         for ( auto& i : get_uniform_factory() ) 
                 m_shader_header.append( "uniform "+datatype_to_glsl_type( i.second->get_datatype() )+" "+ i.first +";\n" );
@@ -95 +95 @@
 nv::texture nv::gl_device::create_texture( texture_type type, ivec2 size, image_format aformat, sampler asampler, const void* data /*= nullptr */ )
 {
-        NV_ASSERT_ALWAYS( type != TEXTURE_3D && type != TEXTURE_2D_ARRAY, "2D texture type expected!" );
+        NV_ASSERT_ALWAYS( type != TEXTURE_1D_BUFFER && type != TEXTURE_3D && type != TEXTURE_2D_ARRAY, "2D texture type expected!" );
         unsigned glid = 0;
         unsigned gl_type = texture_type_to_enum( type );
+        GLint gl_internal = GLint( nv::image_format_to_internal_enum( aformat.format ) );
+        unsigned gl_enum = nv::image_format_to_enum( aformat.format );
 
         bool is_depth = aformat.format == DEPTH16 || aformat.format == DEPTH24 || aformat.format == DEPTH32;
@@ -106 +108 @@
 
         // Detect if mipmapping was requested
-        if ( gl_type == GL_TEXTURE_2D && asampler.filter_min != sampler::LINEAR && asampler.filter_min != sampler::NEAREST )
+        if ( gl_type == GL_TEXTURE_2D && gl_enum != GL_RED_INTEGER && asampler.filter_min != sampler::LINEAR && asampler.filter_min != sampler::NEAREST )
         {
                 // TODO: This should not be done if we use framebuffers!
@@ -119 +121 @@
         glTexParameteri( gl_type, GL_TEXTURE_MIN_FILTER, GLint( nv::sampler_filter_to_enum( asampler.filter_min ) ) );
         glTexParameteri( gl_type, GL_TEXTURE_MAG_FILTER, GLint( nv::sampler_filter_to_enum( asampler.filter_max ) ) );
-        glTexParameteri( gl_type, GL_TEXTURE_WRAP_S, GLint( nv::sampler_wrap_to_enum( asampler.wrap_s) ) );
-        glTexParameteri( gl_type, GL_TEXTURE_WRAP_T, GLint( nv::sampler_wrap_to_enum( asampler.wrap_t) ) );
+        
+        if ( gl_enum != GL_RED_INTEGER )
+        {
+                glTexParameteri( gl_type, GL_TEXTURE_WRAP_S, GLint( nv::sampler_wrap_to_enum( asampler.wrap_s ) ) );
+                glTexParameteri( gl_type, GL_TEXTURE_WRAP_T, GLint( nv::sampler_wrap_to_enum( asampler.wrap_t ) ) );
+        }
 
         if ( is_depth )
@@ -140 +146 @@
 //      glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, aniso );
 
-        glTexImage2D( gl_type, 0, GLint( nv::image_format_to_internal_enum(aformat.format) ), size.x, size.y, 0, nv::image_format_to_enum(aformat.format), nv::datatype_to_gl_enum(aformat.type), data );
+        glTexImage2D( gl_type, 0, gl_internal, size.x, size.y, 0, gl_enum, nv::datatype_to_gl_enum(aformat.type), data );
 
         glBindTexture( gl_type, 0 );
@@ -154 +160 @@
 }
 
+
+nv::texture nv::gl_device::create_texture( texture_type type, pixel_format format )
+{
+        NV_ASSERT_ALWAYS( type == TEXTURE_1D_BUFFER );
+        unsigned glid = 0;
+        unsigned gl_type = texture_type_to_enum( type );
+
+        glGenTextures( 1, &glid );
+
+        texture result = m_textures.create();
+        gl_texture_info* info = m_textures.get( result );
+        info->type = type;
+        info->format = format;
+        info->tsampler = sampler();
+        info->size = ivec3( 1, 1, 1 );
+        info->glid = glid;
+
+        return result;
+}
+
 nv::texture nv::gl_device::create_texture( texture_type type, ivec3 size, image_format aformat, sampler asampler, const void* data /*= nullptr */ )
 {
@@ -234 +260 @@
 nv::buffer nv::gl_device::create_buffer( buffer_type type, buffer_hint hint, size_t size, const void* source /*= nullptr */ )
 {
-        unsigned glid   = 0;
+        unsigned glid = 0;
         unsigned glenum = buffer_type_to_enum( type );
         glGenBuffers( 1, &glid );
 
-        glBindBuffer( glenum, glid );
-        glBufferData( glenum, GLsizeiptr( size ), source, buffer_hint_to_enum( hint ) );
-        glBindBuffer( glenum, 0 );
+        if ( size > 0 )
+        {
+                glBindBuffer( glenum, glid );
+                glBufferData( glenum, GLsizeiptr( size ), source, buffer_hint_to_enum( hint ) );
+                glBindBuffer( glenum, 0 );
+        }
 
         buffer result = m_buffers.create();
@@ -249 +278 @@
         info->glid = glid;
         return result;
+}
+
+void nv::gl_device::create_buffer( buffer b, size_t size, const void* source )
+{
+        gl_buffer_info* info = m_buffers.get( b );
+        if ( info )
+        {
+                unsigned glenum = buffer_type_to_enum( info->type );
+                glBindBuffer( glenum, info->glid );
+                glBufferData( glenum, GLsizeiptr( size ), source, buffer_hint_to_enum( info->hint ) );
+                glBindBuffer( glenum, 0 );
+        }
 }