Author: greatlrd Date: Tue Nov 27 22:55:19 2007 New Revision: 30823
URL: http://svn.reactos.org/svn/reactos?rev=30823&view=rev Log: Last stubbing we need for mesa icd interface was done by Kamil Hornicek tykef at atlas dot cz (irc nick : Pigglesworth) ----------------------------------------------------------------------------------------------------------------------
Modified: trunk/reactos/dll/3rdparty/mesa32/include/GL/mesa_wgl.h trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/icd.c
Modified: trunk/reactos/dll/3rdparty/mesa32/include/GL/mesa_wgl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/include... ============================================================================== --- trunk/reactos/dll/3rdparty/mesa32/include/GL/mesa_wgl.h (original) +++ trunk/reactos/dll/3rdparty/mesa32/include/GL/mesa_wgl.h Tue Nov 27 22:55:19 2007 @@ -101,18 +101,41 @@ WGLAPI int GLAPIENTRY wglUseFontOutlinesW(HDC, unsigned long, unsigned long, unsigned long, float,float, int, LPGLYPHMETRICSFLOAT);
#ifndef __MINGW32__ + +typedef void *HPBUFFERARB; + WGLAPI int GLAPIENTRY SwapBuffers(HDC); WGLAPI int GLAPIENTRY ChoosePixelFormat(HDC,const PIXELFORMATDESCRIPTOR *); WGLAPI int GLAPIENTRY DescribePixelFormat(HDC,int,unsigned int,LPPIXELFORMATDESCRIPTOR); WGLAPI int GLAPIENTRY GetPixelFormat(HDC); WGLAPI int GLAPIENTRY SetPixelFormat(HDC,int,const PIXELFORMATDESCRIPTOR *); + +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); +GLAPI BOOL GLAPIENTRY wglMakeContextCurrentARB(HDC hDrawDC, HDC hReadDC, HGLRC hglrc); +GLAPI HANDLE GLAPIENTRY wglGetCurrentReadDCARB(void); +GLAPI HPBUFFERARB GLAPIENTRY wglCreatePbufferARB (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList); +GLAPI HDC GLAPIENTRY wglGetPbufferDCARB (HPBUFFERARB hPbuffer); +GLAPI int GLAPIENTRY wglReleasePbufferDCARB (HPBUFFERARB hPbuffer, HDC hDC); +GLAPI BOOL GLAPIENTRY wglDestroyPbufferARB (HPBUFFERARB hPbuffer); +GLAPI BOOL GLAPIENTRY wglQueryPbufferARB (HPBUFFERARB hPbuffer, int iAttribute, int *piValue); +GLAPI HANDLE GLAPIENTRY wglCreateBufferRegionARB(HDC hDC, int iLayerPlane, UINT uType); +GLAPI VOID GLAPIENTRY wglDeleteBufferRegionARB(HANDLE hRegion); +GLAPI BOOL GLAPIENTRY wglSaveBufferRegionARB(HANDLE hRegion, int x, int y, int width, int height); +GLAPI BOOL GLAPIENTRY wglRestoreBufferRegionARB(HANDLE hRegion, int x, int y, int width, int height, int xSrc, int ySrc); +GLAPI BOOL GLAPIENTRY wglSetPbufferAttribARB (HPBUFFERARB hPbuffer, const int *piAttribList); +GLAPI BOOL GLAPIENTRY wglBindTexImageARB (HPBUFFERARB hPbuffer, int iBuffer); +GLAPI BOOL GLAPIENTRY wglReleaseTexImageARB (HPBUFFERARB hPbuffer, int iBuffer); #endif
#ifndef WGL_ARB_extensions_string #define WGL_ARB_extensions_string 1
WGLAPI const char * GLAPIENTRY wglGetExtensionsStringARB(HDC hdc); - #endif /* WGL_ARB_extensions_string */
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 Tue Nov 27 22:55:19 2007 @@ -795,3 +795,126 @@ return FALSE; }
+GLAPI BOOL GLAPIENTRY +wglMakeContextCurrentARB(HDC hDrawDC, + HDC hReadDC, + HGLRC hglrc) +{ + SetLastError(0); + return FALSE; +} + +GLAPI HANDLE GLAPIENTRY +wglGetCurrentReadDCARB(void) +{ + SetLastError(0); + return NULL; +} + +typedef void *HPBUFFERARB; + +/* WGL_ARB_pbuffer */ +GLAPI HPBUFFERARB GLAPIENTRY +wglCreatePbufferARB (HDC hDC, + int iPixelFormat, + int iWidth, + int iHeight, + const int *piAttribList) +{ + SetLastError(0); + return NULL; +} + +GLAPI HDC GLAPIENTRY +wglGetPbufferDCARB (HPBUFFERARB hPbuffer) +{ + SetLastError(0); + return NULL; +} + +GLAPI int GLAPIENTRY +wglReleasePbufferDCARB (HPBUFFERARB hPbuffer, HDC hDC) +{ + SetLastError(0); + return -1; +} + +GLAPI BOOL GLAPIENTRY +wglDestroyPbufferARB (HPBUFFERARB hPbuffer) +{ + SetLastError(0); + return FALSE; +} + +GLAPI BOOL GLAPIENTRY +wglQueryPbufferARB (HPBUFFERARB hPbuffer, + int iAttribute, + int *piValue) +{ + SetLastError(0); + return FALSE; +} + +GLAPI HANDLE GLAPIENTRY +wglCreateBufferRegionARB(HDC hDC, + int iLayerPlane, + UINT uType) +{ + SetLastError(0); + return NULL; +} + +GLAPI VOID GLAPIENTRY +wglDeleteBufferRegionARB(HANDLE hRegion) +{ + SetLastError(0); + return; +} + +GLAPI BOOL GLAPIENTRY +wglSaveBufferRegionARB(HANDLE hRegion, + int x, + int y, + int width, + int height) +{ + SetLastError(0); + return FALSE; +} + +GLAPI BOOL GLAPIENTRY +wglRestoreBufferRegionARB(HANDLE hRegion, + int x, + int y, + int width, + int height, + int xSrc, + int ySrc) +{ + SetLastError(0); + return FALSE; +} + +/* WGL_ARB_render_texture */ +GLAPI BOOL GLAPIENTRY +wglSetPbufferAttribARB (HPBUFFERARB hPbuffer, + const int *piAttribList) +{ + SetLastError(0); + return FALSE; +} + +GLAPI BOOL GLAPIENTRY +wglBindTexImageARB (HPBUFFERARB hPbuffer, int iBuffer) +{ + SetLastError(0); + return FALSE; +} + +GLAPI BOOL GLAPIENTRY +wglReleaseTexImageARB (HPBUFFERARB hPbuffer, int iBuffer) +{ + 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 Tue Nov 27 22:55:19 2007 @@ -49,12 +49,28 @@ #include "mtypes.h" #include "glapi.h"
+typedef void *HPBUFFERARB; + 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); +GLAPI BOOL GLAPIENTRY wglMakeContextCurrentARB(HDC hDrawDC, HDC hReadDC, HGLRC hglrc); +GLAPI HANDLE GLAPIENTRY wglGetCurrentReadDCARB(void); +GLAPI HPBUFFERARB GLAPIENTRY wglCreatePbufferARB (HDC hDC, int iPixelFormat, int iWidth, int iHeight, const int *piAttribList); +GLAPI HDC GLAPIENTRY wglGetPbufferDCARB (HPBUFFERARB hPbuffer); +GLAPI int GLAPIENTRY wglReleasePbufferDCARB (HPBUFFERARB hPbuffer, HDC hDC); +GLAPI BOOL GLAPIENTRY wglDestroyPbufferARB (HPBUFFERARB hPbuffer); +GLAPI BOOL GLAPIENTRY wglQueryPbufferARB (HPBUFFERARB hPbuffer, int iAttribute, int *piValue); +GLAPI HANDLE GLAPIENTRY wglCreateBufferRegionARB(HDC hDC, int iLayerPlane, UINT uType); +GLAPI VOID GLAPIENTRY wglDeleteBufferRegionARB(HANDLE hRegion); +GLAPI BOOL GLAPIENTRY wglSaveBufferRegionARB(HANDLE hRegion, int x, int y, int width, int height); +GLAPI BOOL GLAPIENTRY wglRestoreBufferRegionARB(HANDLE hRegion, int x, int y, int width, int height, int xSrc, int ySrc); +GLAPI BOOL GLAPIENTRY wglSetPbufferAttribARB (HPBUFFERARB hPbuffer, const int *piAttribList); +GLAPI BOOL GLAPIENTRY wglBindTexImageARB (HPBUFFERARB hPbuffer, int iBuffer); +GLAPI BOOL GLAPIENTRY wglReleaseTexImageARB (HPBUFFERARB hPbuffer, int iBuffer);
#define MAX_MESA_ATTRS 20
@@ -325,20 +341,20 @@ {"wglGetPixelFormatAttribivARB", (PROC)wglGetPixelFormatAttribivARB}, {"wglGetPixelFormatAttribfvARB", (PROC)wglGetPixelFormatAttribfvARB}, {"wglChoosePixelFormatARB", (PROC)wglChoosePixelFormatARB}, -// {"wglCreatePbufferARB", (PROC)wglCreatePbufferARB}, -// {"wglGetPbufferDCARB", (PROC)wglGetPbufferDCARB}, -// {"wglReleasePbufferDCARB", (PROC)wglReleasePbufferDCARB}, -// {"wglDestroyPbufferARB", (PROC)wglDestroyPbufferARB}, -// {"wglQueryPbufferARB", (PROC)wglQueryPbufferARB}, -// {"wglSetPbufferAttribARB", (PROC)wglSetPbufferAttribARB}, -// {"wglBindTexImageARB", (PROC)wglBindTexImageARB}, -// {"wglReleaseTexImageARB", (PROC)wglReleaseTexImageARB}, -// {"wglCreateBufferRegionARB", (PROC)wglCreateBufferRegionARB}, -// {"wglDeleteBufferRegionARB", (PROC)wglDeleteBufferRegionARB}, -// {"wglSaveBufferRegionARB", (PROC)wglSaveBufferRegionARB}, -// {"wglRestoreBufferRegionARB", (PROC)wglRestoreBufferRegionARB}, -// {"wglMakeContextCurrentARB", (PROC)wglMakeContextCurrentARB}, -// {"wglGetCurrentReadDCARB", (PROC)wglGetCurrentReadDCARB}, + {"wglCreatePbufferARB", (PROC)wglCreatePbufferARB}, + {"wglGetPbufferDCARB", (PROC)wglGetPbufferDCARB}, + {"wglReleasePbufferDCARB", (PROC)wglReleasePbufferDCARB}, + {"wglDestroyPbufferARB", (PROC)wglDestroyPbufferARB}, + {"wglQueryPbufferARB", (PROC)wglQueryPbufferARB}, + {"wglSetPbufferAttribARB", (PROC)wglSetPbufferAttribARB}, + {"wglBindTexImageARB", (PROC)wglBindTexImageARB}, + {"wglReleaseTexImageARB", (PROC)wglReleaseTexImageARB}, + {"wglCreateBufferRegionARB", (PROC)wglCreateBufferRegionARB}, + {"wglDeleteBufferRegionARB", (PROC)wglDeleteBufferRegionARB}, + {"wglSaveBufferRegionARB", (PROC)wglSaveBufferRegionARB}, + {"wglRestoreBufferRegionARB", (PROC)wglRestoreBufferRegionARB}, + {"wglMakeContextCurrentARB", (PROC)wglMakeContextCurrentARB}, + {"wglGetCurrentReadDCARB", (PROC)wglGetCurrentReadDCARB}, {NULL, NULL} };