activate ARB_multisample in mesa ext,

add stub for wglGetPixelFormatAttribivARB and  wglGetPixelFormatAttribfvARB

svn path=/trunk/; revision=30772

diff --git a/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c b/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c
index 3725d7c..742511f 100644 (file)
--- a/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c
+++ b/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c
@@ -770,3 +770,28 @@ wglGetSwapIntervalEXT (void)
     return -1;
 }
 
+/* WGL_ARB_pixel_format */
+GLAPI BOOL GLAPIENTRY
+wglGetPixelFormatAttribivARB (HDC hdc,
+                              int iPixelFormat,
+                              int iLayerPlane,
+                              UINT nAttributes,
+                              const int *piAttributes,
+                              int *piValues)
+{
+   SetLastError(0);
+   return FALSE;
+}
+
+GLAPI BOOL GLAPIENTRY
+wglGetPixelFormatAttribfvARB (HDC hdc,
+                              int iPixelFormat,
+                              int iLayerPlane,
+                              UINT nAttributes,
+                              const int *piAttributes,
+                              FLOAT *pfValues)
+{
+   SetLastError(0);
+   return FALSE;
+}
+

diff --git a/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/icd.c b/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/icd.c
index 4993576..2175a23 100644 (file)
--- a/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/icd.c
+++ b/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/icd.c
@@ -53,6 +53,8 @@ GLAPI const char * GLAPIENTRY wglGetExtensionsStringEXT (void);
 GLAPI BOOL GLAPIENTRY wglChoosePixelFormatARB (HDC hdc, const int *piAttribIList, const FLOAT *pfAttribFList, UINT nMaxFormats, int *piFormats, UINT *nNumFormats);
 GLAPI BOOL GLAPIENTRY wglSwapIntervalEXT (int interval);
 GLAPI int GLAPIENTRY wglGetSwapIntervalEXT (void);
+GLAPI BOOL GLAPIENTRY wglGetPixelFormatAttribivARB (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, int *piValues);
+GLAPI BOOL GLAPIENTRY wglGetPixelFormatAttribfvARB (HDC hdc, int iPixelFormat, int iLayerPlane, UINT nAttributes, const int *piAttributes, FLOAT *pfValues);
 
 #define MAX_MESA_ATTRS 20
 
@@ -318,11 +320,11 @@ static struct {
 } wgl_ext[] = {
        {"wglGetExtensionsStringARB",    (PROC)wglGetExtensionsStringARB},
        {"wglGetExtensionsStringEXT",    (PROC)wglGetExtensionsStringEXT},
-       {"wglSwapIntervalEXT",    (PROC)wglSwapIntervalEXT},
-       {"wglGetSwapIntervalEXT",    (PROC)wglGetSwapIntervalEXT},
-//         {"wglGetPixelFormatAttribivARB",    (PROC)wglGetPixelFormatAttribivARB},
-//       {"wglGetPixelFormatAttribfvARB",    (PROC)wglGetPixelFormatAttribfvARB},
-       {"wglChoosePixelFormatARB",    (PROC)wglChoosePixelFormatARB},
+       {"wglSwapIntervalEXT",           (PROC)wglSwapIntervalEXT},
+       {"wglGetSwapIntervalEXT",        (PROC)wglGetSwapIntervalEXT},
+       {"wglGetPixelFormatAttribivARB", (PROC)wglGetPixelFormatAttribivARB},
+       {"wglGetPixelFormatAttribfvARB", (PROC)wglGetPixelFormatAttribfvARB},
+       {"wglChoosePixelFormatARB",      (PROC)wglChoosePixelFormatARB},
 //       {"wglCreatePbufferARB",    (PROC)wglCreatePbufferARB},
 //       {"wglGetPbufferDCARB",    (PROC)wglGetPbufferDCARB},
 //       {"wglReleasePbufferDCARB",    (PROC)wglReleasePbufferDCARB},

diff --git a/reactos/dll/3rdparty/mesa32/src/main/extensions.c b/reactos/dll/3rdparty/mesa32/src/main/extensions.c
index 4e44c5b..9cb4e35 100644 (file)
--- a/reactos/dll/3rdparty/mesa32/src/main/extensions.c
+++ b/reactos/dll/3rdparty/mesa32/src/main/extensions.c
@@ -50,7 +50,7 @@ static const struct {
    { OFF, "GL_ARB_fragment_shader",            F(ARB_fragment_shader) },
    { OFF, "GL_ARB_half_float_pixel",           F(ARB_half_float_pixel) },
    { OFF, "GL_ARB_imaging",                    F(ARB_imaging) },
-   { OFF, "GL_ARB_multisample",                F(ARB_multisample) },
+   { ON, "GL_ARB_multisample",                F(ARB_multisample) },
    { OFF, "GL_ARB_multitexture",               F(ARB_multitexture) },
    { OFF, "GL_ARB_occlusion_query",            F(ARB_occlusion_query) },
    { OFF, "GL_ARB_pixel_buffer_object",        F(EXT_pixel_buffer_object) },