[greatlrd] 30772: activate ARB_multisample in mesa ext, add stub for wglGetPixelFormatAttribivARB and wglGetPixelFormatAttribfvARB
Author: greatlrd Date: Mon Nov 26 02:27:24 2007 New Revision: 30772
URL: http://svn.reactos.org/svn/reactos?rev=30772&view=rev Log: activate ARB_multisample in mesa ext, add stub for wglGetPixelFormatAttribivARB and wglGetPixelFormatAttribfvARB
Modified: trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/icd.c trunk/reactos/dll/3rdparty/mesa32/src/main/extensions.c
Modified: trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/dri... ============================================================================== --- trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c (original) +++ trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c Mon Nov 26 02:27:24 2007 @@ -770,3 +770,28 @@ 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; +} +
Modified: trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/icd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/dri... ============================================================================== --- trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/icd.c (original) +++ trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/icd.c Mon Nov 26 02:27:24 2007 @@ -53,6 +53,8 @@ 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 @@ } 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},
Modified: trunk/reactos/dll/3rdparty/mesa32/src/main/extensions.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/mai... ============================================================================== --- trunk/reactos/dll/3rdparty/mesa32/src/main/extensions.c (original) +++ trunk/reactos/dll/3rdparty/mesa32/src/main/extensions.c Mon Nov 26 02:27:24 2007 @@ -50,7 +50,7 @@ { 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) },
-
greatlrd＠svn.reactos.org