Merge DRI-trunk-20040613 changes in programs/Xserver/GL.
This commit is contained in:
parent
2e1868b560
commit
e56e24af25
|
@ -1,4 +1,4 @@
|
|||
/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab.c,v 1.3 2001/03/21 16:29:35 dawes Exp $ */
|
||||
/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab.c,v 1.5 2004/01/28 18:11:50 alanh Exp $ */
|
||||
/* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
|
||||
/*
|
||||
** License Applicability. Except to the extent portions of this file are
|
||||
|
@ -426,7 +426,11 @@ __GLXdispatchRenderProcPtr __glXRenderTable[] = {
|
|||
__glXNoSuchRenderOpcode,
|
||||
__glXNoSuchRenderOpcode,
|
||||
__glXDisp_SampleCoverageARB,
|
||||
#ifndef MISSING_GL_EXTS
|
||||
__glXDisp_WindowPos3fARB /* 230 */
|
||||
#else
|
||||
__glXNoSuchRenderOpcode
|
||||
#endif
|
||||
};
|
||||
|
||||
__GLXdispatchSingleProcPtr __glXSwapSingleTable[__GLX_SINGLE_TABLE_SIZE] = {
|
||||
|
@ -823,5 +827,9 @@ __GLXdispatchRenderProcPtr __glXSwapRenderTable[__GLX_RENDER_TABLE_SIZE] = {
|
|||
__glXNoSuchRenderOpcode,
|
||||
__glXNoSuchRenderOpcode,
|
||||
__glXDispSwap_SampleCoverageARB,
|
||||
#ifndef MISSING_GL_EXTS
|
||||
__glXDispSwap_WindowPos3fARB /* 230 */
|
||||
#else
|
||||
__glXNoSuchRenderOpcode
|
||||
#endif
|
||||
};
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab.h,v 1.3 2001/03/21 16:29:35 dawes Exp $ */
|
||||
/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab.h,v 1.4 2003/09/28 20:15:42 alanh Exp $ */
|
||||
/* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
|
||||
#ifndef _GLX_g_disptab_h_
|
||||
#define _GLX_g_disptab_h_
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $XFree86: xc/programs/Xserver/GL/glx/g_render.c,v 1.4 2001/03/21 16:29:35 dawes Exp $ */
|
||||
/* $XFree86: xc/programs/Xserver/GL/glx/g_render.c,v 1.8 2004/02/03 21:34:36 alanh Exp $ */
|
||||
/* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
|
||||
/*
|
||||
** License Applicability. Except to the extent portions of this file are
|
||||
|
@ -195,6 +195,7 @@ void __glXDisp_Begin(GLbyte *pc)
|
|||
(type *) (pc + 4) ); \
|
||||
}
|
||||
|
||||
#ifndef MISSING_GL_EXTS
|
||||
dispatch_template_1( FogCoordfv, GLfloat )
|
||||
dispatch_template_1( FogCoorddv, GLdouble )
|
||||
dispatch_template_3( SecondaryColor3bv, GLbyte )
|
||||
|
@ -207,6 +208,7 @@ dispatch_template_3( SecondaryColor3fv, GLfloat )
|
|||
dispatch_template_3( SecondaryColor3dv, GLdouble )
|
||||
|
||||
dispatch_template_4s( BlendFuncSeparate, GLenum )
|
||||
#endif /* !MISSING_GL_EXTS */
|
||||
|
||||
void __glXDisp_Color3bv(GLbyte *pc)
|
||||
{
|
||||
|
@ -1131,6 +1133,7 @@ void __glXDisp_TexGend(GLbyte *pc)
|
|||
|
||||
void __glXDisp_TexGendv(GLbyte *pc)
|
||||
{
|
||||
#ifdef __GLX_ALIGN64
|
||||
GLenum pname;
|
||||
GLint cmdlen;
|
||||
GLint compsize;
|
||||
|
@ -1139,8 +1142,6 @@ void __glXDisp_TexGendv(GLbyte *pc)
|
|||
compsize = __glTexGendv_size(pname);
|
||||
if (compsize < 0) compsize = 0;
|
||||
cmdlen = __GLX_PAD(8+compsize*8);
|
||||
|
||||
#ifdef __GLX_ALIGN64
|
||||
if ((unsigned long)(pc) & 7) {
|
||||
__GLX_MEM_COPY(pc-4, pc, cmdlen);
|
||||
pc -= 4;
|
||||
|
@ -2229,6 +2230,8 @@ void __glXDisp_MultiTexCoord4svARB(GLbyte *pc)
|
|||
* Extensions
|
||||
*/
|
||||
|
||||
#ifndef MISSING_GL_EXTS
|
||||
|
||||
void __glXDisp_PointParameterfARB(GLbyte *pc)
|
||||
{
|
||||
glPointParameterfARB(
|
||||
|
@ -2246,8 +2249,14 @@ void __glXDisp_PointParameterfvARB(GLbyte *pc)
|
|||
);
|
||||
}
|
||||
|
||||
#ifdef __DARWIN__
|
||||
#define __glPointParameterivNV_size __glPointParameteriv_size
|
||||
dispatch_template_enum1_1s(PointParameteriNV, GLint)
|
||||
dispatch_template_enum1_Vv(PointParameterivNV, GLint)
|
||||
#else
|
||||
dispatch_template_enum1_1s(PointParameteri, GLint)
|
||||
dispatch_template_enum1_Vv(PointParameteriv, GLint)
|
||||
#endif
|
||||
|
||||
void __glXDisp_ActiveStencilFaceEXT(GLbyte *pc)
|
||||
{
|
||||
|
@ -2264,6 +2273,7 @@ void __glXDisp_WindowPos3fARB(GLbyte *pc)
|
|||
*(GLfloat *)(pc + 8)
|
||||
);
|
||||
}
|
||||
#endif /* !MISSING_GL_EXTS */
|
||||
|
||||
void __glXDisp_SampleCoverageARB(GLbyte *pc)
|
||||
{
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $XFree86: xc/programs/Xserver/GL/glx/g_renderswap.c,v 1.5 2002/01/14 22:47:08 tsi Exp $ */
|
||||
/* $XFree86: xc/programs/Xserver/GL/glx/g_renderswap.c,v 1.8 2004/01/28 18:11:50 alanh Exp $ */
|
||||
/*
|
||||
** License Applicability. Except to the extent portions of this file are
|
||||
** made subject to an alternative license as permitted in the SGI Free
|
||||
|
@ -1570,7 +1570,9 @@ void __glXDispSwap_TexGend(GLbyte *pc)
|
|||
void __glXDispSwap_TexGendv(GLbyte *pc)
|
||||
{
|
||||
GLenum pname;
|
||||
#ifdef __GLX_ALIGN64
|
||||
GLint cmdlen;
|
||||
#endif
|
||||
GLint compsize;
|
||||
__GLX_DECLARE_SWAP_VARIABLES;
|
||||
__GLX_DECLARE_SWAP_ARRAY_VARIABLES;
|
||||
|
@ -1579,9 +1581,9 @@ void __glXDispSwap_TexGendv(GLbyte *pc)
|
|||
pname = *(GLenum *)(pc + 4);
|
||||
compsize = __glTexGendv_size(pname);
|
||||
if (compsize < 0) compsize = 0;
|
||||
cmdlen = __GLX_PAD(8+compsize*8);
|
||||
|
||||
#ifdef __GLX_ALIGN64
|
||||
cmdlen = __GLX_PAD(8+compsize*8);
|
||||
if ((unsigned long)(pc) & 7) {
|
||||
__GLX_MEM_COPY(pc-4, pc, cmdlen);
|
||||
pc -= 4;
|
||||
|
@ -3311,6 +3313,8 @@ void __glXDispSwap_MultiTexCoord4svARB(GLbyte *pc)
|
|||
* Extensions
|
||||
*/
|
||||
|
||||
#ifndef MISSING_GL_EXTS
|
||||
|
||||
void __glXDispSwap_PointParameterfARB(GLbyte *pc)
|
||||
{
|
||||
__GLX_DECLARE_SWAP_VARIABLES;
|
||||
|
@ -3364,6 +3368,7 @@ void __glXDispSwap_WindowPos3fARB(GLbyte *pc)
|
|||
*(GLfloat *)(pc + 8)
|
||||
);
|
||||
}
|
||||
#endif /* !MISSING_GL_EXTS */
|
||||
|
||||
void __glXDispSwap_SampleCoverageARB(GLbyte *pc)
|
||||
{
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $XFree86: xc/programs/Xserver/GL/glx/glxcmds.c,v 1.9 2002/12/14 01:36:09 dawes Exp $ */
|
||||
/* $XFree86: xc/programs/Xserver/GL/glx/glxcmds.c,v 1.12 2004/01/28 18:11:50 alanh Exp $ */
|
||||
/*
|
||||
** License Applicability. Except to the extent portions of this file are
|
||||
** made subject to an alternative license as permitted in the SGI Free
|
||||
|
@ -765,6 +765,8 @@ int __glXQueryVersion(__GLXclientState *cl, GLbyte *pc)
|
|||
|
||||
major = req->majorVersion;
|
||||
minor = req->minorVersion;
|
||||
(void)major;
|
||||
(void)minor;
|
||||
|
||||
/*
|
||||
** Server should take into consideration the version numbers sent by the
|
||||
|
@ -1724,6 +1726,7 @@ int __glXVendorPrivate(__GLXclientState *cl, GLbyte *pc)
|
|||
req = (xGLXVendorPrivateReq *) pc;
|
||||
vendorcode = req->vendorCode;
|
||||
|
||||
#ifndef __DARWIN__
|
||||
switch( vendorcode ) {
|
||||
case X_GLvop_SampleMaskSGIS:
|
||||
glSampleMaskSGIS(*(GLfloat *)(pc + 4),
|
||||
|
@ -1733,7 +1736,7 @@ int __glXVendorPrivate(__GLXclientState *cl, GLbyte *pc)
|
|||
glSamplePatternSGIS( *(GLenum *)(pc + 4));
|
||||
return Success;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
if ((vendorcode >= __GLX_MIN_VENDPRIV_OPCODE_EXT) &&
|
||||
(vendorcode <= __GLX_MAX_VENDPRIV_OPCODE_EXT)) {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $XFree86: xc/programs/Xserver/GL/glx/glxcmdsswap.c,v 1.7 2002/01/14 22:47:08 tsi Exp $ */
|
||||
/* $XFree86: xc/programs/Xserver/GL/glx/glxcmdsswap.c,v 1.10 2004/01/28 18:11:50 alanh Exp $ */
|
||||
/*
|
||||
** License Applicability. Except to the extent portions of this file are
|
||||
** made subject to an alternative license as permitted in the SGI Free
|
||||
|
@ -378,7 +378,7 @@ int __glXSwapQueryContextInfoEXT(__GLXclientState *cl, GLbyte *pc)
|
|||
__GLX_SWAP_SHORT(&req->length);
|
||||
__GLX_SWAP_INT(&req->context);
|
||||
|
||||
return __glXQueryContextInfoEXT(cl, (GLbyte *)pc);
|
||||
return __glXQueryContextInfoEXT(cl, pc);
|
||||
}
|
||||
|
||||
/************************************************************************/
|
||||
|
@ -804,6 +804,7 @@ int __glXSwapVendorPrivate(__GLXclientState *cl, GLbyte *pc)
|
|||
|
||||
vendorcode = req->vendorCode;
|
||||
|
||||
#ifndef __DARWIN__
|
||||
switch( vendorcode ) {
|
||||
case X_GLvop_SampleMaskSGIS:
|
||||
__GLX_SWAP_FLOAT(pc + 4);
|
||||
|
@ -816,6 +817,7 @@ int __glXSwapVendorPrivate(__GLXclientState *cl, GLbyte *pc)
|
|||
glSamplePatternSGIS( *(GLenum *)(pc + 4));
|
||||
return Success;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
if ((vendorcode >= __GLX_MIN_VENDPRIV_OPCODE_EXT) &&
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $XFree86: xc/programs/Xserver/GL/glx/glxext.h,v 1.4 2001/03/21 16:29:36 dawes Exp $ */
|
||||
/* $XFree86: xc/programs/Xserver/GL/glx/glxext.h,v 1.7 2003/11/17 22:20:26 dawes Exp $ */
|
||||
#ifndef _glxext_h_
|
||||
#define _glxext_h_
|
||||
|
||||
|
@ -92,7 +92,6 @@ extern const char GLServerVersion[];
|
|||
extern int DoGetString(__GLXclientState *cl, GLbyte *pc, GLboolean need_swap);
|
||||
|
||||
extern int GlxInitVisuals(
|
||||
#if NeedFunctionPrototypes
|
||||
VisualPtr * visualp,
|
||||
DepthPtr * depthp,
|
||||
int * nvisualp,
|
||||
|
@ -102,7 +101,6 @@ extern int GlxInitVisuals(
|
|||
unsigned long sizes,
|
||||
int bitsPerRGB,
|
||||
int preferredVis
|
||||
#endif
|
||||
);
|
||||
|
||||
#endif /* _glxext_h_ */
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $XFree86: xc/programs/Xserver/GL/glx/glxscreens.c,v 1.11 2003/06/23 17:35:44 eich Exp $ */
|
||||
/* $XFree86: xc/programs/Xserver/GL/glx/glxscreens.c,v 1.14 2004/02/09 23:46:31 alanh Exp $ */
|
||||
/*
|
||||
** License Applicability. Except to the extent portions of this file are
|
||||
** made subject to an alternative license as permitted in the SGI Free
|
||||
|
@ -135,7 +135,9 @@ static char GLXServerExtensions[] =
|
|||
"GLX_EXT_import_context "
|
||||
"GLX_OML_swap_method "
|
||||
"GLX_SGI_make_current_read "
|
||||
#ifndef __DARWIN__
|
||||
"GLX_SGIS_multisample "
|
||||
#endif
|
||||
"GLX_SGIX_fbconfig "
|
||||
;
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef _GLX_screens_h_
|
||||
#define _GLX_screens_h_
|
||||
|
||||
/* $XFree86: xc/programs/Xserver/GL/glx/glxscreens.h,v 1.5 2002/02/22 21:45:07 dawes Exp $ */
|
||||
/* $XFree86: xc/programs/Xserver/GL/glx/glxscreens.h,v 1.4 2001/03/21 16:29:37 dawes Exp $ */
|
||||
/*
|
||||
** License Applicability. Except to the extent portions of this file are
|
||||
** made subject to an alternative license as permitted in the SGI Free
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $XFree86: xc/programs/Xserver/GL/glx/render2.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */
|
||||
/* $XFree86: xc/programs/Xserver/GL/glx/render2.c,v 1.8 2004/02/03 23:04:08 alanh Exp $ */
|
||||
/*
|
||||
** License Applicability. Except to the extent portions of this file are
|
||||
** made subject to an alternative license as permitted in the SGI Free
|
||||
|
@ -82,18 +82,25 @@ void __glXDisp_Map2f(GLbyte *pc)
|
|||
|
||||
void __glXDisp_Map1d(GLbyte *pc)
|
||||
{
|
||||
GLint order, k, compsize;
|
||||
GLint order, k;
|
||||
#ifdef __GLX_ALIGN64
|
||||
GLint compsize;
|
||||
#endif
|
||||
GLenum target;
|
||||
GLdouble u1, u2, *points;
|
||||
|
||||
target = *(GLenum*) (pc + 16);
|
||||
order = *(GLint*) (pc + 20);
|
||||
k = __glEvalComputeK(target);
|
||||
|
||||
#ifdef __GLX_ALIGN64
|
||||
if (order < 0 || k < 0) {
|
||||
compsize = 0;
|
||||
} else {
|
||||
compsize = order * k;
|
||||
}
|
||||
#endif
|
||||
|
||||
__GLX_GET_DOUBLE(u1,pc);
|
||||
__GLX_GET_DOUBLE(u2,pc+8);
|
||||
pc += 24;
|
||||
|
@ -118,18 +125,25 @@ void __glXDisp_Map1d(GLbyte *pc)
|
|||
void __glXDisp_Map2d(GLbyte *pc)
|
||||
{
|
||||
GLdouble u1, u2, v1, v2, *points;
|
||||
GLint uorder, vorder, ustride, vstride, k, compsize;
|
||||
GLint uorder, vorder, ustride, vstride, k;
|
||||
#ifdef __GLX_ALIGN64
|
||||
GLint compsize;
|
||||
#endif
|
||||
GLenum target;
|
||||
|
||||
target = *(GLenum *)(pc + 32);
|
||||
uorder = *(GLint *)(pc + 36);
|
||||
vorder = *(GLint *)(pc + 40);
|
||||
k = __glEvalComputeK(target);
|
||||
|
||||
#ifdef __GLX_ALIGN64
|
||||
if (vorder < 0 || uorder < 0 || k < 0) {
|
||||
compsize = 0;
|
||||
} else {
|
||||
compsize = uorder * vorder * k;
|
||||
}
|
||||
#endif
|
||||
|
||||
__GLX_GET_DOUBLE(u1,pc);
|
||||
__GLX_GET_DOUBLE(u2,pc+8);
|
||||
__GLX_GET_DOUBLE(v1,pc+16);
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $XFree86: xc/programs/Xserver/GL/glx/rensize.c,v 1.5 2002/02/22 21:45:07 dawes Exp $ */
|
||||
/* $XFree86: xc/programs/Xserver/GL/glx/rensize.c,v 1.6 2003/09/28 20:15:43 alanh Exp $ */
|
||||
/*
|
||||
** License Applicability. Except to the extent portions of this file are
|
||||
** made subject to an alternative license as permitted in the SGI Free
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $XFree86: xc/programs/Xserver/GL/glx/single2.c,v 1.6 2001/06/06 19:00:15 dawes Exp $ */
|
||||
/* $XFree86: xc/programs/Xserver/GL/glx/single2.c,v 1.8 2004/02/10 22:54:15 alanh Exp $ */
|
||||
/*
|
||||
** License Applicability. Except to the extent portions of this file are
|
||||
** made subject to an alternative license as permitted in the SGI Free
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $XFree86: xc/programs/Xserver/GL/glx/singlesize.c,v 1.4 2002/02/22 21:45:07 dawes Exp $ */
|
||||
/* $XFree86: xc/programs/Xserver/GL/glx/singlesize.c,v 1.7tsi Exp $ */
|
||||
/*
|
||||
** License Applicability. Except to the extent portions of this file are
|
||||
** made subject to an alternative license as permitted in the SGI Free
|
||||
|
@ -35,6 +35,7 @@
|
|||
*/
|
||||
|
||||
#include <GL/gl.h>
|
||||
#include "glxserver.h"
|
||||
#include "singlesize.h"
|
||||
|
||||
/*
|
||||
|
|
|
@ -1221,7 +1221,7 @@ static XF86ModuleVersionInfo VersRec =
|
|||
MODULEVENDORSTRING,
|
||||
MODINFOSTRING1,
|
||||
MODINFOSTRING2,
|
||||
XF86_VERSION_CURRENT,
|
||||
XORG_VERSION_CURRENT,
|
||||
1, 0, 0,
|
||||
ABI_CLASS_EXTENSION,
|
||||
ABI_EXTENSION_VERSION,
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $XFree86: xc/programs/Xserver/GL/dri/dri.c,v 1.38 2002/11/20 18:10:24 dawes Exp $ */
|
||||
/* $XFree86: xc/programs/Xserver/GL/dri/dri.c,v 1.39 2003/11/10 18:21:41 tsi Exp $ */
|
||||
/**************************************************************************
|
||||
|
||||
Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
|
||||
|
@ -1616,7 +1616,7 @@ DRICopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
|
|||
if(pDRIPriv->nrWindows > 0) {
|
||||
RegionRec reg;
|
||||
|
||||
REGION_INIT(pScreen, ®, NullBox, 0);
|
||||
REGION_NULL(pScreen, ®);
|
||||
TraverseTree(pWin, DRITreeTraversal, (pointer)(®));
|
||||
|
||||
if(REGION_NOTEMPTY(pScreen, ®)) {
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $XFree86: xc/programs/Xserver/GL/dri/dri.h,v 1.19 2002/10/30 12:52:03 alanh Exp $ */
|
||||
/* $XFree86: xc/programs/Xserver/GL/dri/dri.h,v 1.18 2001/03/21 16:21:40 dawes Exp $ */
|
||||
/**************************************************************************
|
||||
|
||||
Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
/* $XFree86: xc/programs/Xserver/GL/dri/dristruct.h,v 1.13 2002/11/20 18:10:24 dawes Exp $ */
|
||||
/* $XFree86: xc/programs/Xserver/GL/dri/dristruct.h,v 1.12 2002/10/30 12:52:03 alanh Exp $ */
|
||||
/**************************************************************************
|
||||
|
||||
Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
|
||||
|
|
|
@ -241,7 +241,7 @@ ProcXF86DRIAuthConnection(
|
|||
rep.authenticated = 1;
|
||||
|
||||
if (!DRIAuthConnection( screenInfo.screens[stuff->screen], stuff->magic)) {
|
||||
ErrorF("Failed to authenticate %u\n", stuff->magic);
|
||||
ErrorF("Failed to authenticate %lu\n", (unsigned long)stuff->magic);
|
||||
rep.authenticated = 0;
|
||||
}
|
||||
WriteToClient(client, sizeof(xXF86DRIAuthConnectionReply), (char *)&rep);
|
||||
|
|
Loading…
Reference in New Issue
Block a user