X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f48d169c4a57bd4ac2f44e42b9fd26a930bbdca0..f0f4301209cc58eb5562be289f49bf0fb9e7d6b8:/src/msw/glcanvas.cpp diff --git a/src/msw/glcanvas.cpp b/src/msw/glcanvas.cpp index 360e36c876..c5a0523d00 100644 --- a/src/msw/glcanvas.cpp +++ b/src/msw/glcanvas.cpp @@ -1,15 +1,15 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: glcanvas.cpp +// Name: src/msw/glcanvas.cpp // Purpose: wxGLCanvas, for using OpenGL with wxWindows under MS Windows // Author: Julian Smart // Modified by: // Created: 04/01/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "glcanvas.h" #endif @@ -19,21 +19,49 @@ #pragma hdrstop #endif -#include - #if wxUSE_GLCANVAS #ifndef WX_PRECOMP -#include + #include "wx/frame.h" + #include "wx/settings.h" + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/app.h" #endif -#include -#include -#include +#include "wx/msw/private.h" + +// DLL options compatibility check: +#include "wx/build.h" +WX_CHECK_BUILD_OPTIONS("wxGL") + +#include "wx/glcanvas.h" -#include +/* + The following two compiler directives are specific to the Microsoft Visual + C++ family of compilers + + Fundementally what they do is instruct the linker to use these two libraries + for the resolution of symbols. In essence, this is the equivalent of adding + these two libraries to either the Makefile or project file. + + This is NOT a recommended technique, and certainly is unlikely to be used + anywhere else in wxWindows given it is so specific to not only wxMSW, but + also the VC compiler. However, in the case of opengl support, it's an + applicable technique as opengl is optional in setup.h This code (wrapped by + wxUSE_GLCANVAS), now allows opengl support to be added purely by modifying + setup.h rather than by having to modify either the project or DSP fle. + + See MSDN for further information on the exact usage of these commands. +*/ +#ifdef _MSC_VER +# pragma comment( lib, "opengl32" ) +# pragma comment( lib, "glu32" ) +#endif -wxChar wxGLCanvasClassName[] = wxT("wxGLCanvasClass"); + +static const wxChar *wxGLCanvasClassName = wxT("wxGLCanvasClass"); +static const wxChar *wxGLCanvasClassNameNoRedraw = wxT("wxGLCanvasClassNR"); LRESULT WXDLLEXPORT APIENTRY _EXPORT wxWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam); @@ -42,7 +70,7 @@ LRESULT WXDLLEXPORT APIENTRY _EXPORT wxWndProc(HWND hWnd, UINT message, * GLContext implementation */ -wxGLContext::wxGLContext(bool isRGB, wxGLCanvas *win, const wxPalette& palette) +wxGLContext::wxGLContext(bool WXUNUSED(isRGB), wxGLCanvas *win, const wxPalette& WXUNUSED(palette)) { m_window = win; @@ -55,8 +83,8 @@ wxGLContext::wxGLContext(bool isRGB, wxGLCanvas *win, const wxPalette& palette) } wxGLContext::wxGLContext( - bool isRGB, wxGLCanvas *win, - const wxPalette& palette, + bool WXUNUSED(isRGB), wxGLCanvas *win, + const wxPalette& WXUNUSED(palette), const wxGLContext *other /* for sharing display lists */ ) { @@ -104,19 +132,16 @@ void wxGLContext::SetCurrent() */ } -void wxGLContext::SetColour(const char *colour) +void wxGLContext::SetColour(const wxChar *colour) { - float r = 0.0; - float g = 0.0; - float b = 0.0; - wxColour *col = wxTheColourDatabase->FindColour(colour); - if (col) - { - r = (float)(col->Red()/256.0); - g = (float)(col->Green()/256.0); - b = (float)(col->Blue()/256.0); - glColor3f( r, g, b); - } + wxColour col = wxTheColourDatabase->Find(colour); + if (col.Ok()) + { + float r = (float)(col.Red()/256.0); + float g = (float)(col.Green()/256.0); + float b = (float)(col.Blue()/256.0); + glColor3f( r, g, b); + } } @@ -124,9 +149,9 @@ void wxGLContext::SetColour(const char *colour) * wxGLCanvas implementation */ -IMPLEMENT_CLASS(wxGLCanvas, wxScrolledWindow) +IMPLEMENT_CLASS(wxGLCanvas, wxWindow) -BEGIN_EVENT_TABLE(wxGLCanvas, wxScrolledWindow) +BEGIN_EVENT_TABLE(wxGLCanvas, wxWindow) EVT_SIZE(wxGLCanvas::OnSize) EVT_PALETTE_CHANGED(wxGLCanvas::OnPaletteChanged) EVT_QUERY_NEW_PALETTE(wxGLCanvas::OnQueryNewPalette) @@ -134,7 +159,7 @@ END_EVENT_TABLE() wxGLCanvas::wxGLCanvas(wxWindow *parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name, - int *attribList, const wxPalette& palette) : wxScrolledWindow() + int *attribList, const wxPalette& palette) : wxWindow() { m_glContext = (wxGLContext*) NULL; @@ -142,8 +167,8 @@ wxGLCanvas::wxGLCanvas(wxWindow *parent, wxWindowID id, if ( ret ) { - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); - SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT)); + SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); + SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); } m_hDC = (WXHDC) ::GetDC((HWND) GetHWND()); @@ -158,7 +183,7 @@ wxGLCanvas::wxGLCanvas( wxWindow *parent, const wxGLContext *shared, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name, int *attribList, const wxPalette& palette ) - : wxScrolledWindow() + : wxWindow() { m_glContext = (wxGLContext*) NULL; @@ -166,8 +191,8 @@ wxGLCanvas::wxGLCanvas( wxWindow *parent, if ( ret ) { - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); - SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT)); + SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); + SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); } m_hDC = (WXHDC) ::GetDC((HWND) GetHWND()); @@ -183,7 +208,7 @@ wxGLCanvas::wxGLCanvas( wxWindow *parent, wxGLCanvas::wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name, int *attribList, const wxPalette& palette ): - wxScrolledWindow() + wxWindow() { m_glContext = (wxGLContext*) NULL; @@ -191,8 +216,8 @@ wxGLCanvas::wxGLCanvas( wxWindow *parent, const wxGLCanvas *shared, wxWindowID i if ( ret ) { - SetBackgroundColour(wxSystemSettings::GetSystemColour(wxSYS_COLOUR_3DFACE)); - SetFont(wxSystemSettings::GetSystemFont(wxSYS_DEFAULT_GUI_FONT)); + SetBackgroundColour(wxSystemSettings::GetColour(wxSYS_COLOUR_3DFACE)); + SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT)); } m_hDC = (WXHDC) ::GetDC((HWND) GetHWND()); @@ -213,25 +238,16 @@ wxGLCanvas::~wxGLCanvas() ::ReleaseDC((HWND) GetHWND(), (HDC) m_hDC); } -// Replaces wxWindow::Create functionality, since we need to use a different window class -bool wxGLCanvas::Create(wxWindow *parent, wxWindowID id, - const wxPoint& pos, const wxSize& size, long style, const wxString& name) +// Replaces wxWindow::Create functionality, since we need to use a different +// window class +bool wxGLCanvas::Create(wxWindow *parent, + wxWindowID id, + const wxPoint& pos, + const wxSize& size, + long style, + const wxString& name) { - /* - Suggestion from Kelly Brock (not yet implemented): - - OpenGL corruption fix is simple assuming it doesn't screw anything else - up. Add the following line to the top of the create function: - - wxSize parentSize = GetClientSize(); - - All locations within the function that use 'size' are changed to - 'parentSize'. - The above corrects the initial display corruption with the GeForce and - TNT2, not sure about other NVidia cards yet. - */ - - static bool registeredGLCanvasClass = FALSE; + static bool s_registeredGLCanvasClass = FALSE; // We have to register a special window class because we need // the CS_OWNDC style for GLCanvas. @@ -253,12 +269,10 @@ bool wxGLCanvas::Create(wxWindow *parent, wxWindowID id, only way to prevent this, the only reliable means, is to set CS_OWNDC." */ - if (!registeredGLCanvasClass) + if (!s_registeredGLCanvasClass) { WNDCLASS wndclass; - static const long styleNormal = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS | CS_OWNDC; - // the fields which are common to all classes wndclass.lpfnWndProc = (WNDPROC)wxWndProc; wndclass.cbClsExtra = 0; @@ -271,15 +285,29 @@ bool wxGLCanvas::Create(wxWindow *parent, wxWindowID id, // Register the GLCanvas class name wndclass.hbrBackground = (HBRUSH)NULL; wndclass.lpszClassName = wxGLCanvasClassName; - wndclass.style = styleNormal; + wndclass.style = CS_HREDRAW | CS_VREDRAW | CS_DBLCLKS | CS_OWNDC; - if ( !RegisterClass(&wndclass) ) + if ( !::RegisterClass(&wndclass) ) { wxLogLastError(wxT("RegisterClass(wxGLCanvasClass)")); return FALSE; } - registeredGLCanvasClass = TRUE; + // Register the GLCanvas class name for windows which don't do full repaint + // on resize + wndclass.lpszClassName = wxGLCanvasClassNameNoRedraw; + wndclass.style &= ~(CS_HREDRAW | CS_VREDRAW); + + if ( !::RegisterClass(&wndclass) ) + { + wxLogLastError(wxT("RegisterClass(wxGLCanvasClassNameNoRedraw)")); + + ::UnregisterClass(wxGLCanvasClassName, wxhInstance); + + return FALSE; + } + + s_registeredGLCanvasClass = TRUE; } wxCHECK_MSG( parent, FALSE, wxT("can't create wxWindow without parent") ); @@ -290,10 +318,6 @@ bool wxGLCanvas::Create(wxWindow *parent, wxWindowID id, parent->AddChild(this); DWORD msflags = 0; - if ( style & wxBORDER ) - msflags |= WS_BORDER; - if ( style & wxTHICK_FRAME ) - msflags |= WS_THICKFRAME; /* A general rule with OpenGL and Win32 is that any window that will have a @@ -302,68 +326,21 @@ bool wxGLCanvas::Create(wxWindow *parent, wxWindowID id, books that contain the wgl function descriptions. */ - msflags |= WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS; - // if ( style & wxCLIP_CHILDREN ) - // msflags |= WS_CLIPCHILDREN; - msflags |= WS_CLIPCHILDREN; - - bool want3D; - WXDWORD exStyle = Determine3DEffects(WS_EX_CLIENTEDGE, &want3D); - - // Even with extended styles, need to combine with WS_BORDER - // for them to look right. - if ( want3D || (m_windowStyle & wxSIMPLE_BORDER) || (m_windowStyle & wxRAISED_BORDER ) || - (m_windowStyle & wxSUNKEN_BORDER) || (m_windowStyle & wxDOUBLE_BORDER)) - { - msflags |= WS_BORDER; - } + WXDWORD exStyle = 0; + msflags |= WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN; + msflags |= MSWGetStyle(style, & exStyle) ; - // calculate the value to return from WM_GETDLGCODE handler - if ( GetWindowStyleFlag() & wxWANTS_CHARS ) - { - // want everything: i.e. all keys and WM_CHAR message - m_lDlgCode = DLGC_WANTARROWS | DLGC_WANTCHARS | - DLGC_WANTTAB | DLGC_WANTMESSAGE; - } - - MSWCreate(m_windowId, parent, wxGLCanvasClassName, this, NULL, - pos.x, pos.y, - WidthDefault(size.x), HeightDefault(size.y), - msflags, NULL, exStyle); - - return TRUE; + return MSWCreate(wxGLCanvasClassName, NULL, pos, size, msflags, exStyle); } -void wxGLCanvas::SetupPixelFormat(int *attribList) // (HDC hDC) +static void AdjustPFDForAttributes(PIXELFORMATDESCRIPTOR& pfd, int *attribList) { - int pixelFormat; - PIXELFORMATDESCRIPTOR pfd = { - sizeof(PIXELFORMATDESCRIPTOR), /* size */ - 1, /* version */ - PFD_SUPPORT_OPENGL | - PFD_DRAW_TO_WINDOW | - PFD_DOUBLEBUFFER, /* support double-buffering */ - PFD_TYPE_RGBA, /* color type */ - 16, /* prefered color depth */ - 0, 0, 0, 0, 0, 0, /* color bits (ignored) */ - 0, /* no alpha buffer */ - 0, /* alpha bits (ignored) */ - 0, /* no accumulation buffer */ - 0, 0, 0, 0, /* accum bits (ignored) */ - 16, /* depth buffer */ - 0, /* no stencil buffer */ - 0, /* no auxiliary buffers */ - PFD_MAIN_PLANE, /* main layer */ - 0, /* reserved */ - 0, 0, 0, /* no layer, visible, damage masks */ - }; - if (attribList) { pfd.dwFlags &= ~PFD_DOUBLEBUFFER; pfd.iPixelType = PFD_TYPE_COLORINDEX; pfd.cColorBits = 0; int arg=0; - + while( (attribList[arg]!=0) ) { switch( attribList[arg++] ) @@ -377,11 +354,11 @@ void wxGLCanvas::SetupPixelFormat(int *attribList) // (HDC hDC) case WX_GL_LEVEL: // this member looks like it may be obsolete if (attribList[arg] > 0) { - pfd.iLayerType = PFD_OVERLAY_PLANE; + pfd.iLayerType = (BYTE)PFD_OVERLAY_PLANE; } else if (attribList[arg] < 0) { - pfd.iLayerType = PFD_UNDERLAY_PLANE; + pfd.iLayerType = (BYTE)PFD_UNDERLAY_PLANE; } else { - pfd.iLayerType = PFD_MAIN_PLANE; + pfd.iLayerType = (BYTE)PFD_MAIN_PLANE; } arg++; break; @@ -407,10 +384,10 @@ void wxGLCanvas::SetupPixelFormat(int *attribList) // (HDC hDC) // doesn't count in cColorBits pfd.cAlphaBits = attribList[arg++]; break; - case WX_GL_DEPTH_SIZE: + case WX_GL_DEPTH_SIZE: pfd.cDepthBits = attribList[arg++]; break; - case WX_GL_STENCIL_SIZE: + case WX_GL_STENCIL_SIZE: pfd.cStencilBits = attribList[arg++]; break; case WX_GL_MIN_ACCUM_RED: @@ -430,17 +407,41 @@ void wxGLCanvas::SetupPixelFormat(int *attribList) // (HDC hDC) } } } - pixelFormat = ChoosePixelFormat((HDC) m_hDC, &pfd); +} + +void wxGLCanvas::SetupPixelFormat(int *attribList) // (HDC hDC) +{ + PIXELFORMATDESCRIPTOR pfd = { + sizeof(PIXELFORMATDESCRIPTOR), /* size */ + 1, /* version */ + PFD_SUPPORT_OPENGL | + PFD_DRAW_TO_WINDOW | + PFD_DOUBLEBUFFER, /* support double-buffering */ + PFD_TYPE_RGBA, /* color type */ + 16, /* prefered color depth */ + 0, 0, 0, 0, 0, 0, /* color bits (ignored) */ + 0, /* no alpha buffer */ + 0, /* alpha bits (ignored) */ + 0, /* no accumulation buffer */ + 0, 0, 0, 0, /* accum bits (ignored) */ + 16, /* depth buffer */ + 0, /* no stencil buffer */ + 0, /* no auxiliary buffers */ + PFD_MAIN_PLANE, /* main layer */ + 0, /* reserved */ + 0, 0, 0, /* no layer, visible, damage masks */ + }; + + AdjustPFDForAttributes(pfd, attribList); + + int pixelFormat = ChoosePixelFormat((HDC) m_hDC, &pfd); if (pixelFormat == 0) { - MessageBox(WindowFromDC((HDC) m_hDC), wxT("ChoosePixelFormat failed."), wxT("Error"), - MB_ICONERROR | MB_OK); - exit(1); + wxLogLastError(_T("ChoosePixelFormat")); } - - if (SetPixelFormat((HDC) m_hDC, pixelFormat, &pfd) != TRUE) { - MessageBox(WindowFromDC((HDC) m_hDC), wxT("SetPixelFormat failed."), wxT("Error"), - MB_ICONERROR | MB_OK); - exit(1); + else { + if ( !::SetPixelFormat((HDC) m_hDC, pixelFormat, &pfd) ) { + wxLogLastError(_T("SetPixelFormat")); + } } } @@ -456,7 +457,7 @@ void wxGLCanvas::SetupPalette(const wxPalette& palette) } else { - return; + return; } m_palette = palette; @@ -490,20 +491,20 @@ wxPalette wxGLCanvas::CreateDefaultPalette() /* build a simple RGB color palette */ { - int redMask = (1 << pfd.cRedBits) - 1; - int greenMask = (1 << pfd.cGreenBits) - 1; - int blueMask = (1 << pfd.cBlueBits) - 1; - int i; - - for (i=0; ipalPalEntry[i].peRed = - (((i >> pfd.cRedShift) & redMask) * 255) / redMask; - pPal->palPalEntry[i].peGreen = - (((i >> pfd.cGreenShift) & greenMask) * 255) / greenMask; - pPal->palPalEntry[i].peBlue = - (((i >> pfd.cBlueShift) & blueMask) * 255) / blueMask; - pPal->palPalEntry[i].peFlags = 0; - } + int redMask = (1 << pfd.cRedBits) - 1; + int greenMask = (1 << pfd.cGreenBits) - 1; + int blueMask = (1 << pfd.cBlueBits) - 1; + int i; + + for (i=0; ipalPalEntry[i].peRed = + (((i >> pfd.cRedShift) & redMask) * 255) / redMask; + pPal->palPalEntry[i].peGreen = + (((i >> pfd.cGreenShift) & greenMask) * 255) / greenMask; + pPal->palPalEntry[i].peBlue = + (((i >> pfd.cBlueShift) & blueMask) * 255) / blueMask; + pPal->palPalEntry[i].peFlags = 0; + } } HPALETTE hPalette = CreatePalette(pPal); @@ -521,21 +522,8 @@ void wxGLCanvas::SwapBuffers() m_glContext->SwapBuffers(); } -void wxGLCanvas::OnSize(wxSizeEvent& event) +void wxGLCanvas::OnSize(wxSizeEvent& WXUNUSED(event)) { - int width, height; - GetClientSize(& width, & height); - - if (m_glContext) - { - m_glContext->SetCurrent(); - - glViewport(0, 0, (GLint)width, (GLint)height); - glMatrixMode(GL_PROJECTION); - glLoadIdentity(); - glFrustum( -1.0, 1.0, -1.0, 1.0, 5.0, 15.0 ); - glMatrixMode(GL_MODELVIEW); - } } void wxGLCanvas::SetCurrent() @@ -546,7 +534,7 @@ void wxGLCanvas::SetCurrent() } } -void wxGLCanvas::SetColour(const char *colour) +void wxGLCanvas::SetColour(const wxChar *colour) { if (m_glContext) m_glContext->SetColour(colour); @@ -585,11 +573,11 @@ void wxGLCanvas::OnPaletteChanged(wxPaletteChangedEvent& event) /* Give extensions proper function names. */ /* EXT_vertex_array */ -void glArrayElementEXT(GLint i) +void glArrayElementEXT(GLint WXUNUSED(i)) { } -void glColorPointerEXT(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer) +void glColorPointerEXT(GLint WXUNUSED(size), GLenum WXUNUSED(type), GLsizei WXUNUSED(stride), GLsizei WXUNUSED(count), const GLvoid *WXUNUSED(pointer)) { } @@ -608,15 +596,15 @@ void glDrawArraysEXT(GLenum mode, GLint first, GLsizei count) #endif } -void glEdgeFlagPointerEXT(GLsizei stride, GLsizei count, const GLboolean *pointer) +void glEdgeFlagPointerEXT(GLsizei WXUNUSED(stride), GLsizei WXUNUSED(count), const GLboolean *WXUNUSED(pointer)) { } -void glGetPointervEXT(GLenum pname, GLvoid* *params) +void glGetPointervEXT(GLenum WXUNUSED(pname), GLvoid* *WXUNUSED(params)) { } -void glIndexPointerEXT(GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer) +void glIndexPointerEXT(GLenum WXUNUSED(type), GLsizei WXUNUSED(stride), GLsizei WXUNUSED(count), const GLvoid *WXUNUSED(pointer)) { } @@ -635,7 +623,7 @@ void glNormalPointerEXT(GLenum type, GLsizei stride, GLsizei count, const GLvoid #endif } -void glTexCoordPointerEXT(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer) +void glTexCoordPointerEXT(GLint WXUNUSED(size), GLenum WXUNUSED(type), GLsizei WXUNUSED(stride), GLsizei WXUNUSED(count), const GLvoid *WXUNUSED(pointer)) { } @@ -654,33 +642,33 @@ void glVertexPointerEXT(GLint size, GLenum type, GLsizei stride, GLsizei count, } /* EXT_color_subtable */ -void glColorSubtableEXT(GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *table) +void glColorSubtableEXT(GLenum WXUNUSED(target), GLsizei WXUNUSED(start), GLsizei WXUNUSED(count), GLenum WXUNUSED(format), GLenum WXUNUSED(type), const GLvoid *WXUNUSED(table)) { } /* EXT_color_table */ -void glColorTableEXT(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table) +void glColorTableEXT(GLenum WXUNUSED(target), GLenum WXUNUSED(internalformat), GLsizei WXUNUSED(width), GLenum WXUNUSED(format), GLenum WXUNUSED(type), const GLvoid *WXUNUSED(table)) { } -void glCopyColorTableEXT(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width) +void glCopyColorTableEXT(GLenum WXUNUSED(target), GLenum WXUNUSED(internalformat), GLint WXUNUSED(x), GLint WXUNUSED(y), GLsizei WXUNUSED(width)) { } -void glGetColorTableEXT(GLenum target, GLenum format, GLenum type, GLvoid *table) +void glGetColorTableEXT(GLenum WXUNUSED(target), GLenum WXUNUSED(format), GLenum WXUNUSED(type), GLvoid *WXUNUSED(table)) { } -void glGetColorTableParamaterfvEXT(GLenum target, GLenum pname, GLfloat *params) +void glGetColorTableParamaterfvEXT(GLenum WXUNUSED(target), GLenum WXUNUSED(pname), GLfloat *WXUNUSED(params)) { } -void glGetColorTavleParameterivEXT(GLenum target, GLenum pname, GLint *params) +void glGetColorTavleParameterivEXT(GLenum WXUNUSED(target), GLenum WXUNUSED(pname), GLint *WXUNUSED(params)) { } /* SGI_compiled_vertex_array */ -void glLockArraysSGI(GLint first, GLsizei count) +void glLockArraysSGI(GLint WXUNUSED(first), GLsizei WXUNUSED(count)) { } @@ -690,26 +678,74 @@ void glUnlockArraysSGI() /* SGI_cull_vertex */ -void glCullParameterdvSGI(GLenum pname, GLdouble* params) +void glCullParameterdvSGI(GLenum WXUNUSED(pname), GLdouble* WXUNUSED(params)) { } -void glCullParameterfvSGI(GLenum pname, GLfloat* params) +void glCullParameterfvSGI(GLenum WXUNUSED(pname), GLfloat* WXUNUSED(params)) { } /* SGI_index_func */ -void glIndexFuncSGI(GLenum func, GLclampf ref) +void glIndexFuncSGI(GLenum WXUNUSED(func), GLclampf WXUNUSED(ref)) { } /* SGI_index_material */ -void glIndexMaterialSGI(GLenum face, GLenum mode) +void glIndexMaterialSGI(GLenum WXUNUSED(face), GLenum WXUNUSED(mode)) { } /* WIN_swap_hint */ -void glAddSwapHintRectWin(GLint x, GLint y, GLsizei width, GLsizei height) +void glAddSwapHintRectWin(GLint WXUNUSED(x), GLint WXUNUSED(y), GLsizei WXUNUSED(width), GLsizei WXUNUSED(height)) +{ +} + + +//--------------------------------------------------------------------------- +// wxGLApp +//--------------------------------------------------------------------------- + +IMPLEMENT_CLASS(wxGLApp, wxApp) + +bool wxGLApp::InitGLVisual(int *attribList) +{ + int pixelFormat; + PIXELFORMATDESCRIPTOR pfd = { + sizeof(PIXELFORMATDESCRIPTOR), /* size */ + 1, /* version */ + PFD_SUPPORT_OPENGL | + PFD_DRAW_TO_WINDOW | + PFD_DOUBLEBUFFER, /* support double-buffering */ + PFD_TYPE_RGBA, /* color type */ + 16, /* prefered color depth */ + 0, 0, 0, 0, 0, 0, /* color bits (ignored) */ + 0, /* no alpha buffer */ + 0, /* alpha bits (ignored) */ + 0, /* no accumulation buffer */ + 0, 0, 0, 0, /* accum bits (ignored) */ + 16, /* depth buffer */ + 0, /* no stencil buffer */ + 0, /* no auxiliary buffers */ + PFD_MAIN_PLANE, /* main layer */ + 0, /* reserved */ + 0, 0, 0, /* no layer, visible, damage masks */ + }; + + AdjustPFDForAttributes(pfd, attribList); + + // use DC for whole (root) screen, since no windows have yet been created + pixelFormat = ChoosePixelFormat(ScreenHDC(), &pfd); + + if (pixelFormat == 0) { + wxLogError(_("Failed to initialize OpenGL")); + return FALSE; + } + + return TRUE; +} + +wxGLApp::~wxGLApp() { }