Changeset 157 for trunk

Timestamp:

07/08/13 19:59:07 (12 years ago)

Author:

epyon

Message:

• context now stores device pointer

Location:

trunk

Files:

• nv/gl/gl_context.hh (modified) (1 diff)
• nv/interface/context.hh (modified) (2 diffs)
• src/gl/gl_context.cc (modified) (1 diff)
• src/gl/gl_window.cc (modified) (1 diff)

trunk/nv/gl/gl_context.hh

@@ -20 +20 @@
         {
         public:
-                gl_context();
+                gl_context( device* a_device );
                 virtual void clear( const clear_state& cs );
                 // temporary

trunk/nv/interface/context.hh

@@ -32 +32 @@
         };
 
+        class device;
         class context
         {
         public:
+                context( device* a_device ) { m_device = a_device; }
                 virtual void clear( const clear_state& cs ) = 0;
                 // temporary
@@ -41 +43 @@
                 virtual const ivec4& get_viewport() = 0;
                 virtual void set_viewport( const ivec4& viewport ) = 0;
+                virtual device* get_device() { return m_device; }
                 virtual ~context() {}
         protected:
+                device*      m_device;
                 clear_state  m_clear_state;
                 render_state m_render_state;

trunk/src/gl/gl_context.cc

@@ -349 +349 @@
 
 
-gl_context::gl_context()
+gl_context::gl_context( device* a_device )
+        : context( a_device )
 {
         // TODO: do we really need this?

trunk/src/gl/gl_window.cc

@@ -167 +167 @@
         NV_LOG( LOG_INFO, "OpenGL GLSL Version : " << glGetString(GL_SHADING_LANGUAGE_VERSION) );
 
-        m_context = new gl_context();
+        m_context = new gl_context( m_device );
         m_context->set_viewport( nv::ivec4( 0, 0, m_width, m_height ) );
 }