Index: wgl_ext.c
===================================================================
RCS file: /home/wine/wine/dlls/opengl32/wgl_ext.c,v
retrieving revision 1.2
diff -u -r1.2 wgl_ext.c
--- wgl_ext.c	31 Jan 2005 11:32:13 -0000	1.2
+++ wgl_ext.c	21 Feb 2005 20:38:15 -0000
@@ -42,10 +42,31 @@
 static char *WGL_extensions = NULL;
 
 /* Extensions-query functions */
-BOOL query_function_pbuffers(const char *gl_version, const char *gl_extensions, const char *glx_extensions,
-			     const char *server_glx_extensions, const char *client_glx_extensions)
+BOOL query_function_multisample(const char *gl_version, const char *gl_extensions, const char *glx_extensions,
+				const char *server_glx_extensions, const char *client_glx_extensions)
 {
-    return FALSE;
+  return NULL != strstr("GLX_ARB_multisample", glx_extensions);
+}
+
+BOOL query_function_pbuffer(const char *gl_version, const char *gl_extensions, const char *glx_extensions,
+			    const char *server_glx_extensions, const char *client_glx_extensions)
+{
+  FIXME("gl_version is: \"%s\"\n", gl_version);
+  FIXME("glx_exts is: \"%s\"\n", glx_extensions);
+
+  return 0 <= strcmp("1.3", gl_version) || NULL != strstr(glx_extensions, "GLX_SGIX_pbuffer");
+}
+
+BOOL query_function_pixel_format(const char *gl_version, const char *gl_extensions, const char *glx_extensions,
+				 const char *server_glx_extensions, const char *client_glx_extensions)
+{
+  return TRUE;
+}
+
+BOOL query_function_render_texture(const char *gl_version, const char *gl_extensions, const char *glx_extensions,
+				   const char *server_glx_extensions, const char *client_glx_extensions)
+{
+  return 0 <= strcmp("1.3", gl_version) || NULL != strstr(glx_extensions, "GLX_SGIX_pbuffer");
 }
 
 /***********************************************************************
@@ -86,12 +107,176 @@
     return swap_interval;
 }
 
+typedef struct wine_glpbuffer {
+  Drawable   drawable;
+  int        pixelFormat;
+  int        width;
+  int        height;
+  int*       attribList;
+} Wine_GLPBuffer;
+
+#define PUSH1(attribs,att)        attribs[nAttribs++] = (att); 
+#define PUSH2(attribs,att,value)  attribs[nAttribs++] = (att); attribs[nAttribs++] = (value);
+
+#define WGL_NUMBER_PIXEL_FORMATS_ARB		0x2000
+#define WGL_DRAW_TO_WINDOW_ARB			0x2001
+#define WGL_DRAW_TO_BITMAP_ARB			0x2002
+#define WGL_ACCELERATION_ARB			0x2003
+#define WGL_NEED_PALETTE_ARB			0x2004
+#define WGL_NEED_SYSTEM_PALETTE_ARB		0x2005
+#define WGL_SWAP_LAYER_BUFFERS_ARB		0x2006
+#define WGL_SWAP_METHOD_ARB			0x2007
+#define WGL_NUMBER_OVERLAYS_ARB			0x2008
+#define WGL_NUMBER_UNDERLAYS_ARB		0x2009
+#define WGL_TRANSPARENT_ARB			0x200A
+#define WGL_TRANSPARENT_RED_VALUE_ARB		0x2037
+#define WGL_TRANSPARENT_GREEN_VALUE_ARB		0x2038
+#define WGL_TRANSPARENT_BLUE_VALUE_ARB		0x2039
+#define WGL_TRANSPARENT_ALPHA_VALUE_ARB		0x203A
+#define WGL_TRANSPARENT_INDEX_VALUE_ARB		0x203B
+#define WGL_SHARE_DEPTH_ARB			0x200C
+#define WGL_SHARE_STENCIL_ARB			0x200D
+#define WGL_SHARE_ACCUM_ARB			0x200E
+#define WGL_SUPPORT_GDI_ARB			0x200F
+#define WGL_SUPPORT_OPENGL_ARB			0x2010
+#define WGL_DOUBLE_BUFFER_ARB			0x2011
+#define WGL_STEREO_ARB				0x2012
+#define WGL_PIXEL_TYPE_ARB			0x2013
+#define WGL_COLOR_BITS_ARB			0x2014
+#define WGL_RED_BITS_ARB			0x2015
+#define WGL_RED_SHIFT_ARB			0x2016
+#define WGL_GREEN_BITS_ARB			0x2017
+#define WGL_GREEN_SHIFT_ARB			0x2018
+#define WGL_BLUE_BITS_ARB			0x2019
+#define WGL_BLUE_SHIFT_ARB			0x201A
+#define WGL_ALPHA_BITS_ARB			0x201B
+#define WGL_ALPHA_SHIFT_ARB			0x201C
+#define WGL_ACCUM_BITS_ARB			0x201D
+#define WGL_ACCUM_RED_BITS_ARB			0x201E
+#define WGL_ACCUM_GREEN_BITS_ARB		0x201F
+#define WGL_ACCUM_BLUE_BITS_ARB			0x2020
+#define WGL_ACCUM_ALPHA_BITS_ARB		0x2021
+#define WGL_DEPTH_BITS_ARB			0x2022
+#define WGL_STENCIL_BITS_ARB			0x2023
+#define WGL_AUX_BUFFERS_ARB			0x2024
+
+static void ConvertAttrib(const int* iWGLAttr, int* oGLXAttr) {
+  unsigned nAttribs = 0;
+
+  int pop;
+  while (0 != iWGLAttr[nAttribs]) {
+    switch (iWGLAttr[nAttribs]) {
+    case WGL_COLOR_BITS_ARB:
+      pop = iWGLAttr[++nAttribs];
+      PUSH2(oGLXAttr, GLX_BUFFER_SIZE, pop);
+      break;
+    case WGL_ALPHA_BITS_ARB:
+      pop = iWGLAttr[++nAttribs];
+      PUSH2(oGLXAttr, GLX_ALPHA_SIZE, pop);
+      break;
+    case WGL_DEPTH_BITS_ARB:
+      pop = iWGLAttr[++nAttribs];
+      PUSH2(oGLXAttr, GLX_DEPTH_SIZE, pop);
+      break;
+    case WGL_STENCIL_BITS_ARB:
+      pop = iWGLAttr[++nAttribs];
+      PUSH2(oGLXAttr, GLX_STENCIL_SIZE, pop);
+      break;
+    case WGL_DOUBLE_BUFFER_ARB:
+      pop = iWGLAttr[++nAttribs];
+      PUSH2(oGLXAttr, GLX_DOUBLEBUFFER, pop);
+      break;
+    case WGL_DRAW_TO_WINDOW_ARB:
+    case WGL_SUPPORT_OPENGL_ARB:
+    case WGL_ACCELERATION_ARB:
+    /*
+    case WGL_SAMPLE_BUFFERS_ARB:
+    case WGL_SAMPLES_ARB:
+    */
+    default:
+      break;
+    }
+    ++nAttribs;
+  }
+  PUSH1(oGLXAttr,None);
+}
+
+GLboolean WINAPI wglGetPixelFormatAttribivARB(HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, int *piValues)
+{
+    TRACE("(%p, %d, %d, %d, %p, %p)\n", hdc, iPixelFormat, iLayerPlane, nAttributes, piAttributes, piValues);
+    return GL_TRUE;
+}
+
+GLboolean WINAPI wglGetPixelFormatAttribfvARB(HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, FLOAT *pfValues)
+{
+    TRACE("(%p, %d, %d, %d, %p, %p)\n", hdc, iPixelFormat, iLayerPlane, nAttributes, piAttributes, pfValues);
+    return GL_TRUE;
+}
+
+GLboolean WINAPI wglChoosePixelFormatARB(HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats)
+{
+    TRACE("(%p, %p, %p, %d, %p, %p)\n", hdc, piAttribIList, pfAttribFList, nMaxFormats, piFormats, nNumFormats);
+    return GL_TRUE;
+}
+
+#define HPBUFFERARB void *
+HPBUFFERARB WINAPI wglCreatePbufferARB(HDC hdc, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList)
+{
+    TRACE("(%p, %d, %d, %d, %p)\n", hdc, iPixelFormat, iWidth, iHeight, piAttribList);
+    return 0;
+}
+
+HDC WINAPI wglGetPbufferDCARB(HPBUFFERARB hPbuffer)
+{
+    TRACE("(%p)\n", hPbuffer);
+    return 0;
+}
+
+int WINAPI wglReleasePbufferDCARB(HPBUFFERARB hPbuffer, HDC hdc)
+{
+    TRACE("(%p, %p)\n", hPbuffer, hdc);
+    return 0;
+}
+
+GLboolean WINAPI wglDestroyPbufferARB(HPBUFFERARB hPbuffer)
+{
+    TRACE("(%p)\n", hPbuffer);
+    return GL_TRUE;
+}
+
+GLboolean WINAPI wglQueryPbufferARB(HPBUFFERARB hPbuffer, int iAttribute, int *piValue)
+{
+    TRACE("(%p, %d, %p)\n", hPbuffer, iAttribute, piValue);
+    return GL_TRUE;
+}
+
+GLboolean WINAPI wglBindTexImageARB(HPBUFFERARB hPbuffer, int iBuffer)
+{
+    TRACE("(%p, %d)\n", hPbuffer, iBuffer);
+    return GL_TRUE;
+}
+
+GLboolean WINAPI wglReleaseTexImageARB(HPBUFFERARB hPbuffer, int iBuffer)
+{
+    TRACE("(%p, %d)\n", hPbuffer, iBuffer);
+    return GL_TRUE;
+}
+
+GLboolean WINAPI wglSetPbufferAttribARB(HPBUFFERARB hPbuffer, const int *piAttribList)
+{
+    TRACE("(%p, %p)\n", hPbuffer, piAttribList);
+    return GL_TRUE;
+}
+
 static const struct {
     const char *name;
     BOOL (*query_function)(const char *gl_version, const char *gl_extensions, const char *glx_extensions,
 			   const char *server_glx_extensions, const char *client_glx_extensions);
 } extension_list[] = {
-    { "WGL_ARB_pbuffer", query_function_pbuffers }
+  { "WGL_ARB_multisample", query_function_multisample },
+  { "WGL_ARB_pbuffer", query_function_pbuffer },
+  { "WGL_ARB_pixel_format" , query_function_pixel_format },
+  { "WGL_ARB_render_texture", query_function_render_texture }
 };
 
 /* Used to initialize the WGL extension string at DLL loading */
@@ -102,7 +287,7 @@
     const char *server_glx_extensions = glXQueryServerString(display, screen, GLX_EXTENSIONS);
     const char *client_glx_extensions = glXGetClientString(display, GLX_EXTENSIONS);
     const char *gl_extensions = (const char *) glGetString(GL_EXTENSIONS);
-    const char *gl_version = (const char *) glGetString(GL_VERSION);
+    const char *gl_version = glXGetClientString(display, GLX_VERSION);
     int i;
 
     TRACE("GL version      : %s.\n", debugstr_a(gl_version));
@@ -143,11 +328,26 @@
     }
 }
 
-/* Putting this at the end to prevent having to write the prototypes :-) */
+/*
+ * Putting this at the end to prevent having to write the prototypes :-) 
+ *
+ * @WARNING: this list must be ordered by name
+ */
 WGL_extension wgl_extension_registry[] = {
+    { "wglBindTexImageARB", (void *) wglBindTexImageARB, NULL, NULL},
+    { "wglChoosePixelFormatARB", (void *) wglChoosePixelFormatARB, NULL, NULL},
+    { "wglCreatePbufferARB", (void *) wglCreatePbufferARB, NULL, NULL},
+    { "wglDestroyPbufferARB", (void *) wglDestroyPbufferARB, NULL, NULL},
     { "wglGetExtensionsStringARB", (void *) wglGetExtensionsStringARB, NULL, NULL},
     { "wglGetExtensionsStringEXT", (void *) wglGetExtensionsStringEXT, NULL, NULL},
+    { "wglGetPbufferDCARB", (void *) wglGetPbufferDCARB, NULL, NULL},
+    { "wglGetPixelFormatAttribfvARB", (void *) wglGetPixelFormatAttribfvARB, NULL, NULL},
+    { "wglGetPixelFormatAttribivARB", (void *) wglGetPixelFormatAttribivARB, NULL, NULL},
     { "wglGetSwapIntervalEXT", (void *) wglSwapIntervalEXT, NULL, NULL},
+    { "wglQueryPbufferARB", (void *) wglQueryPbufferARB, NULL, NULL},
+    { "wglReleasePbufferDCARB", (void *) wglReleasePbufferDCARB, NULL, NULL},
+    { "wglReleaseTexImageARB", (void *) wglReleaseTexImageARB, NULL, NULL},
+    { "wglSetPbufferAttribARB", (void *) wglSetPbufferAttribARB, NULL, NULL},
     { "wglSwapIntervalEXT", (void *) wglSwapIntervalEXT, NULL, NULL}
 };
 int wgl_extension_registry_size = sizeof(wgl_extension_registry) / sizeof(wgl_extension_registry[0]);