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

Timestamp:

06/15/16 18:34:37 (9 years ago)

Author:

epyon

Message:

• particle engine updates
• device/context redesign
• caching of GL state - texture bindings and programs
• camera view_perspective and view_perspective_inv

File:

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

trunk/src/gl/gl_device.cc

@@ -94 +94 @@
 }
 
-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_1D_BUFFER && type != TEXTURE_3D && type != TEXTURE_2D_ARRAY, "2D texture type expected!" );
-        unsigned glid = 0;
-        unsigned gl_type = texture_type_to_enum( type );
-        GLenum gl_internal = GLenum( 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;
-
-        glGenTextures( 1, &glid );
-
-        glBindTexture( gl_type, glid );
-
-        // Detect if mipmapping was requested
-//      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!
-//              glTexParameteri( gl_type, GL_GENERATE_MIPMAP, GL_TRUE);
-//      }
-
-        if ( asampler.filter_max != sampler::NEAREST )
-        {
-                asampler.filter_max = sampler::LINEAR;
-        }
-
-        if ( gl_type != GL_TEXTURE_2D_MULTISAMPLE )
-        {
-                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 ) ) );
-        }
-        
-        if ( gl_type != GL_TEXTURE_2D_MULTISAMPLE && 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 )
-        {
-//              glTexParameteri( gl_type, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
-//              glTexParameteri( gl_type, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
-
-                // This is to allow usage of shadow2DProj function in the shader
-                glTexParameteri( gl_type, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_REF_TO_TEXTURE );
-                glTexParameteri( gl_type, GL_TEXTURE_COMPARE_FUNC, GL_LEQUAL );
-        }
-
-// #define GL_TEXTURE_MAX_ANISOTROPY_EXT 0x84FE
-// #define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF
-// 
-//      float aniso = 0.0f;
-//      glGetFloatv( GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &aniso );
-//      NV_LOG_INFO( "Anisotropy at ", aniso, " (", int( aniso ), " ) " );
-//      glTexParameterf( GL_TEXTURE_2D, GL_TEXTURE_MAX_ANISOTROPY_EXT, aniso );
-
-        if ( gl_type != GL_TEXTURE_2D_MULTISAMPLE )
-                glTexImage2D( gl_type, 0, gl_internal, size.x, size.y, 0, gl_enum, nv::datatype_to_gl_enum(aformat.type), data );
-        else
-                glTexImage2DMultisample( gl_type, 4, gl_internal, size.x, size.y, 1 );
-
-        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!
-                glGenerateMipmap( gl_type );
-        }
-
-
-        glBindTexture( gl_type, 0 );
-
-        texture result = m_textures.create();
-        gl_texture_info* info = m_textures.get( result );
-        info->type     = type;
-        info->format   = aformat;
-        info->tsampler = asampler;
-        info->size     = ivec3( size.x, size.y, 1 );
-        info->glid     = glid;
-        return result;
-}
-
-
 nv::texture nv::gl_device::create_texture( texture_type type, pixel_format format )
 {
-        NV_ASSERT_ALWAYS( type == TEXTURE_1D_BUFFER, "create_texture not texture buffer!" );
         unsigned glid = 0;
 
@@ -193 +111 @@
 }
 
-nv::texture nv::gl_device::create_texture( texture_type type, ivec3 size, image_format aformat, sampler asampler, const void* data /*= nullptr */ )
-{
-        NV_ASSERT_ALWAYS( type == TEXTURE_3D || type == TEXTURE_2D_ARRAY, "3D texture type expected!" );
-        unsigned glid = 0;
-        unsigned gl_type = texture_type_to_enum( type );
-
-        bool is_depth = aformat.format == DEPTH16 || aformat.format == DEPTH24 || aformat.format == DEPTH32;
-
-        glGenTextures( 1, &glid );
-        glBindTexture( gl_type, glid );
-
-        if ( asampler.filter_max != sampler::NEAREST )
-        {
-                asampler.filter_max = sampler::LINEAR;
-        }
-
-        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 ( is_depth )
-        {
-                glTexParameteri( gl_type, GL_TEXTURE_MIN_FILTER, GL_LINEAR );
-                glTexParameteri( gl_type, GL_TEXTURE_MAG_FILTER, GL_LINEAR );
-
-                // This is to allow usage of shadow2DProj function in the shader
-                glTexParameteri( gl_type, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_REF_TO_TEXTURE );
-                glTexParameteri( gl_type, GL_TEXTURE_COMPARE_FUNC, GL_LEQUAL );
-        }
-
-        //glTexStorage3D( GL_TEXTURE_2D_ARRAY, mipLevelCount, GL_RGBA8, width, height, layerCount );
-        glTexImage3D( gl_type, 0, GLint( nv::image_format_to_internal_enum( aformat.format ) ), size.x, size.y, size.z, 0, nv::image_format_to_enum( aformat.format ), nv::datatype_to_gl_enum( aformat.type ), data );
-        glBindTexture( gl_type, 0 );
-
-        texture result = m_textures.create();
-        gl_texture_info* info = m_textures.get( result );
-        info->type = type;
-        info->format = aformat;
-        info->tsampler = asampler;
-        info->size = size;
-        info->glid = glid;
-        return result;
-}
-
-
-
 void nv::gl_device::release( texture t )
 {
@@ -271 +142 @@
 }
 
-nv::buffer nv::gl_device::create_buffer( buffer_type type, buffer_hint hint, size_t size, const void* source /*= nullptr */ )
+nv::buffer nv::gl_device::create_buffer( buffer_type type, buffer_hint hint )
 {
         unsigned glid = 0;
         unsigned glenum = buffer_type_to_enum( type );
         glGenBuffers( 1, &glid );
-
-        if ( size > 0 )
-        {
-                glBindBuffer( glenum, glid );
-                glBufferData( glenum, GLsizeiptr( size ), source, buffer_hint_to_enum( hint ) );
-                glBindBuffer( glenum, 0 );
-        }
 
         buffer result = m_buffers.create();
@@ -288 +152 @@
         info->type = type;
         info->hint = hint;
-        info->size = size;
+        info->size = 0;
         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 );
-        }
 }
 
@@ -330 +182 @@
                 m_programs.destroy( p );
         }
+}
+
+nv::gl_texture_info* nv::gl_device::get_full_texture_info( texture t )
+{
+        return m_textures.get( t );
+
+}
+
+nv::gl_buffer_info* nv::gl_device::get_full_buffer_info( buffer t )
+{
+        return m_buffers.get( t );
 }