Changeset 301 for trunk/src/gui/gui_renderer.cc

Timestamp:

08/07/14 12:11:16 (11 years ago)

Author:

epyon

Message:

• textures are now handled by lightweight handles
• textures now need to be manually released via context
• removed all old texture2d functionality
• unreleased textures will be auto-released
• textures are properly tracked via entity system
• detailed stats and checking now possible

File:

• trunk/src/gui/gui_renderer.cc (modified) (6 diffs)

trunk/src/gui/gui_renderer.cc

@@ -65 +65 @@
 {
 public:
-        screen_render_data( context* ctx, size_t initial_size )
-                : buffer( ctx, nv::DYNAMIC_DRAW, initial_size ), varray( nullptr ), shader(nullptr), texture(nullptr) 
+        screen_render_data( context* actx, size_t initial_size )
+                : buffer( actx, nv::DYNAMIC_DRAW, initial_size ), varray( nullptr ), shader(nullptr)
         {
 
@@ -74 +74 @@
                 delete shader; 
                 delete varray; 
-                delete texture;
         }
 
         nv::sliced_buffer<gui_quad> buffer;
+        nv::texture       tex;
         nv::vertex_array* varray;
         nv::program*      shader;
-        nv::texture2d*    texture;
 };
 
@@ -121 +120 @@
 
         nv::sampler sampler( nv::sampler::LINEAR, nv::sampler::CLAMP_TO_EDGE );
-        sr->texture = m_window->get_device()->create_texture2d( m_atlas.get_size(), nv::RGBA, nv::UBYTE, sampler, nullptr );
+        sr->tex = m_window->get_device()->create_texture( m_atlas.get_size(), image_format( nv::RGBA, nv::UBYTE ), sampler, nullptr );
 
         m_render_state.depth_test.enabled = false;
@@ -262 +261 @@
         if ( m_reupload )
         {
-                m_context->update( sr->texture, (void*)m_atlas.get_data() );
+                m_context->update( sr->tex, (void*)m_atlas.get_data() );
                 m_reupload = false;
         }
@@ -273 +272 @@
                 sr->varray->update_vertex_buffer( nv::slot::COLOR,    vb, false );
         }
-        m_context->bind( sr->texture, TEX_DIFFUSE );
+        m_context->bind( sr->tex, TEX_DIFFUSE );
         m_context->draw( TRIANGLES, m_render_state, m_scene_state, sr->shader, sr->varray, sr->buffer.get_size() * 6 );
 }
@@ -283 +282 @@
                 delete p;
         }
-        delete m_render_data;
-}
+        if ( m_render_data )
+        {
+                m_context->get_device()->release_texture( ((screen_render_data*)m_render_data)->tex );
+                delete m_render_data;
+        }
+}