Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Quiet cooperation between MSW and wxGL.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29877 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2004-10-15 15:29:31 +00:00
parent 414dfb5804
commit b8ee9a863c
1 changed files with 34 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
src/msw/glcanvas.cpp
View File

@@ -39,6 +39,12 @@ WX_CHECK_BUILD_OPTIONS("wxGL")
#include "wx/glcanvas.h" #include "wx/glcanvas.h"
#if GL_EXT_vertex_array
#define WXUNUSED_WITHOUT_GL_EXT_vertex_array(name) name
#else
#define WXUNUSED_WITHOUT_GL_EXT_vertex_array(name) WXUNUSED(name)
#endif
/* /*
The following two compiler directives are specific to the Microsoft Visual The following two compiler directives are specific to the Microsoft Visual
C++ family of compilers C++ family of compilers
@@ -401,7 +407,7 @@ static void AdjustPFDForAttributes(PIXELFORMATDESCRIPTOR& pfd, int *attribList)
pfd.iPixelType = PFD_TYPE_RGBA; pfd.iPixelType = PFD_TYPE_RGBA;
break; break;
case WX_GL_BUFFER_SIZE: case WX_GL_BUFFER_SIZE:
pfd.cColorBits = attribList[arg++]; pfd.cColorBits = (BYTE)attribList[arg++];
break; break;
case WX_GL_LEVEL: case WX_GL_LEVEL:
// this member looks like it may be obsolete // this member looks like it may be obsolete
@@ -421,38 +427,38 @@ static void AdjustPFDForAttributes(PIXELFORMATDESCRIPTOR& pfd, int *attribList)
pfd.dwFlags |= PFD_STEREO; pfd.dwFlags |= PFD_STEREO;
break; break;
case WX_GL_AUX_BUFFERS: case WX_GL_AUX_BUFFERS:
pfd.cAuxBuffers = attribList[arg++]; pfd.cAuxBuffers = (BYTE)attribList[arg++];
break; break;
case WX_GL_MIN_RED: case WX_GL_MIN_RED:
pfd.cColorBits += (pfd.cRedBits = attribList[arg++]); pfd.cColorBits = (BYTE)(pfd.cColorBits + (pfd.cRedBits = (BYTE)attribList[arg++]));
break; break;
case WX_GL_MIN_GREEN: case WX_GL_MIN_GREEN:
pfd.cColorBits += (pfd.cGreenBits = attribList[arg++]); pfd.cColorBits = (BYTE)(pfd.cColorBits + (pfd.cGreenBits = (BYTE)attribList[arg++]));
break; break;
case WX_GL_MIN_BLUE: case WX_GL_MIN_BLUE:
pfd.cColorBits += (pfd.cBlueBits = attribList[arg++]); pfd.cColorBits = (BYTE)(pfd.cColorBits + (pfd.cBlueBits = (BYTE)attribList[arg++]));
break; break;
case WX_GL_MIN_ALPHA: case WX_GL_MIN_ALPHA:
// doesn't count in cColorBits // doesn't count in cColorBits
pfd.cAlphaBits = attribList[arg++]; pfd.cAlphaBits = (BYTE)attribList[arg++];
break; break;
case WX_GL_DEPTH_SIZE: case WX_GL_DEPTH_SIZE:
pfd.cDepthBits = attribList[arg++]; pfd.cDepthBits = (BYTE)attribList[arg++];
break; break;
case WX_GL_STENCIL_SIZE: case WX_GL_STENCIL_SIZE:
pfd.cStencilBits = attribList[arg++]; pfd.cStencilBits = (BYTE)attribList[arg++];
break; break;
case WX_GL_MIN_ACCUM_RED: case WX_GL_MIN_ACCUM_RED:
pfd.cAccumBits += (pfd.cAccumRedBits = attribList[arg++]); pfd.cAccumBits = (BYTE)(pfd.cAccumBits + (pfd.cAccumRedBits = (BYTE)attribList[arg++]));
break; break;
case WX_GL_MIN_ACCUM_GREEN: case WX_GL_MIN_ACCUM_GREEN:
pfd.cAccumBits += (pfd.cAccumGreenBits = attribList[arg++]); pfd.cAccumBits = (BYTE)(pfd.cAccumBits + (pfd.cAccumGreenBits = (BYTE)attribList[arg++]));
break; break;
case WX_GL_MIN_ACCUM_BLUE: case WX_GL_MIN_ACCUM_BLUE:
pfd.cAccumBits += (pfd.cAccumBlueBits = attribList[arg++]); pfd.cAccumBits = (BYTE)(pfd.cAccumBits + (pfd.cAccumBlueBits = (BYTE)attribList[arg++]));
break; break;
case WX_GL_MIN_ACCUM_ALPHA: case WX_GL_MIN_ACCUM_ALPHA:
pfd.cAccumBits += (pfd.cAccumAlphaBits = attribList[arg++]); pfd.cAccumBits = (BYTE)(pfd.cAccumBits + (pfd.cAccumAlphaBits = (BYTE)attribList[arg++]));
break; break;
default: default:
break; break;
@@ -539,7 +545,7 @@ wxPalette wxGLCanvas::CreateDefaultPalette()
LOGPALETTE* pPal = LOGPALETTE* pPal =
(LOGPALETTE*) malloc(sizeof(LOGPALETTE) + paletteSize * sizeof(PALETTEENTRY)); (LOGPALETTE*) malloc(sizeof(LOGPALETTE) + paletteSize * sizeof(PALETTEENTRY));
pPal->palVersion = 0x300; pPal->palVersion = 0x300;
pPal->palNumEntries = paletteSize; pPal->palNumEntries = (WORD)paletteSize;
/* build a simple RGB color palette */ /* build a simple RGB color palette */
{ {
@@ -550,11 +556,11 @@ wxPalette wxGLCanvas::CreateDefaultPalette()
for (i=0; i<paletteSize; ++i) { for (i=0; i<paletteSize; ++i) {
pPal->palPalEntry[i].peRed = pPal->palPalEntry[i].peRed =
(((i >> pfd.cRedShift) & redMask) * 255) / redMask; (BYTE)((((i >> pfd.cRedShift) & redMask) * 255) / redMask);
pPal->palPalEntry[i].peGreen = pPal->palPalEntry[i].peGreen =
(((i >> pfd.cGreenShift) & greenMask) * 255) / greenMask; (BYTE)((((i >> pfd.cGreenShift) & greenMask) * 255) / greenMask);
pPal->palPalEntry[i].peBlue = pPal->palPalEntry[i].peBlue =
(((i >> pfd.cBlueShift) & blueMask) * 255) / blueMask; (BYTE)((((i >> pfd.cBlueShift) & blueMask) * 255) / blueMask);
pPal->palPalEntry[i].peFlags = 0; pPal->palPalEntry[i].peFlags = 0;
} }
} }
@@ -633,7 +639,9 @@ void glColorPointerEXT(GLint WXUNUSED(size), GLenum WXUNUSED(type), GLsizei WXUN
{ {
} }
void glDrawArraysEXT(GLenum mode, GLint first, GLsizei count) void glDrawArraysEXT(GLenum WXUNUSED_WITHOUT_GL_EXT_vertex_array(mode),
GLint WXUNUSED_WITHOUT_GL_EXT_vertex_array(first),
GLsizei WXUNUSED_WITHOUT_GL_EXT_vertex_array(count))
{ {
#ifdef GL_EXT_vertex_array #ifdef GL_EXT_vertex_array
static PFNGLDRAWARRAYSEXTPROC proc = 0; static PFNGLDRAWARRAYSEXTPROC proc = 0;
@@ -660,7 +668,10 @@ void glIndexPointerEXT(GLenum WXUNUSED(type), GLsizei WXUNUSED(stride), GLsizei
{ {
} }
void glNormalPointerEXT(GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer) void glNormalPointerEXT(GLenum WXUNUSED_WITHOUT_GL_EXT_vertex_array(type),
GLsizei WXUNUSED_WITHOUT_GL_EXT_vertex_array(stride),
GLsizei WXUNUSED_WITHOUT_GL_EXT_vertex_array(count),
const GLvoid *WXUNUSED_WITHOUT_GL_EXT_vertex_array(pointer))
{ {
#ifdef GL_EXT_vertex_array #ifdef GL_EXT_vertex_array
static PFNGLNORMALPOINTEREXTPROC proc = 0; static PFNGLNORMALPOINTEREXTPROC proc = 0;
@@ -679,7 +690,11 @@ void glTexCoordPointerEXT(GLint WXUNUSED(size), GLenum WXUNUSED(type), GLsizei W
{ {
} }
void glVertexPointerEXT(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer) void glVertexPointerEXT(GLint WXUNUSED_WITHOUT_GL_EXT_vertex_array(size),
GLenum WXUNUSED_WITHOUT_GL_EXT_vertex_array(type),
GLsizei WXUNUSED_WITHOUT_GL_EXT_vertex_array(stride),
GLsizei WXUNUSED_WITHOUT_GL_EXT_vertex_array(count),
const GLvoid *WXUNUSED_WITHOUT_GL_EXT_vertex_array(pointer))
{ {
#ifdef GL_EXT_vertex_array #ifdef GL_EXT_vertex_array
static PFNGLVERTEXPOINTEREXTPROC proc = 0; static PFNGLVERTEXPOINTEREXTPROC proc = 0;