Changeset 326 for trunk/src/gl/gl_context.cc

Timestamp:

08/26/14 18:39:10 (11 years ago)

Author:

epyon

Message:

• window_manager interface added
• input interface added
• sdl::window_manager and sdl::input added
• gl_device/gl_window/gl_context made oblivious to sdl
• currently some setup is required, application class needed

File:

• trunk/src/gl/gl_context.cc (modified) (3 diffs)

trunk/src/gl/gl_context.cc

@@ -7 +7 @@
 #include "nv/gl/gl_enum.hh"
 #include "nv/lib/gl.hh"
-#include "nv/lib/sdl.hh"
 #include "nv/gl/gl_device.hh"
 
@@ -577 +576 @@
 
 
-gl_context::gl_context( device* a_device )
-        : context( a_device )
-{
+gl_context::gl_context( device* a_device, void* a_handle )
+        : context( a_device ), m_handle( a_handle )
+{
+        force_apply_render_state( m_render_state );
 }
 
@@ -623 +623 @@
         }
 }
-
-nv::sdl_gl_context::sdl_gl_context( device* a_device, void* a_sdl_win_handle )
-        : gl_context( a_device ), m_handle( nullptr )
-{
-#if NV_SDL_VERSION == NV_SDL_20
-        m_handle = SDL_GL_CreateContext( static_cast<SDL_Window*>( a_sdl_win_handle ) );
-
-        if ( m_handle == 0 )
-        {
-                NV_LOG( LOG_CRITICAL, "GL Context creation failed: " << SDL_GetError( ) );
-                return; // TODO: Error report
-        }
-#else
-        NV_UNUSED( a_win_handle );
-        NV_UNUSED( m_handle );
-#endif
-
-        nv::load_gl_library();
-        NV_LOG( LOG_INFO, "OpenGL Vendor       : " << glGetString(GL_VENDOR) );
-        NV_LOG( LOG_INFO, "OpenGL Renderer     : " << glGetString(GL_RENDERER) );
-        NV_LOG( LOG_INFO, "OpenGL Version      : " << glGetString(GL_VERSION) );
-        NV_LOG( LOG_INFO, "OpenGL GLSL Version : " << glGetString(GL_SHADING_LANGUAGE_VERSION) );
-#if NV_SDL_VERSION == NV_SDL_20
-        //      SDL_GL_SetSwapInterval(1);
-#endif
-
-        // TODO: do we really need this?
-        glPixelStorei( GL_UNPACK_ALIGNMENT, 1 );
-
-        force_apply_render_state( m_render_state );
-}
-
-nv::sdl_gl_context::~sdl_gl_context()
-{
-#if NV_SDL_VERSION == NV_SDL_20
-        SDL_GL_DeleteContext(static_cast<SDL_GLContext>( m_handle ) );
-#endif
-}
-
-nv::native_gl_context::native_gl_context( device* a_device, void* a_native_win_handle )
-        : gl_context( a_device ), m_handle( nullptr )
-{
-#if NV_PLATFORM == NV_WINDOWS
-
-// TODO: error checking
-        HDC hdc = (HDC)a_native_win_handle;
-
-        const int wgl_attrib_list[] =
-        {
-                WGL_DRAW_TO_WINDOW_ARB, GL_TRUE,
-                WGL_SUPPORT_OPENGL_ARB, GL_TRUE,
-                WGL_ACCELERATION_ARB,   WGL_FULL_ACCELERATION_ARB,
-                WGL_DOUBLE_BUFFER_ARB,  GL_TRUE,
-                WGL_PIXEL_TYPE_ARB,     WGL_TYPE_RGBA_ARB,
-                WGL_COLOR_BITS_ARB,     32,
-                WGL_DEPTH_BITS_ARB,     24,
-                WGL_STENCIL_BITS_ARB,   8,
-                0, 0  //End
-        };
-
-        unsigned int num_formats;
-        int pixel_format;
-        PIXELFORMATDESCRIPTOR pfd;
-
-        if ( FALSE == wglChoosePixelFormatARB(hdc, wgl_attrib_list, NULL, 1, &pixel_format, &num_formats) )
-        {
-                return;
-        }
-
-        if ( FALSE == SetPixelFormat(hdc, pixel_format, &pfd) )
-        {
-                //int err = GetLastError();
-                return;
-        }
-
-        int attribs[] =
-        {
-                WGL_CONTEXT_MAJOR_VERSION_ARB,   2,
-                WGL_CONTEXT_MINOR_VERSION_ARB,   1,
-                WGL_CONTEXT_PROFILE_MASK_ARB,  WGL_CONTEXT_CORE_PROFILE_BIT_ARB, 
-                //WGL_CONTEXT_PROFILE_MASK_ARB, WGL_CONTEXT_COMPATIBILITY_PROFILE_BIT_ARB,
-                0, 0  //End
-        };
-
-        HGLRC handle;
-        if ( 0 == (handle = wglCreateContextAttribsARB(hdc, 0, attribs) ) )
-        {
-                return;
-        }
-
-        if ( FALSE == dynwglMakeCurrent( hdc, handle ) )
-        {
-                return;
-        }     
-
-        load_gl_library( NV_GL_PATH, true );
-        load_wgl_library( NV_GL_PATH, true );
-        m_handle = (void*)handle;
-#else
-        NV_ASSERT( false, "Native GL context not implemented for this platform!" );
-#endif
-        force_apply_render_state( m_render_state );
-}
-
-nv::native_gl_context::~native_gl_context()
-{
-#if NV_PLATFORM == NV_WINDOWS
-        dynwglDeleteContext( (HGLRC)m_handle );
-#endif
-}