[greatlrd] 30743: Update the icd with two more opengl api. mark up which opengl api belong to which version BugFix : DrvDescribePixelFormat so it does not crash in windows. mesa3D ICD works now in windows.
25 Nov
2007
25 Nov
'07
4:56 p.m.
Author: greatlrd
Date: Sun Nov 25 19:56:51 2007
New Revision: 30743
URL: http://svn.reactos.org/svn/reactos?rev=30743&view=rev
Log:
Update the icd with two more opengl api.
mark up which opengl api belong to which version
BugFix : DrvDescribePixelFormat so it does not crash in windows.
mesa3D ICD works now in windows.
Modified:
trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/icd.c
trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/icdlist.h
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/dr…
==============================================================================
--- trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/icd.c (original)
+++ trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/icd.c Sun Nov 25 19:56:51
2007
@@ -55,7 +55,7 @@
typedef struct _icdTable {
DWORD size;
- PROC table[336];
+ PROC table[418];
} ICDTABLE, *PICDTABLE;
#ifdef USE_MGL_NAMESPACE
@@ -65,7 +65,7 @@
#endif
-static ICDTABLE icdTable = { 416, {
+static ICDTABLE icdTable = { 418, {
#define ICD_ENTRY(func) (PROC)GL_FUNC(func),
#include "icdlist.h"
#undef ICD_ENTRY
@@ -284,17 +284,21 @@
WGLAPI int GLAPIENTRY DrvDescribePixelFormat(HDC hdc,int iPixelFormat,UINT nBytes,
LPPIXELFORMATDESCRIPTOR ppfd)
{
- int qt_valid_pix;
+ int qt_valid_pix;
(void) hdc;
qt_valid_pix = qt_pix;
- if(ppfd==NULL)
- return(qt_valid_pix);
- if(iPixelFormat < 1 || iPixelFormat > qt_valid_pix || nBytes !=
sizeof(PIXELFORMATDESCRIPTOR))
+ if( (nBytes != sizeof(PIXELFORMATDESCRIPTOR)) || (iPixelFormat < 1) ||
(iPixelFormat >qt_valid_pix) )
{
SetLastError(0);
return(0);
}
+
+ if(ppfd==NULL)
+ {
+ return(qt_valid_pix);
+ }
+
*ppfd = pix[iPixelFormat - 1].pfd;
return(qt_valid_pix);
}
Modified: trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/icdlist.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/dr…
==============================================================================
--- trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/icdlist.h (original)
+++ trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/icd/icdlist.h Sun Nov 25
19:56:51 2007
@@ -1,3 +1,4 @@
+/* OpenGL version 1.0 */
ICD_ENTRY(NewList) /* 000 "glNewList" */
ICD_ENTRY(EndList) /* 001 "glEndList" */
ICD_ENTRY(CallList) /* 002 "glCallList" */
@@ -304,6 +305,7 @@
ICD_ENTRY(Translated) /* 303 "glTranslated" */
ICD_ENTRY(Translatef) /* 304 "glTranslatef" */
ICD_ENTRY(Viewport) /* 305 "glViewport" */
+/* OpenGL version 1.1 */
ICD_ENTRY(ArrayElement) /* 306 "glArrayElement" */
ICD_ENTRY(BindTexture) /* 307 "glBindTexture" */
ICD_ENTRY(ColorPointer) /* 308 "glColorPointer" */
@@ -334,13 +336,15 @@
ICD_ENTRY(TexSubImage2D) /* 333 "glTexSubImage2D" */
ICD_ENTRY(PopClientAttrib) /* 334 "glPopClientAttrib" */
ICD_ENTRY(PushClientAttrib) /* 335 "glPushClientAttrib" */
+/* OpenGL 1.2 and 1.2.1 */
ICD_ENTRY(TexImage3D) /* 336 "glTexImage3D" */
ICD_ENTRY(TexSubImage3D) /* 337 "glTexSubImage3D" */
ICD_ENTRY(DrawRangeElements) /* 338 "glDrawRangeElements" */
ICD_ENTRY(BlendColor) /* 339 "glBlendColor" */
ICD_ENTRY(BlendEquation) /* 340 "glBlendEquation" */
-ICD_ENTRY(ActiveTexture) /* 341 "glActiveTexture" */
-ICD_ENTRY(ClientActiveTexture) /* 342 "glClientActiveTexture" */
+/* Open 1.3 */
+ICD_ENTRY(ActiveTexture) /* 341 "glActiveTexture" */
+ICD_ENTRY(ClientActiveTexture) /* 342 "glClientActiveTexture" */
ICD_ENTRY(MultiTexCoord1d) /* 343 "glMultiTexCoord1d" */
ICD_ENTRY(MultiTexCoord1dv) /* 344 "glMultiTexCoord1dv" */
ICD_ENTRY(MultiTexCoord1f) /* 345 "glMultiTexCoord1f" */
@@ -385,6 +389,7 @@
ICD_ENTRY(CompressedTexSubImage1D) /* 384 "glCompressedTexSubImage1D" */
ICD_ENTRY(GetCompressedTexImage) /* 385 "glGetCompressedTexImage" */
ICD_ENTRY(SampleCoverage) /* 386 "glSampleCoverage" */
+/* Open 1.4 and higher */
ICD_ENTRY(FogCoordf) /* 387 "glFogCoordf" */
ICD_ENTRY(FogCoordd) /* 388 "glFogCoordd" */
ICD_ENTRY(FogCoordfv) /* 389 "glFogCoordfv" */
@@ -401,7 +406,7 @@
ICD_ENTRY(SecondaryColor3s) /* 400 "glSecondaryColor3s" */
ICD_ENTRY(SecondaryColor3sv) /* 401 "glSecondaryColor3sv" */
ICD_ENTRY(SecondaryColor3ub) /* 402 "glSecondaryColor3ub" */
-ICD_ENTRY(SecondaryColor3ubv) /* 403 "glSecondaryColor3ubv"
*/
+ICD_ENTRY(SecondaryColor3ubv) /* 403 "glSecondaryColor3ubv" */
ICD_ENTRY(SecondaryColor3ui) /* 404 "glSecondaryColor3ui" */
ICD_ENTRY(SecondaryColor3uiv) /* 405 "glSecondaryColor3uiv" */
ICD_ENTRY(SecondaryColor3us) /* 406 "glSecondaryColor3us" */
@@ -414,4 +419,6 @@
ICD_ENTRY(PointParameteri) /* 413 "glPointParameteri" */
ICD_ENTRY(PointParameteriv) /* 414 "glPointParameteriv" */
ICD_ENTRY(BlendFuncSeparate) /* 415 "glBlendFuncSeparate" */
+ICD_ENTRY(WindowPos2d) /* 416 "glWindowPos2d" */
+ICD_ENTRY(WindowPos2dv) /* 417 "glWindowPos2dv" */
6144
days inactive
6144
days old
0 comments
1 participants
participants (1)
-
greatlrd＠svn.reactos.org