diff options
Diffstat (limited to 'nx-X11/programs/Xserver')
55 files changed, 2 insertions, 4516 deletions
diff --git a/nx-X11/programs/Xserver/GL/Imakefile b/nx-X11/programs/Xserver/GL/Imakefile index 48059b4dd..19b5902a5 100644 --- a/nx-X11/programs/Xserver/GL/Imakefile +++ b/nx-X11/programs/Xserver/GL/Imakefile @@ -7,10 +7,6 @@ SUBDIRS = glx $(CORE_SUBDIR) -#if DoLoadableServer -MSRCS = glxmodule.c -MOBJS = glxmodule.o -#endif #if BuildModuleInSubdir SRCS = glx/module/?*.c $(MSRCS) diff --git a/nx-X11/programs/Xserver/GL/glx/Imakefile b/nx-X11/programs/Xserver/GL/glx/Imakefile index 7658ea4cf..2ee2d17e6 100644 --- a/nx-X11/programs/Xserver/GL/glx/Imakefile +++ b/nx-X11/programs/Xserver/GL/glx/Imakefile @@ -1,13 +1,5 @@ NULL = -#if DoLoadableServer -# if !BuildModuleInSubdir -# define IHaveModules -# elif !defined(IHaveModules) -# define IHaveSubdirs -SUBDIRS = module -# endif -#endif /* Large PIC tables needed for SPARC builds */ #if defined(sparc) || defined(SparcArchitecture) @@ -131,10 +123,6 @@ XCOMM add DEBUG to the define in ../mesa/src/X/xf86glx.c $(NX_DEFINES) \ $(NULL) -#ifdef IHaveModules -ModuleObjectRule() -LibraryModuleTarget(glx,$(OBJS)) -#else NormalLibraryObjectRule() NormalLibraryTarget(glx,$(OBJS)) #if defined(GlxUseWindows) && GlxUseWindows @@ -145,7 +133,6 @@ includes:: SpecialObjectRule(stdcall/%.o,%.c,-DUSE_OPENGL32 -o $@) NormalLibraryTarget(glx_stdcall,$(foreach obj,$(OBJS), stdcall/$(obj))) #endif -#endif SubdirLibraryRule($(OBJS)) LintLibraryTarget(glx,$(SRCS)) diff --git a/nx-X11/programs/Xserver/GL/glx/glx-def.cpp b/nx-X11/programs/Xserver/GL/glx/glx-def.cpp deleted file mode 100644 index a653f4cb7..000000000 --- a/nx-X11/programs/Xserver/GL/glx/glx-def.cpp +++ /dev/null @@ -1,662 +0,0 @@ -LIBRARY GLX -VERSION LIBRARY_VERSION -EXPORTS -__glXFBInitDrawable -__glXFreeBuffers -__glXPixInitDrawable -__glXResizeBuffers -__glXClientInfo -__glXCopyContext -__glXCreateContext -__glXCreateGLXPixmap -__glXDestroyContext -__glXDestroyGLXPixmap -__glXGetVisualConfigs -__glXIsDirect -__glXLookupContextByTag -__glXMakeCurrent -__glXQueryContextInfoEXT -__glXQueryExtensionsString -__glXQueryServerString -__glXQueryVersion -__glXRender -__glXRenderLarge -__glXSwapBuffers -__glXVendorPrivate -__glXVendorPrivateWithReply -__glXWaitGL -__glXWaitX -__glXSwapClientInfo -__glXSwapCopyContext -__glXSwapCreateContext -__glXSwapCreateGLXPixmap -__glXSwapDestroyContext -__glXSwapDestroyGLXPixmap -__glXSwapGetVisualConfigs -__glXSwapIsDirect -__glXSwapIsDirectReply -__glXSwapMakeCurrent -__glXSwapMakeCurrentReply -__glXSwapQueryContextInfoEXT -__glXSwapQueryContextInfoEXTReply -__glXSwapQueryExtensionsString -__glXSwapQueryServerString -__glXSwapQueryVersion -__glXSwapQueryVersionReply -__glXSwapRender -__glXSwapRenderLarge -__glXSwapSwapBuffers -__glXSwapUseXFont -__glXSwapVendorPrivate -__glXSwapVendorPrivateWithReply -__glXSwapWaitGL -__glXSwapWaitX -glxSwapQueryExtensionsStringReply -glxSwapQueryServerStringReply -GlxExtensionInit -GlxInitVisuals -GlxSetVisualConfigs -GlxWrapInitVisuals -__glXClearErrorOccured -__glXCoreType -__glXErrorCallBack -__glXErrorOccured -__glXFlushContextCache -__glXForceCurrent -__glXFreeContext -__glXNoSuchRenderOpcode -__glXNoSuchSingleOpcode -__glXResetLargeCommandStatus -__glXFBGetGC -__glXFBMemSwapBuffers -__glXInitFB -__glXImpCalloc -__glXImpFatal -__glXImpFclose -__glXImpFopen -__glXImpFprintf -__glXImpFree -__glXImpGetDrawablePrivate -__glXImpGetenv -__glXImpMalloc -__glXImpRealloc -__glXImpSprintf -__glXImpWarning -__glXInitMem -__glXInitPix -__glXScreenInit -__glXAssociateContext -__glXCacheDrawableSize -__glXCalloc -__glXCreateDrawablePrivate -__glXDeassociateContext -__glXDestroyDrawablePrivate -__glXFindDrawablePrivate -__glXFree -__glXGetDrawablePrivate -__glXGetDrawableSize -__glXMalloc -__glXNop -__glXRealloc -__glXRefDrawablePrivate -__glXResizeDrawable -__glXResizeDrawableBuffers -__glXUnrefDrawablePrivate -__glXDisp_CallLists -__glXDisp_DrawArrays -__glXDisp_Map1d -__glXDisp_Map1f -__glXDisp_Map2d -__glXDisp_Map2f -__glXDispSwap_CallLists -__glXDispSwap_DrawArrays -__glXDispSwap_Map1d -__glXDispSwap_Map1f -__glXDispSwap_Map2d -__glXDispSwap_Map2f -__glXDisp_Bitmap -__glXDisp_DrawPixels -__glXDisp_PolygonStipple -__glXDisp_TexImage1D -__glXDisp_TexImage2D -__glXDisp_TexSubImage1D -__glXDisp_TexSubImage2D -__glXDispSwap_Bitmap -__glXDispSwap_DrawPixels -__glXDispSwap_PolygonStipple -__glXDispSwap_TexImage1D -__glXDispSwap_TexImage2D -__glXDispSwap_TexSubImage1D -__glXDispSwap_TexSubImage2D -__glXBitmapReqSize -__glXCallListsReqSize -__glXDrawArraysSize -__glXDrawPixelsReqSize -__glXFogfvReqSize -__glXFogivReqSize -__glXLightModelfvReqSize -__glXLightModelivReqSize -__glXLightfvReqSize -__glXLightivReqSize -__glXMap1dReqSize -__glXMap1fReqSize -__glXMap2dReqSize -__glXMap2fReqSize -__glXMaterialfvReqSize -__glXMaterialivReqSize -__glXPixelMapfvReqSize -__glXPixelMapuivReqSize -__glXPixelMapusvReqSize -__glXPrioritizeTexturesReqSize -__glXTexEnvfvReqSize -__glXTexEnvivReqSize -__glXTexGendvReqSize -__glXTexGenfvReqSize -__glXTexGenivReqSize -__glXTexImage1DReqSize -__glXTexImage2DReqSize -__glXTexParameterfvReqSize -__glXTexParameterivReqSize -__glXTexSubImage1DReqSize -__glXTexSubImage2DReqSize -__glXTypeSize -__glXDisp_FeedbackBuffer -__glXDisp_Finish -__glXDisp_Flush -__glXDisp_GetClipPlane -__glXDisp_GetString -__glXDisp_RenderMode -__glXDisp_SelectBuffer -__glXcombine_strings -__glXDispSwap_FeedbackBuffer -__glXDispSwap_Finish -__glXDispSwap_Flush -__glXDispSwap_GetClipPlane -__glXDispSwap_GetString -__glXDispSwap_RenderMode -__glXDispSwap_SelectBuffer -__glXDisp_GetPolygonStipple -__glXDisp_GetTexImage -__glXDisp_ReadPixels -__glXDispSwap_GetPolygonStipple -__glXDispSwap_GetTexImage -__glXDispSwap_ReadPixels -__glGetBooleanv_size -__glGetDoublev_size -__glGetFloatv_size -__glGetIntegerv_size -__glGetLightfv_size -__glGetLightiv_size -__glGetMap_size -__glGetMapdv_size -__glGetMapfv_size -__glGetMapiv_size -__glGetMaterialfv_size -__glGetMaterialiv_size -__glGetPixelMap_size -__glGetPixelMapfv_size -__glGetPixelMapuiv_size -__glGetPixelMapusv_size -__glGetTexEnvfv_size -__glGetTexEnviv_size -__glGetTexGendv_size -__glGetTexGenfv_size -__glGetTexGeniv_size -__glGetTexImage_size -__glGetTexLevelParameterfv_size -__glGetTexLevelParameteriv_size -__glGetTexParameterfv_size -__glGetTexParameteriv_size -__glGet_size -__glReadPixels_size -__glXUseXFont -__glXDisp_Accum -__glXDisp_AlphaFunc -__glXDisp_Begin -__glXDisp_BindTexture -__glXDisp_BlendFunc -__glXDisp_CallList -__glXDisp_Clear -__glXDisp_ClearAccum -__glXDisp_ClearColor -__glXDisp_ClearDepth -__glXDisp_ClearIndex -__glXDisp_ClearStencil -__glXDisp_ClipPlane -__glXDisp_Color3bv -__glXDisp_Color3dv -__glXDisp_Color3fv -__glXDisp_Color3iv -__glXDisp_Color3sv -__glXDisp_Color3ubv -__glXDisp_Color3uiv -__glXDisp_Color3usv -__glXDisp_Color4bv -__glXDisp_Color4dv -__glXDisp_Color4fv -__glXDisp_Color4iv -__glXDisp_Color4sv -__glXDisp_Color4ubv -__glXDisp_Color4uiv -__glXDisp_Color4usv -__glXDisp_ColorMask -__glXDisp_ColorMaterial -__glXDisp_CopyPixels -__glXDisp_CopyTexImage1D -__glXDisp_CopyTexImage2D -__glXDisp_CopyTexSubImage1D -__glXDisp_CopyTexSubImage2D -__glXDisp_CullFace -__glXDisp_DepthFunc -__glXDisp_DepthMask -__glXDisp_DepthRange -__glXDisp_Disable -__glXDisp_DrawBuffer -__glXDisp_EdgeFlagv -__glXDisp_Enable -__glXDisp_End -__glXDisp_EvalCoord1dv -__glXDisp_EvalCoord1fv -__glXDisp_EvalCoord2dv -__glXDisp_EvalCoord2fv -__glXDisp_EvalMesh1 -__glXDisp_EvalMesh2 -__glXDisp_EvalPoint1 -__glXDisp_EvalPoint2 -__glXDisp_Fogf -__glXDisp_Fogfv -__glXDisp_Fogi -__glXDisp_Fogiv -__glXDisp_FrontFace -__glXDisp_Frustum -__glXDisp_Hint -__glXDisp_IndexMask -__glXDisp_Indexdv -__glXDisp_Indexfv -__glXDisp_Indexiv -__glXDisp_Indexsv -__glXDisp_Indexubv -__glXDisp_InitNames -__glXDisp_LightModelf -__glXDisp_LightModelfv -__glXDisp_LightModeli -__glXDisp_LightModeliv -__glXDisp_Lightf -__glXDisp_Lightfv -__glXDisp_Lighti -__glXDisp_Lightiv -__glXDisp_LineStipple -__glXDisp_LineWidth -__glXDisp_ListBase -__glXDisp_LoadIdentity -__glXDisp_LoadMatrixd -__glXDisp_LoadMatrixf -__glXDisp_LoadName -__glXDisp_LogicOp -__glXDisp_MapGrid1d -__glXDisp_MapGrid1f -__glXDisp_MapGrid2d -__glXDisp_MapGrid2f -__glXDisp_Materialf -__glXDisp_Materialfv -__glXDisp_Materiali -__glXDisp_Materialiv -__glXDisp_MatrixMode -__glXDisp_MultMatrixd -__glXDisp_MultMatrixf -__glXDisp_Normal3bv -__glXDisp_Normal3dv -__glXDisp_Normal3fv -__glXDisp_Normal3iv -__glXDisp_Normal3sv -__glXDisp_Ortho -__glXDisp_PassThrough -__glXDisp_PixelMapfv -__glXDisp_PixelMapuiv -__glXDisp_PixelMapusv -__glXDisp_PixelTransferf -__glXDisp_PixelTransferi -__glXDisp_PixelZoom -__glXDisp_PointSize -__glXDisp_PolygonMode -__glXDisp_PolygonOffset -__glXDisp_PopAttrib -__glXDisp_PopMatrix -__glXDisp_PopName -__glXDisp_PrioritizeTextures -__glXDisp_PushAttrib -__glXDisp_PushMatrix -__glXDisp_PushName -__glXDisp_RasterPos2dv -__glXDisp_RasterPos2fv -__glXDisp_RasterPos2iv -__glXDisp_RasterPos2sv -__glXDisp_RasterPos3dv -__glXDisp_RasterPos3fv -__glXDisp_RasterPos3iv -__glXDisp_RasterPos3sv -__glXDisp_RasterPos4dv -__glXDisp_RasterPos4fv -__glXDisp_RasterPos4iv -__glXDisp_RasterPos4sv -__glXDisp_ReadBuffer -__glXDisp_Rectdv -__glXDisp_Rectfv -__glXDisp_Rectiv -__glXDisp_Rectsv -__glXDisp_Rotated -__glXDisp_Rotatef -__glXDisp_Scaled -__glXDisp_Scalef -__glXDisp_Scissor -__glXDisp_ShadeModel -__glXDisp_StencilFunc -__glXDisp_StencilMask -__glXDisp_StencilOp -__glXDisp_TexCoord1dv -__glXDisp_TexCoord1fv -__glXDisp_TexCoord1iv -__glXDisp_TexCoord1sv -__glXDisp_TexCoord2dv -__glXDisp_TexCoord2fv -__glXDisp_TexCoord2iv -__glXDisp_TexCoord2sv -__glXDisp_TexCoord3dv -__glXDisp_TexCoord3fv -__glXDisp_TexCoord3iv -__glXDisp_TexCoord3sv -__glXDisp_TexCoord4dv -__glXDisp_TexCoord4fv -__glXDisp_TexCoord4iv -__glXDisp_TexCoord4sv -__glXDisp_TexEnvf -__glXDisp_TexEnvfv -__glXDisp_TexEnvi -__glXDisp_TexEnviv -__glXDisp_TexGend -__glXDisp_TexGendv -__glXDisp_TexGenf -__glXDisp_TexGenfv -__glXDisp_TexGeni -__glXDisp_TexGeniv -__glXDisp_TexParameterf -__glXDisp_TexParameterfv -__glXDisp_TexParameteri -__glXDisp_TexParameteriv -__glXDisp_Translated -__glXDisp_Translatef -__glXDisp_Vertex2dv -__glXDisp_Vertex2fv -__glXDisp_Vertex2iv -__glXDisp_Vertex2sv -__glXDisp_Vertex3dv -__glXDisp_Vertex3fv -__glXDisp_Vertex3iv -__glXDisp_Vertex3sv -__glXDisp_Vertex4dv -__glXDisp_Vertex4fv -__glXDisp_Vertex4iv -__glXDisp_Vertex4sv -__glXDisp_Viewport -__glXDispSwap_Accum -__glXDispSwap_AlphaFunc -__glXDispSwap_Begin -__glXDispSwap_BindTexture -__glXDispSwap_BlendFunc -__glXDispSwap_CallList -__glXDispSwap_Clear -__glXDispSwap_ClearAccum -__glXDispSwap_ClearColor -__glXDispSwap_ClearDepth -__glXDispSwap_ClearIndex -__glXDispSwap_ClearStencil -__glXDispSwap_ClipPlane -__glXDispSwap_Color3bv -__glXDispSwap_Color3dv -__glXDispSwap_Color3fv -__glXDispSwap_Color3iv -__glXDispSwap_Color3sv -__glXDispSwap_Color3ubv -__glXDispSwap_Color3uiv -__glXDispSwap_Color3usv -__glXDispSwap_Color4bv -__glXDispSwap_Color4dv -__glXDispSwap_Color4fv -__glXDispSwap_Color4iv -__glXDispSwap_Color4sv -__glXDispSwap_Color4ubv -__glXDispSwap_Color4uiv -__glXDispSwap_Color4usv -__glXDispSwap_ColorMask -__glXDispSwap_ColorMaterial -__glXDispSwap_CopyPixels -__glXDispSwap_CopyTexImage1D -__glXDispSwap_CopyTexImage2D -__glXDispSwap_CopyTexSubImage1D -__glXDispSwap_CopyTexSubImage2D -__glXDispSwap_CullFace -__glXDispSwap_DepthFunc -__glXDispSwap_DepthMask -__glXDispSwap_DepthRange -__glXDispSwap_Disable -__glXDispSwap_DrawBuffer -__glXDispSwap_EdgeFlagv -__glXDispSwap_Enable -__glXDispSwap_End -__glXDispSwap_EvalCoord1dv -__glXDispSwap_EvalCoord1fv -__glXDispSwap_EvalCoord2dv -__glXDispSwap_EvalCoord2fv -__glXDispSwap_EvalMesh1 -__glXDispSwap_EvalMesh2 -__glXDispSwap_EvalPoint1 -__glXDispSwap_EvalPoint2 -__glXDispSwap_Fogf -__glXDispSwap_Fogfv -__glXDispSwap_Fogi -__glXDispSwap_Fogiv -__glXDispSwap_FrontFace -__glXDispSwap_Frustum -__glXDispSwap_Hint -__glXDispSwap_IndexMask -__glXDispSwap_Indexdv -__glXDispSwap_Indexfv -__glXDispSwap_Indexiv -__glXDispSwap_Indexsv -__glXDispSwap_Indexubv -__glXDispSwap_InitNames -__glXDispSwap_LightModelf -__glXDispSwap_LightModelfv -__glXDispSwap_LightModeli -__glXDispSwap_LightModeliv -__glXDispSwap_Lightf -__glXDispSwap_Lightfv -__glXDispSwap_Lighti -__glXDispSwap_Lightiv -__glXDispSwap_LineStipple -__glXDispSwap_LineWidth -__glXDispSwap_ListBase -__glXDispSwap_LoadIdentity -__glXDispSwap_LoadMatrixd -__glXDispSwap_LoadMatrixf -__glXDispSwap_LoadName -__glXDispSwap_LogicOp -__glXDispSwap_MapGrid1d -__glXDispSwap_MapGrid1f -__glXDispSwap_MapGrid2d -__glXDispSwap_MapGrid2f -__glXDispSwap_Materialf -__glXDispSwap_Materialfv -__glXDispSwap_Materiali -__glXDispSwap_Materialiv -__glXDispSwap_MatrixMode -__glXDispSwap_MultMatrixd -__glXDispSwap_MultMatrixf -__glXDispSwap_Normal3bv -__glXDispSwap_Normal3dv -__glXDispSwap_Normal3fv -__glXDispSwap_Normal3iv -__glXDispSwap_Normal3sv -__glXDispSwap_Ortho -__glXDispSwap_PassThrough -__glXDispSwap_PixelMapfv -__glXDispSwap_PixelMapuiv -__glXDispSwap_PixelMapusv -__glXDispSwap_PixelTransferf -__glXDispSwap_PixelTransferi -__glXDispSwap_PixelZoom -__glXDispSwap_PointSize -__glXDispSwap_PolygonMode -__glXDispSwap_PolygonOffset -__glXDispSwap_PopAttrib -__glXDispSwap_PopMatrix -__glXDispSwap_PopName -__glXDispSwap_PrioritizeTextures -__glXDispSwap_PushAttrib -__glXDispSwap_PushMatrix -__glXDispSwap_PushName -__glXDispSwap_RasterPos2dv -__glXDispSwap_RasterPos2fv -__glXDispSwap_RasterPos2iv -__glXDispSwap_RasterPos2sv -__glXDispSwap_RasterPos3dv -__glXDispSwap_RasterPos3fv -__glXDispSwap_RasterPos3iv -__glXDispSwap_RasterPos3sv -__glXDispSwap_RasterPos4dv -__glXDispSwap_RasterPos4fv -__glXDispSwap_RasterPos4iv -__glXDispSwap_RasterPos4sv -__glXDispSwap_ReadBuffer -__glXDispSwap_Rectdv -__glXDispSwap_Rectfv -__glXDispSwap_Rectiv -__glXDispSwap_Rectsv -__glXDispSwap_Rotated -__glXDispSwap_Rotatef -__glXDispSwap_Scaled -__glXDispSwap_Scalef -__glXDispSwap_Scissor -__glXDispSwap_ShadeModel -__glXDispSwap_StencilFunc -__glXDispSwap_StencilMask -__glXDispSwap_StencilOp -__glXDispSwap_TexCoord1dv -__glXDispSwap_TexCoord1fv -__glXDispSwap_TexCoord1iv -__glXDispSwap_TexCoord1sv -__glXDispSwap_TexCoord2dv -__glXDispSwap_TexCoord2fv -__glXDispSwap_TexCoord2iv -__glXDispSwap_TexCoord2sv -__glXDispSwap_TexCoord3dv -__glXDispSwap_TexCoord3fv -__glXDispSwap_TexCoord3iv -__glXDispSwap_TexCoord3sv -__glXDispSwap_TexCoord4dv -__glXDispSwap_TexCoord4fv -__glXDispSwap_TexCoord4iv -__glXDispSwap_TexCoord4sv -__glXDispSwap_TexEnvf -__glXDispSwap_TexEnvfv -__glXDispSwap_TexEnvi -__glXDispSwap_TexEnviv -__glXDispSwap_TexGend -__glXDispSwap_TexGendv -__glXDispSwap_TexGenf -__glXDispSwap_TexGenfv -__glXDispSwap_TexGeni -__glXDispSwap_TexGeniv -__glXDispSwap_TexParameterf -__glXDispSwap_TexParameterfv -__glXDispSwap_TexParameteri -__glXDispSwap_TexParameteriv -__glXDispSwap_Translated -__glXDispSwap_Translatef -__glXDispSwap_Vertex2dv -__glXDispSwap_Vertex2fv -__glXDispSwap_Vertex2iv -__glXDispSwap_Vertex2sv -__glXDispSwap_Vertex3dv -__glXDispSwap_Vertex3fv -__glXDispSwap_Vertex3iv -__glXDispSwap_Vertex3sv -__glXDispSwap_Vertex4dv -__glXDispSwap_Vertex4fv -__glXDispSwap_Vertex4iv -__glXDispSwap_Vertex4sv -__glXDispSwap_Viewport -__glXDisp_AreTexturesResident -__glXDisp_DeleteLists -__glXDisp_DeleteTextures -__glXDisp_EndList -__glXDisp_GenLists -__glXDisp_GenTextures -__glXDisp_GetBooleanv -__glXDisp_GetDoublev -__glXDisp_GetError -__glXDisp_GetFloatv -__glXDisp_GetIntegerv -__glXDisp_GetLightfv -__glXDisp_GetLightiv -__glXDisp_GetMapdv -__glXDisp_GetMapfv -__glXDisp_GetMapiv -__glXDisp_GetMaterialfv -__glXDisp_GetMaterialiv -__glXDisp_GetPixelMapfv -__glXDisp_GetPixelMapuiv -__glXDisp_GetPixelMapusv -__glXDisp_GetTexEnvfv -__glXDisp_GetTexEnviv -__glXDisp_GetTexGendv -__glXDisp_GetTexGenfv -__glXDisp_GetTexGeniv -__glXDisp_GetTexLevelParameterfv -__glXDisp_GetTexLevelParameteriv -__glXDisp_GetTexParameterfv -__glXDisp_GetTexParameteriv -__glXDisp_IsEnabled -__glXDisp_IsList -__glXDisp_IsTexture -__glXDisp_NewList -__glXDisp_PixelStoref -__glXDisp_PixelStorei -__glXDispSwap_AreTexturesResident -__glXDispSwap_DeleteLists -__glXDispSwap_DeleteTextures -__glXDispSwap_EndList -__glXDispSwap_GenLists -__glXDispSwap_GenTextures -__glXDispSwap_GetBooleanv -__glXDispSwap_GetDoublev -__glXDispSwap_GetError -__glXDispSwap_GetFloatv -__glXDispSwap_GetIntegerv -__glXDispSwap_GetLightfv -__glXDispSwap_GetLightiv -__glXDispSwap_GetMapdv -__glXDispSwap_GetMapfv -__glXDispSwap_GetMapiv -__glXDispSwap_GetMaterialfv -__glXDispSwap_GetMaterialiv -__glXDispSwap_GetPixelMapfv -__glXDispSwap_GetPixelMapuiv -__glXDispSwap_GetPixelMapusv -__glXDispSwap_GetTexEnvfv -__glXDispSwap_GetTexEnviv -__glXDispSwap_GetTexGendv -__glXDispSwap_GetTexGenfv -__glXDispSwap_GetTexGeniv -__glXDispSwap_GetTexLevelParameterfv -__glXDispSwap_GetTexLevelParameteriv -__glXDispSwap_GetTexParameterfv -__glXDispSwap_GetTexParameteriv -__glXDispSwap_IsEnabled -__glXDispSwap_IsList -__glXDispSwap_IsTexture -__glXDispSwap_NewList -__glXDispSwap_PixelStoref -__glXDispSwap_PixelStorei - -/* $XFree86$ */ diff --git a/nx-X11/programs/Xserver/GL/glxmodule.c b/nx-X11/programs/Xserver/GL/glxmodule.c deleted file mode 100644 index 8e6e0dfd3..000000000 --- a/nx-X11/programs/Xserver/GL/glxmodule.c +++ /dev/null @@ -1,1269 +0,0 @@ -/************************************************************************** - -Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. -All Rights Reserved. - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sub license, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice (including the -next paragraph) shall be included in all copies or substantial portions -of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. -IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR -ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -**************************************************************************/ - -/* - * Authors: - * Kevin E. Martin <kevin@precisioninsight.com> - * - */ - -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - -#include "xf86Module.h" -#include "colormap.h" -#include "micmap.h" -#include "globals.h" - -static MODULESETUPPROTO(glxSetup); - -extern void GlxExtensionInit(void); -extern void GlxWrapInitVisuals(miInitVisualsProcPtr *); -extern void InitGlxWrapInitVisuals(void (*f)(miInitVisualsProcPtr *)); - -static const char *initdeps[] = { "DOUBLE-BUFFER", NULL }; - -ExtensionModule GLXExt = -{ - GlxExtensionInit, - "GLX", - &noGlxExtension, - NULL, - initdeps -}; - -static const char *glcoreSymbols[] = { - "__glCallLists_size", - "__glColorTableParameterfv_size", - "__glColorTableParameteriv_size", - "__glConvolutionParameterfv_size", - "__glConvolutionParameteriv_size", - "__glDDXExtensionInfo", - "__glDDXScreenInfo", - "__glFloorLog2", - "__glFogfv_size", - "__glFogiv_size", - "__glGetBooleanv_size", - "__glGetColorTableParameterfv_size", - "__glGetColorTableParameteriv_size", - "__glGetConvolutionParameterfv_size", - "__glGetConvolutionParameteriv_size", - "__glGetDoublev_size", - "__glGetFloatv_size", - "__glGetHistogramParameterfv_size", - "__glGetHistogramParameteriv_size", - "__glGetIntegerv_size", - "__glGetLightfv_size", - "__glGetLightiv_size", - "__glGetMapdv_size", - "__glGetMapfv_size", - "__glGetMapiv_size", - "__glGetMaterialfv_size", - "__glGetMaterialiv_size", - "__glGetMinmaxParameterfv_size", - "__glGetMinmaxParameteriv_size", - "__glGetPixelMapfv_size", - "__glGetPixelMapuiv_size", - "__glGetPixelMapusv_size", - "__glGetTexEnvfv_size", - "__glGetTexEnviv_size", - "__glGetTexGendv_size", - "__glGetTexGenfv_size", - "__glGetTexGeniv_size", - "__glGetTexImage_size", - "__glGetTexLevelParameterfv_size", - "__glGetTexLevelParameteriv_size", - "__glGetTexParameterfv_size", - "__glGetTexParameteriv_size", - "__glLightModelfv_size", - "__glLightModeliv_size", - "__glLightfv_size", - "__glLightiv_size", - "__glMaterialfv_size", - "__glMaterialiv_size", - "__glPointParameterfvARB_size", - "__glReadPixels_size", - "__glTexEnvfv_size", - "__glTexEnviv_size", - "__glTexGendv_size", - "__glTexGenfv_size", - "__glTexGeniv_size", - "__glTexParameterfv_size", - "__glTexParameteriv_size", - "__glXglDDXExtensionInfo", - "__glXglDDXScreenInfo", - "__glXActiveScreens", - "__glXAssociateContext", - "__glXBadContext", - "__glXBadContextState", - "__glXBadContextTag", - "__glXBadCurrentWindow", - "__glXBadDrawable", - "__glXBadLargeRequest", - "__glXBadPixmap", - "__glXBadRenderRequest", - "__glXBitmapReqSize", - "__glXCacheDrawableSize", - "__glXCallListsReqSize", - "__glXClearErrorOccured", - "__glXClientInfo", - "__glXClientRes", - "__glXClients", - "__glXColorSubTableReqSize", - "__glXColorTableParameterfvReqSize", - "__glXColorTableParameterivReqSize", - "__glXColorTableReqSize", - "__glXContextRes", - "__glXConvolutionFilter1DReqSize", - "__glXConvolutionFilter2DReqSize", - "__glXConvolutionParameterfvReqSize", - "__glXConvolutionParameterivReqSize", - "__glXCopyContext", - "__glXCoreType", - "__glXCreateContext", - "__glXCreateGLXPixmap", - "__glXDeassociateContext", - "__glXDestroyContext", - "__glXDestroyGLXPixmap", - "__glXDispSwap_Accum", - "__glXDispSwap_ActiveStencilFaceEXT", - "__glXDispSwap_ActiveTextureARB", - "__glXDispSwap_AlphaFunc", - "__glXDispSwap_AreTexturesResident", - "__glXDispSwap_AreTexturesResidentEXT", - "__glXDispSwap_Begin", - "__glXDispSwap_BindTexture", - "__glXDispSwap_Bitmap", - "__glXDispSwap_BlendColor", - "__glXDispSwap_BlendEquation", - "__glXDispSwap_BlendFunc", - "__glXDispSwap_CallList", - "__glXDispSwap_CallLists", - "__glXDispSwap_Clear", - "__glXDispSwap_ClearAccum", - "__glXDispSwap_ClearColor", - "__glXDispSwap_ClearDepth", - "__glXDispSwap_ClearIndex", - "__glXDispSwap_ClearStencil", - "__glXDispSwap_ClipPlane", - "__glXDispSwap_Color3bv", - "__glXDispSwap_Color3dv", - "__glXDispSwap_Color3fv", - "__glXDispSwap_Color3iv", - "__glXDispSwap_Color3sv", - "__glXDispSwap_Color3ubv", - "__glXDispSwap_Color3uiv", - "__glXDispSwap_Color3usv", - "__glXDispSwap_Color4bv", - "__glXDispSwap_Color4dv", - "__glXDispSwap_Color4fv", - "__glXDispSwap_Color4iv", - "__glXDispSwap_Color4sv", - "__glXDispSwap_Color4ubv", - "__glXDispSwap_Color4uiv", - "__glXDispSwap_Color4usv", - "__glXDispSwap_ColorMask", - "__glXDispSwap_ColorMaterial", - "__glXDispSwap_ColorSubTable", - "__glXDispSwap_ColorTable", - "__glXDispSwap_ColorTableParameterfv", - "__glXDispSwap_ColorTableParameteriv", - "__glXDispSwap_ConvolutionFilter1D", - "__glXDispSwap_ConvolutionFilter2D", - "__glXDispSwap_ConvolutionParameterf", - "__glXDispSwap_ConvolutionParameterfv", - "__glXDispSwap_ConvolutionParameteri", - "__glXDispSwap_ConvolutionParameteriv", - "__glXDispSwap_CopyColorSubTable", - "__glXDispSwap_CopyColorTable", - "__glXDispSwap_CopyConvolutionFilter1D", - "__glXDispSwap_CopyConvolutionFilter2D", - "__glXDispSwap_CopyPixels", - "__glXDispSwap_CopyTexImage1D", - "__glXDispSwap_CopyTexImage2D", - "__glXDispSwap_CopyTexSubImage1D", - "__glXDispSwap_CopyTexSubImage2D", - "__glXDispSwap_CopyTexSubImage3D", - "__glXDispSwap_CullFace", - "__glXDispSwap_DeleteLists", - "__glXDispSwap_DeleteTextures", - "__glXDispSwap_DeleteTexturesEXT", - "__glXDispSwap_DepthFunc", - "__glXDispSwap_DepthMask", - "__glXDispSwap_DepthRange", - "__glXDispSwap_Disable", - "__glXDispSwap_DrawArrays", - "__glXDispSwap_DrawArraysEXT", - "__glXDispSwap_DrawBuffer", - "__glXDispSwap_DrawPixels", - "__glXDispSwap_EdgeFlagv", - "__glXDispSwap_Enable", - "__glXDispSwap_End", - "__glXDispSwap_EndList", - "__glXDispSwap_EvalCoord1dv", - "__glXDispSwap_EvalCoord1fv", - "__glXDispSwap_EvalCoord2dv", - "__glXDispSwap_EvalCoord2fv", - "__glXDispSwap_EvalMesh1", - "__glXDispSwap_EvalMesh2", - "__glXDispSwap_EvalPoint1", - "__glXDispSwap_EvalPoint2", - "__glXDispSwap_FeedbackBuffer", - "__glXDispSwap_Finish", - "__glXDispSwap_Flush", - "__glXDispSwap_Fogf", - "__glXDispSwap_Fogfv", - "__glXDispSwap_Fogi", - "__glXDispSwap_Fogiv", - "__glXDispSwap_FrontFace", - "__glXDispSwap_Frustum", - "__glXDispSwap_GenLists", - "__glXDispSwap_GenTextures", - "__glXDispSwap_GenTexturesEXT", - "__glXDispSwap_GetBooleanv", - "__glXDispSwap_GetClipPlane", - "__glXDispSwap_GetColorTable", - "__glXDispSwap_GetColorTableParameterfv", - "__glXDispSwap_GetColorTableParameteriv", - "__glXDispSwap_GetConvolutionFilter", - "__glXDispSwap_GetConvolutionParameterfv", - "__glXDispSwap_GetConvolutionParameteriv", - "__glXDispSwap_GetDoublev", - "__glXDispSwap_GetError", - "__glXDispSwap_GetFloatv", - "__glXDispSwap_GetHistogram", - "__glXDispSwap_GetHistogramParameterfv", - "__glXDispSwap_GetHistogramParameteriv", - "__glXDispSwap_GetIntegerv", - "__glXDispSwap_GetLightfv", - "__glXDispSwap_GetLightiv", - "__glXDispSwap_GetMapdv", - "__glXDispSwap_GetMapfv", - "__glXDispSwap_GetMapiv", - "__glXDispSwap_GetMaterialfv", - "__glXDispSwap_GetMaterialiv", - "__glXDispSwap_GetMinmax", - "__glXDispSwap_GetMinmaxParameterfv", - "__glXDispSwap_GetMinmaxParameteriv", - "__glXDispSwap_GetPixelMapfv", - "__glXDispSwap_GetPixelMapuiv", - "__glXDispSwap_GetPixelMapusv", - "__glXDispSwap_GetPolygonStipple", - "__glXDispSwap_GetSeparableFilter", - "__glXDispSwap_GetString", - "__glXDispSwap_GetTexEnvfv", - "__glXDispSwap_GetTexEnviv", - "__glXDispSwap_GetTexGendv", - "__glXDispSwap_GetTexGenfv", - "__glXDispSwap_GetTexGeniv", - "__glXDispSwap_GetTexImage", - "__glXDispSwap_GetTexLevelParameterfv", - "__glXDispSwap_GetTexLevelParameteriv", - "__glXDispSwap_GetTexParameterfv", - "__glXDispSwap_GetTexParameteriv", - "__glXDispSwap_Hint", - "__glXDispSwap_Histogram", - "__glXDispSwap_IndexMask", - "__glXDispSwap_Indexdv", - "__glXDispSwap_Indexfv", - "__glXDispSwap_Indexiv", - "__glXDispSwap_Indexsv", - "__glXDispSwap_Indexubv", - "__glXDispSwap_InitNames", - "__glXDispSwap_IsEnabled", - "__glXDispSwap_IsList", - "__glXDispSwap_IsTexture", - "__glXDispSwap_IsTextureEXT", - "__glXDispSwap_LightModelf", - "__glXDispSwap_LightModelfv", - "__glXDispSwap_LightModeli", - "__glXDispSwap_LightModeliv", - "__glXDispSwap_Lightf", - "__glXDispSwap_Lightfv", - "__glXDispSwap_Lighti", - "__glXDispSwap_Lightiv", - "__glXDispSwap_LineStipple", - "__glXDispSwap_LineWidth", - "__glXDispSwap_ListBase", - "__glXDispSwap_LoadIdentity", - "__glXDispSwap_LoadMatrixd", - "__glXDispSwap_LoadMatrixf", - "__glXDispSwap_LoadName", - "__glXDispSwap_LogicOp", - "__glXDispSwap_Map1d", - "__glXDispSwap_Map1f", - "__glXDispSwap_Map2d", - "__glXDispSwap_Map2f", - "__glXDispSwap_MapGrid1d", - "__glXDispSwap_MapGrid1f", - "__glXDispSwap_MapGrid2d", - "__glXDispSwap_MapGrid2f", - "__glXDispSwap_Materialf", - "__glXDispSwap_Materialfv", - "__glXDispSwap_Materiali", - "__glXDispSwap_Materialiv", - "__glXDispSwap_MatrixMode", - "__glXDispSwap_Minmax", - "__glXDispSwap_MultMatrixd", - "__glXDispSwap_MultMatrixf", - "__glXDispSwap_MultiTexCoord1dvARB", - "__glXDispSwap_MultiTexCoord1fvARB", - "__glXDispSwap_MultiTexCoord1ivARB", - "__glXDispSwap_MultiTexCoord1svARB", - "__glXDispSwap_MultiTexCoord2dvARB", - "__glXDispSwap_MultiTexCoord2fvARB", - "__glXDispSwap_MultiTexCoord2ivARB", - "__glXDispSwap_MultiTexCoord2svARB", - "__glXDispSwap_MultiTexCoord3dvARB", - "__glXDispSwap_MultiTexCoord3fvARB", - "__glXDispSwap_MultiTexCoord3ivARB", - "__glXDispSwap_MultiTexCoord3svARB", - "__glXDispSwap_MultiTexCoord4dvARB", - "__glXDispSwap_MultiTexCoord4fvARB", - "__glXDispSwap_MultiTexCoord4ivARB", - "__glXDispSwap_MultiTexCoord4svARB", - "__glXDispSwap_NewList", - "__glXDispSwap_Normal3bv", - "__glXDispSwap_Normal3dv", - "__glXDispSwap_Normal3fv", - "__glXDispSwap_Normal3iv", - "__glXDispSwap_Normal3sv", - "__glXDispSwap_Ortho", - "__glXDispSwap_PassThrough", - "__glXDispSwap_PixelMapfv", - "__glXDispSwap_PixelMapuiv", - "__glXDispSwap_PixelMapusv", - "__glXDispSwap_PixelStoref", - "__glXDispSwap_PixelStorei", - "__glXDispSwap_PixelTransferf", - "__glXDispSwap_PixelTransferi", - "__glXDispSwap_PixelZoom", - "__glXDispSwap_PointParameterfARB", - "__glXDispSwap_PointParameterfvARB", - "__glXDispSwap_PointSize", - "__glXDispSwap_PolygonMode", - "__glXDispSwap_PolygonOffset", - "__glXDispSwap_PolygonStipple", - "__glXDispSwap_PopAttrib", - "__glXDispSwap_PopMatrix", - "__glXDispSwap_PopName", - "__glXDispSwap_PrioritizeTextures", - "__glXDispSwap_PushAttrib", - "__glXDispSwap_PushMatrix", - "__glXDispSwap_PushName", - "__glXDispSwap_RasterPos2dv", - "__glXDispSwap_RasterPos2fv", - "__glXDispSwap_RasterPos2iv", - "__glXDispSwap_RasterPos2sv", - "__glXDispSwap_RasterPos3dv", - "__glXDispSwap_RasterPos3fv", - "__glXDispSwap_RasterPos3iv", - "__glXDispSwap_RasterPos3sv", - "__glXDispSwap_RasterPos4dv", - "__glXDispSwap_RasterPos4fv", - "__glXDispSwap_RasterPos4iv", - "__glXDispSwap_RasterPos4sv", - "__glXDispSwap_ReadBuffer", - "__glXDispSwap_ReadPixels", - "__glXDispSwap_Rectdv", - "__glXDispSwap_Rectfv", - "__glXDispSwap_Rectiv", - "__glXDispSwap_Rectsv", - "__glXDispSwap_RenderMode", - "__glXDispSwap_ResetHistogram", - "__glXDispSwap_ResetMinmax", - "__glXDispSwap_Rotated", - "__glXDispSwap_Rotatef", - "__glXDispSwap_Scaled", - "__glXDispSwap_Scalef", - "__glXDispSwap_Scissor", - "__glXDispSwap_SelectBuffer", - "__glXDispSwap_SeparableFilter2D", - "__glXDispSwap_ShadeModel", - "__glXDispSwap_StencilFunc", - "__glXDispSwap_StencilMask", - "__glXDispSwap_StencilOp", - "__glXDispSwap_TexCoord1dv", - "__glXDispSwap_TexCoord1fv", - "__glXDispSwap_TexCoord1iv", - "__glXDispSwap_TexCoord1sv", - "__glXDispSwap_TexCoord2dv", - "__glXDispSwap_TexCoord2fv", - "__glXDispSwap_TexCoord2iv", - "__glXDispSwap_TexCoord2sv", - "__glXDispSwap_TexCoord3dv", - "__glXDispSwap_TexCoord3fv", - "__glXDispSwap_TexCoord3iv", - "__glXDispSwap_TexCoord3sv", - "__glXDispSwap_TexCoord4dv", - "__glXDispSwap_TexCoord4fv", - "__glXDispSwap_TexCoord4iv", - "__glXDispSwap_TexCoord4sv", - "__glXDispSwap_TexEnvf", - "__glXDispSwap_TexEnvfv", - "__glXDispSwap_TexEnvi", - "__glXDispSwap_TexEnviv", - "__glXDispSwap_TexGend", - "__glXDispSwap_TexGendv", - "__glXDispSwap_TexGenf", - "__glXDispSwap_TexGenfv", - "__glXDispSwap_TexGeni", - "__glXDispSwap_TexGeniv", - "__glXDispSwap_TexImage1D", - "__glXDispSwap_TexImage2D", - "__glXDispSwap_TexImage3D", - "__glXDispSwap_TexParameterf", - "__glXDispSwap_TexParameterfv", - "__glXDispSwap_TexParameteri", - "__glXDispSwap_TexParameteriv", - "__glXDispSwap_TexSubImage1D", - "__glXDispSwap_TexSubImage2D", - "__glXDispSwap_TexSubImage3D", - "__glXDispSwap_Translated", - "__glXDispSwap_Translatef", - "__glXDispSwap_Vertex2dv", - "__glXDispSwap_Vertex2fv", - "__glXDispSwap_Vertex2iv", - "__glXDispSwap_Vertex2sv", - "__glXDispSwap_Vertex3dv", - "__glXDispSwap_Vertex3fv", - "__glXDispSwap_Vertex3iv", - "__glXDispSwap_Vertex3sv", - "__glXDispSwap_Vertex4dv", - "__glXDispSwap_Vertex4fv", - "__glXDispSwap_Vertex4iv", - "__glXDispSwap_Vertex4sv", - "__glXDispSwap_Viewport", - "__glXDispSwap_WindowPos3fARB", - "__glXDisp_Accum", - "__glXDisp_ActiveStencilFaceEXT", - "__glXDisp_ActiveTextureARB", - "__glXDisp_AlphaFunc", - "__glXDisp_AreTexturesResident", - "__glXDisp_AreTexturesResidentEXT", - "__glXDisp_Begin", - "__glXDisp_BindTexture", - "__glXDisp_Bitmap", - "__glXDisp_BlendColor", - "__glXDisp_BlendEquation", - "__glXDisp_BlendFunc", - "__glXDisp_CallList", - "__glXDisp_CallLists", - "__glXDisp_Clear", - "__glXDisp_ClearAccum", - "__glXDisp_ClearColor", - "__glXDisp_ClearDepth", - "__glXDisp_ClearIndex", - "__glXDisp_ClearStencil", - "__glXDisp_ClipPlane", - "__glXDisp_Color3bv", - "__glXDisp_Color3dv", - "__glXDisp_Color3fv", - "__glXDisp_Color3iv", - "__glXDisp_Color3sv", - "__glXDisp_Color3ubv", - "__glXDisp_Color3uiv", - "__glXDisp_Color3usv", - "__glXDisp_Color4bv", - "__glXDisp_Color4dv", - "__glXDisp_Color4fv", - "__glXDisp_Color4iv", - "__glXDisp_Color4sv", - "__glXDisp_Color4ubv", - "__glXDisp_Color4uiv", - "__glXDisp_Color4usv", - "__glXDisp_ColorMask", - "__glXDisp_ColorMaterial", - "__glXDisp_ColorSubTable", - "__glXDisp_ColorTable", - "__glXDisp_ColorTableParameterfv", - "__glXDisp_ColorTableParameteriv", - "__glXDisp_ConvolutionFilter1D", - "__glXDisp_ConvolutionFilter2D", - "__glXDisp_ConvolutionParameterf", - "__glXDisp_ConvolutionParameterfv", - "__glXDisp_ConvolutionParameteri", - "__glXDisp_ConvolutionParameteriv", - "__glXDisp_CopyColorSubTable", - "__glXDisp_CopyColorTable", - "__glXDisp_CopyConvolutionFilter1D", - "__glXDisp_CopyConvolutionFilter2D", - "__glXDisp_CopyPixels", - "__glXDisp_CopyTexImage1D", - "__glXDisp_CopyTexImage2D", - "__glXDisp_CopyTexSubImage1D", - "__glXDisp_CopyTexSubImage2D", - "__glXDisp_CopyTexSubImage3D", - "__glXDisp_CullFace", - "__glXDisp_DeleteLists", - "__glXDisp_DeleteTextures", - "__glXDisp_DeleteTexturesEXT", - "__glXDisp_DepthFunc", - "__glXDisp_DepthMask", - "__glXDisp_DepthRange", - "__glXDisp_Disable", - "__glXDisp_DrawArrays", - "__glXDisp_DrawArraysEXT", - "__glXDisp_DrawBuffer", - "__glXDisp_DrawPixels", - "__glXDisp_EdgeFlagv", - "__glXDisp_Enable", - "__glXDisp_End", - "__glXDisp_EndList", - "__glXDisp_EvalCoord1dv", - "__glXDisp_EvalCoord1fv", - "__glXDisp_EvalCoord2dv", - "__glXDisp_EvalCoord2fv", - "__glXDisp_EvalMesh1", - "__glXDisp_EvalMesh2", - "__glXDisp_EvalPoint1", - "__glXDisp_EvalPoint2", - "__glXDisp_FeedbackBuffer", - "__glXDisp_Finish", - "__glXDisp_Flush", - "__glXDisp_Fogf", - "__glXDisp_Fogfv", - "__glXDisp_Fogi", - "__glXDisp_Fogiv", - "__glXDisp_FrontFace", - "__glXDisp_Frustum", - "__glXDisp_GenLists", - "__glXDisp_GenTextures", - "__glXDisp_GenTexturesEXT", - "__glXDisp_GetBooleanv", - "__glXDisp_GetClipPlane", - "__glXDisp_GetColorTable", - "__glXDisp_GetColorTableParameterfv", - "__glXDisp_GetColorTableParameteriv", - "__glXDisp_GetConvolutionFilter", - "__glXDisp_GetConvolutionParameterfv", - "__glXDisp_GetConvolutionParameteriv", - "__glXDisp_GetDoublev", - "__glXDisp_GetError", - "__glXDisp_GetFloatv", - "__glXDisp_GetHistogram", - "__glXDisp_GetHistogramParameterfv", - "__glXDisp_GetHistogramParameteriv", - "__glXDisp_GetIntegerv", - "__glXDisp_GetLightfv", - "__glXDisp_GetLightiv", - "__glXDisp_GetMapdv", - "__glXDisp_GetMapfv", - "__glXDisp_GetMapiv", - "__glXDisp_GetMaterialfv", - "__glXDisp_GetMaterialiv", - "__glXDisp_GetMinmax", - "__glXDisp_GetMinmaxParameterfv", - "__glXDisp_GetMinmaxParameteriv", - "__glXDisp_GetPixelMapfv", - "__glXDisp_GetPixelMapuiv", - "__glXDisp_GetPixelMapusv", - "__glXDisp_GetPolygonStipple", - "__glXDisp_GetSeparableFilter", - "__glXDisp_GetString", - "__glXDisp_GetTexEnvfv", - "__glXDisp_GetTexEnviv", - "__glXDisp_GetTexGendv", - "__glXDisp_GetTexGenfv", - "__glXDisp_GetTexGeniv", - "__glXDisp_GetTexImage", - "__glXDisp_GetTexLevelParameterfv", - "__glXDisp_GetTexLevelParameteriv", - "__glXDisp_GetTexParameterfv", - "__glXDisp_GetTexParameteriv", - "__glXDisp_Hint", - "__glXDisp_Histogram", - "__glXDisp_IndexMask", - "__glXDisp_Indexdv", - "__glXDisp_Indexfv", - "__glXDisp_Indexiv", - "__glXDisp_Indexsv", - "__glXDisp_Indexubv", - "__glXDisp_InitNames", - "__glXDisp_IsEnabled", - "__glXDisp_IsList", - "__glXDisp_IsTexture", - "__glXDisp_IsTextureEXT", - "__glXDisp_LightModelf", - "__glXDisp_LightModelfv", - "__glXDisp_LightModeli", - "__glXDisp_LightModeliv", - "__glXDisp_Lightf", - "__glXDisp_Lightfv", - "__glXDisp_Lighti", - "__glXDisp_Lightiv", - "__glXDisp_LineStipple", - "__glXDisp_LineWidth", - "__glXDisp_ListBase", - "__glXDisp_LoadIdentity", - "__glXDisp_LoadMatrixd", - "__glXDisp_LoadMatrixf", - "__glXDisp_LoadName", - "__glXDisp_LogicOp", - "__glXDisp_Map1d", - "__glXDisp_Map1f", - "__glXDisp_Map2d", - "__glXDisp_Map2f", - "__glXDisp_MapGrid1d", - "__glXDisp_MapGrid1f", - "__glXDisp_MapGrid2d", - "__glXDisp_MapGrid2f", - "__glXDisp_Materialf", - "__glXDisp_Materialfv", - "__glXDisp_Materiali", - "__glXDisp_Materialiv", - "__glXDisp_MatrixMode", - "__glXDisp_Minmax", - "__glXDisp_MultMatrixd", - "__glXDisp_MultMatrixf", - "__glXDisp_MultiTexCoord1dvARB", - "__glXDisp_MultiTexCoord1fvARB", - "__glXDisp_MultiTexCoord1ivARB", - "__glXDisp_MultiTexCoord1svARB", - "__glXDisp_MultiTexCoord2dvARB", - "__glXDisp_MultiTexCoord2fvARB", - "__glXDisp_MultiTexCoord2ivARB", - "__glXDisp_MultiTexCoord2svARB", - "__glXDisp_MultiTexCoord3dvARB", - "__glXDisp_MultiTexCoord3fvARB", - "__glXDisp_MultiTexCoord3ivARB", - "__glXDisp_MultiTexCoord3svARB", - "__glXDisp_MultiTexCoord4dvARB", - "__glXDisp_MultiTexCoord4fvARB", - "__glXDisp_MultiTexCoord4ivARB", - "__glXDisp_MultiTexCoord4svARB", - "__glXDisp_NewList", - "__glXDisp_Normal3bv", - "__glXDisp_Normal3dv", - "__glXDisp_Normal3fv", - "__glXDisp_Normal3iv", - "__glXDisp_Normal3sv", - "__glXDisp_Ortho", - "__glXDisp_PassThrough", - "__glXDisp_PixelMapfv", - "__glXDisp_PixelMapuiv", - "__glXDisp_PixelMapusv", - "__glXDisp_PixelStoref", - "__glXDisp_PixelStorei", - "__glXDisp_PixelTransferf", - "__glXDisp_PixelTransferi", - "__glXDisp_PixelZoom", - "__glXDisp_PointParameterfARB", - "__glXDisp_PointParameterfvARB", - "__glXDisp_PointSize", - "__glXDisp_PolygonMode", - "__glXDisp_PolygonOffset", - "__glXDisp_PolygonStipple", - "__glXDisp_PopAttrib", - "__glXDisp_PopMatrix", - "__glXDisp_PopName", - "__glXDisp_PrioritizeTextures", - "__glXDisp_PushAttrib", - "__glXDisp_PushMatrix", - "__glXDisp_PushName", - "__glXDisp_RasterPos2dv", - "__glXDisp_RasterPos2fv", - "__glXDisp_RasterPos2iv", - "__glXDisp_RasterPos2sv", - "__glXDisp_RasterPos3dv", - "__glXDisp_RasterPos3fv", - "__glXDisp_RasterPos3iv", - "__glXDisp_RasterPos3sv", - "__glXDisp_RasterPos4dv", - "__glXDisp_RasterPos4fv", - "__glXDisp_RasterPos4iv", - "__glXDisp_RasterPos4sv", - "__glXDisp_ReadBuffer", - "__glXDisp_ReadPixels", - "__glXDisp_Rectdv", - "__glXDisp_Rectfv", - "__glXDisp_Rectiv", - "__glXDisp_Rectsv", - "__glXDisp_RenderMode", - "__glXDisp_ResetHistogram", - "__glXDisp_ResetMinmax", - "__glXDisp_Rotated", - "__glXDisp_Rotatef", - "__glXDisp_Scaled", - "__glXDisp_Scalef", - "__glXDisp_Scissor", - "__glXDisp_SelectBuffer", - "__glXDisp_SeparableFilter2D", - "__glXDisp_ShadeModel", - "__glXDisp_StencilFunc", - "__glXDisp_StencilMask", - "__glXDisp_StencilOp", - "__glXDisp_TexCoord1dv", - "__glXDisp_TexCoord1fv", - "__glXDisp_TexCoord1iv", - "__glXDisp_TexCoord1sv", - "__glXDisp_TexCoord2dv", - "__glXDisp_TexCoord2fv", - "__glXDisp_TexCoord2iv", - "__glXDisp_TexCoord2sv", - "__glXDisp_TexCoord3dv", - "__glXDisp_TexCoord3fv", - "__glXDisp_TexCoord3iv", - "__glXDisp_TexCoord3sv", - "__glXDisp_TexCoord4dv", - "__glXDisp_TexCoord4fv", - "__glXDisp_TexCoord4iv", - "__glXDisp_TexCoord4sv", - "__glXDisp_TexEnvf", - "__glXDisp_TexEnvfv", - "__glXDisp_TexEnvi", - "__glXDisp_TexEnviv", - "__glXDisp_TexGend", - "__glXDisp_TexGendv", - "__glXDisp_TexGenf", - "__glXDisp_TexGenfv", - "__glXDisp_TexGeni", - "__glXDisp_TexGeniv", - "__glXDisp_TexImage1D", - "__glXDisp_TexImage2D", - "__glXDisp_TexImage3D", - "__glXDisp_TexParameterf", - "__glXDisp_TexParameterfv", - "__glXDisp_TexParameteri", - "__glXDisp_TexParameteriv", - "__glXDisp_TexSubImage1D", - "__glXDisp_TexSubImage2D", - "__glXDisp_TexSubImage3D", - "__glXDisp_Translated", - "__glXDisp_Translatef", - "__glXDisp_Vertex2dv", - "__glXDisp_Vertex2fv", - "__glXDisp_Vertex2iv", - "__glXDisp_Vertex2sv", - "__glXDisp_Vertex3dv", - "__glXDisp_Vertex3fv", - "__glXDisp_Vertex3iv", - "__glXDisp_Vertex3sv", - "__glXDisp_Vertex4dv", - "__glXDisp_Vertex4fv", - "__glXDisp_Vertex4iv", - "__glXDisp_Vertex4sv", - "__glXDisp_Viewport", - "__glXDisp_WindowPos3fARB", - "__glXDrawArraysSize", - "__glXDrawPixelsReqSize", - "__glXDrawableRes", - "__glXErrorOccured", - "__glXFBInitDrawable", - "__glXFBMemSwapBuffers", - "__glXFindDrawablePrivate", - "__glXFogfvReqSize", - "__glXFogivReqSize", - "__glXForceCurrent", - "__glXFree", - "__glXFreeBuffers", - "__glXFreeContext", - "__glXGetDrawablePrivate", - "__glXGetVisualConfigs", - "__glXImageSize", - "__glXImpAtoi", - "__glXImpCalloc", - "__glXImpFatal", - "__glXImpFclose", - "__glXImpFopen", - "__glXImpFprintf", - "__glXImpFree", - "__glXImpGetDrawablePrivate", - "__glXImpGetenv", - "__glXImpMalloc", - "__glXImpRealloc", - "__glXImpSprintf", - "__glXImpWarning", - "__glXInitFB", - "__glXInitMem", - "__glXInitPix", - "__glXIsDirect", - "__glXLastContext", - "__glXLightModelfvReqSize", - "__glXLightModelivReqSize", - "__glXLightfvReqSize", - "__glXLightivReqSize", - "__glXLookupContextByTag", - "__glXMakeCurrent", - "__glXMalloc", - "__glXMap1dReqSize", - "__glXMap1fReqSize", - "__glXMap2dReqSize", - "__glXMap2fReqSize", - "__glXMaterialfvReqSize", - "__glXMaterialivReqSize", - "__glXNoSuchRenderOpcode", - "__glXNoSuchSingleOpcode", - "__glXNop", - "__glXPixInitDrawable", - "__glXPixelMapfvReqSize", - "__glXPixelMapuivReqSize", - "__glXPixelMapusvReqSize", - "__glXPixmapRes", - "__glXPrioritizeTexturesReqSize", - "__glXQueryContextInfoEXT", - "__glXQueryExtensionsString", - "__glXQueryServerString", - "__glXQueryVersion", - "__glXRealloc", - "__glXRender", - "__glXRenderLarge", - "__glXRenderSizeTable", - "__glXRenderSizeTable_EXT", - "__glXRenderTable", - "__glXRenderTable_EXT", - "__glXReply", - "__glXResetLargeCommandStatus", - "__glXResizeBuffers", - "__glXResizeDrawableBuffers", - "__glXScreenInit", - "__glXScreenReset", - "__glXSeparableFilter2DReqSize", - "__glXSingleTable", - "__glXSwapBuffers", - "__glXSwapClientInfo", - "__glXSwapCopyContext", - "__glXSwapCreateContext", - "__glXSwapCreateGLXPixmap", - "__glXSwapDestroyContext", - "__glXSwapDestroyGLXPixmap", - "__glXSwapGetVisualConfigs", - "__glXSwapIsDirect", - "__glXSwapIsDirectReply", - "__glXSwapMakeCurrent", - "__glXSwapMakeCurrentReply", - "__glXSwapQueryContextInfoEXTReply", - "__glXSwapQueryExtensionsString", - "__glXSwapQueryServerString", - "__glXSwapQueryVersion", - "__glXSwapQueryVersionReply", - "__glXSwapRender", - "__glXSwapRenderLarge", - "__glXSwapRenderTable", - "__glXSwapRenderTable_EXT", - "__glXSwapSingleTable", - "__glXSwapSwapBuffers", - "__glXSwapUseXFont", - "__glXSwapVendorPrivTable_EXT", - "__glXSwapVendorPrivate", - "__glXSwapVendorPrivateWithReply", - "__glXSwapWaitGL", - "__glXSwapWaitX", - "__glXTexEnvfvReqSize", - "__glXTexEnvivReqSize", - "__glXTexGendvReqSize", - "__glXTexGenfvReqSize", - "__glXTexGenivReqSize", - "__glXTexImage1DReqSize", - "__glXTexImage2DReqSize", - "__glXTexImage3DReqSize", - "__glXTexParameterfvReqSize", - "__glXTexParameterivReqSize", - "__glXTexSubImage1DReqSize", - "__glXTexSubImage2DReqSize", - "__glXTexSubImage3DReqSize", - "__glXTypeSize", - "__glXUnrefDrawablePrivate", - "__glXUnsupportedPrivateRequest", - "__glXUseXFont", - "__glXVendorPrivTable_EXT", - "__glXVendorPrivate", - "__glXVendorPrivateWithReply", - "__glXWaitGL", - "__glXWaitX", - "__glXcombine_strings", - "glAccum", - "glActiveStencilFaceEXT", - "glActiveTextureARB", - "glAlphaFunc", - "glAreTexturesResident", - "glAreTexturesResidentEXT", - "glBegin", - "glBindTexture", - "glBitmap", - "glBlendColor", - "glBlendEquation", - "glBlendFunc", - "glCallList", - "glCallLists", - "glClear", - "glClearAccum", - "glClearColor", - "glClearDepth", - "glClearIndex", - "glClearStencil", - "glClipPlane", - "glColor3bv", - "glColor3dv", - "glColor3fv", - "glColor3iv", - "glColor3sv", - "glColor3ubv", - "glColor3uiv", - "glColor3usv", - "glColor4bv", - "glColor4dv", - "glColor4fv", - "glColor4iv", - "glColor4sv", - "glColor4ubv", - "glColor4uiv", - "glColor4usv", - "glColorMask", - "glColorMaterial", - "glColorPointer", - "glColorSubTable", - "glColorTable", - "glColorTableParameterfv", - "glColorTableParameteriv", - "glConvolutionFilter1D", - "glConvolutionFilter2D", - "glConvolutionParameterf", - "glConvolutionParameterfv", - "glConvolutionParameteri", - "glConvolutionParameteriv", - "glCopyColorSubTable", - "glCopyColorTable", - "glCopyConvolutionFilter1D", - "glCopyConvolutionFilter2D", - "glCopyPixels", - "glCopyTexImage1D", - "glCopyTexImage2D", - "glCopyTexSubImage1D", - "glCopyTexSubImage2D", - "glCopyTexSubImage3D", - "glCullFace", - "glDeleteLists", - "glDeleteTextures", - "glDeleteTexturesEXT", - "glDepthFunc", - "glDepthMask", - "glDepthRange", - "glDisable", - "glDisableClientState", - "glDrawArrays", - "glDrawBuffer", - "glDrawPixels", - "glEdgeFlagPointer", - "glEdgeFlagv", - "glEnable", - "glEnableClientState", - "glEnd", - "glEndList", - "glEvalCoord1dv", - "glEvalCoord1fv", - "glEvalCoord2dv", - "glEvalCoord2fv", - "glEvalMesh1", - "glEvalMesh2", - "glEvalPoint1", - "glEvalPoint2", - "glFeedbackBuffer", - "glFinish", - "glFlush", - "glFogf", - "glFogfv", - "glFogi", - "glFogiv", - "glFrontFace", - "glFrustum", - "glGenLists", - "glGenTextures", - "glGenTexturesEXT", - "glGetBooleanv", - "glGetClipPlane", - "glGetColorTable", - "glGetColorTableParameterfv", - "glGetColorTableParameteriv", - "glGetConvolutionFilter", - "glGetConvolutionParameterfv", - "glGetConvolutionParameteriv", - "glGetDoublev", - "glGetError", - "glGetFloatv", - "glGetHistogram", - "glGetHistogramParameterfv", - "glGetHistogramParameteriv", - "glGetIntegerv", - "glGetLightfv", - "glGetLightiv", - "glGetMapdv", - "glGetMapfv", - "glGetMapiv", - "glGetMaterialfv", - "glGetMaterialiv", - "glGetMinmax", - "glGetMinmaxParameterfv", - "glGetMinmaxParameteriv", - "glGetPixelMapfv", - "glGetPixelMapuiv", - "glGetPixelMapusv", - "glGetPolygonStipple", - "glGetSeparableFilter", - "glGetString", - "glGetTexEnvfv", - "glGetTexEnviv", - "glGetTexGendv", - "glGetTexGenfv", - "glGetTexGeniv", - "glGetTexImage", - "glGetTexLevelParameterfv", - "glGetTexLevelParameteriv", - "glGetTexParameterfv", - "glGetTexParameteriv", - "glHint", - "glHistogram", - "glIndexMask", - "glIndexPointer", - "glIndexdv", - "glIndexfv", - "glIndexiv", - "glIndexsv", - "glIndexubv", - "glInitNames", - "glIsEnabled", - "glIsList", - "glIsTexture", - "glIsTextureEXT", - "glLightModelf", - "glLightModelfv", - "glLightModeli", - "glLightModeliv", - "glLightf", - "glLightfv", - "glLighti", - "glLightiv", - "glLineStipple", - "glLineWidth", - "glListBase", - "glLoadIdentity", - "glLoadMatrixd", - "glLoadMatrixf", - "glLoadName", - "glLogicOp", - "glMap1d", - "glMap1f", - "glMap2d", - "glMap2f", - "glMapGrid1d", - "glMapGrid1f", - "glMapGrid2d", - "glMapGrid2f", - "glMaterialf", - "glMaterialfv", - "glMateriali", - "glMaterialiv", - "glMatrixMode", - "glMinmax", - "glMultMatrixd", - "glMultMatrixf", - "glMultiTexCoord1dvARB", - "glMultiTexCoord1fvARB", - "glMultiTexCoord1ivARB", - "glMultiTexCoord1svARB", - "glMultiTexCoord2dvARB", - "glMultiTexCoord2fvARB", - "glMultiTexCoord2ivARB", - "glMultiTexCoord2svARB", - "glMultiTexCoord3dvARB", - "glMultiTexCoord3fvARB", - "glMultiTexCoord3ivARB", - "glMultiTexCoord3svARB", - "glMultiTexCoord4dvARB", - "glMultiTexCoord4fvARB", - "glMultiTexCoord4ivARB", - "glMultiTexCoord4svARB", - "glNewList", - "glNormal3bv", - "glNormal3dv", - "glNormal3fv", - "glNormal3iv", - "glNormal3sv", - "glNormalPointer", - "glOrtho", - "glPassThrough", - "glPixelMapfv", - "glPixelMapuiv", - "glPixelMapusv", - "glPixelStoref", - "glPixelStorei", - "glPixelTransferf", - "glPixelTransferi", - "glPixelZoom", - "glPointParameterfARB", - "glPointParameterfvARB", - "glPointSize", - "glPolygonMode", - "glPolygonOffset", - "glPolygonStipple", - "glPopAttrib", - "glPopMatrix", - "glPopName", - "glPrioritizeTextures", - "glPushAttrib", - "glPushMatrix", - "glPushName", - "glRasterPos2dv", - "glRasterPos2fv", - "glRasterPos2iv", - "glRasterPos2sv", - "glRasterPos3dv", - "glRasterPos3fv", - "glRasterPos3iv", - "glRasterPos3sv", - "glRasterPos4dv", - "glRasterPos4fv", - "glRasterPos4iv", - "glRasterPos4sv", - "glReadBuffer", - "glReadPixels", - "glRectdv", - "glRectfv", - "glRectiv", - "glRectsv", - "glRenderMode", - "glResetHistogram", - "glResetMinmax", - "glRotated", - "glRotatef", - "glScaled", - "glScalef", - "glScissor", - "glSelectBuffer", - "glSeparableFilter2D", - "glShadeModel", - "glStencilFunc", - "glStencilMask", - "glStencilOp", - "glTexCoord1dv", - "glTexCoord1fv", - "glTexCoord1iv", - "glTexCoord1sv", - "glTexCoord2dv", - "glTexCoord2fv", - "glTexCoord2iv", - "glTexCoord2sv", - "glTexCoord3dv", - "glTexCoord3fv", - "glTexCoord3iv", - "glTexCoord3sv", - "glTexCoord4dv", - "glTexCoord4fv", - "glTexCoord4iv", - "glTexCoord4sv", - "glTexCoordPointer", - "glTexEnvf", - "glTexEnvfv", - "glTexEnvi", - "glTexEnviv", - "glTexGend", - "glTexGendv", - "glTexGenf", - "glTexGenfv", - "glTexGeni", - "glTexGeniv", - "glTexImage1D", - "glTexImage2D", - "glTexImage3D", - "glTexParameterf", - "glTexParameterfv", - "glTexParameteri", - "glTexParameteriv", - "glTexSubImage1D", - "glTexSubImage2D", - "glTexSubImage3D", - "glTranslated", - "glTranslatef", - "glVertex2dv", - "glVertex2fv", - "glVertex2iv", - "glVertex2sv", - "glVertex3dv", - "glVertex3fv", - "glVertex3iv", - "glVertex3sv", - "glVertex4dv", - "glVertex4fv", - "glVertex4iv", - "glVertex4sv", - "glVertexPointer", - "glViewport", - "glWindowPos3fARB", - "glxSwapQueryExtensionsStringReply", - "glxSwapQueryServerStringReply", - NULL -}; - -static XF86ModuleVersionInfo VersRec = -{ - "glx", - MODULEVENDORSTRING, - MODINFOSTRING1, - MODINFOSTRING2, - XORG_VERSION_CURRENT, - 1, 0, 0, - ABI_CLASS_EXTENSION, - ABI_EXTENSION_VERSION, - MOD_CLASS_NONE, - {0,0,0,0} -}; - -XF86ModuleData glxModuleData = { &VersRec, glxSetup, NULL }; - -static void * -glxSetup(void * module, void * opts, int *errmaj, int *errmin) -{ - static Bool setupDone = FALSE; - void * GLcore = NULL; -#ifdef GLX_USE_SGI_SI - char GLcoreName[] = "GL"; -#else - char GLcoreName[] = "GLcore"; -#endif - - if (!setupDone) { - setupDone = TRUE; - - GLcore = LoadSubModule(module, GLcoreName, NULL, NULL, NULL, NULL, - errmaj, errmin); - if (!GLcore) { - if (errmaj) *errmaj = LDR_NOSUBENT; - } else { - LoaderReqSymLists(glcoreSymbols, NULL); - LoadExtension(&GLXExt, FALSE); - /* Wrap the init visuals routine in micmap.c */ - GlxWrapInitVisuals(&miInitVisualsProc); - /* Make sure this gets wrapped each time InitVisualWrap is called */ - miHookInitVisuals(NULL, GlxWrapInitVisuals); - } - } else { - if (errmaj) *errmaj = LDR_ONCEONLY; - } - /* Need a non-NULL return value to indicate success */ - return GLcore; -} diff --git a/nx-X11/programs/Xserver/GL/mesa/GLcore/GLcore-def.cpp b/nx-X11/programs/Xserver/GL/mesa/GLcore/GLcore-def.cpp deleted file mode 100644 index 206ce85fb..000000000 --- a/nx-X11/programs/Xserver/GL/mesa/GLcore/GLcore-def.cpp +++ /dev/null @@ -1,1461 +0,0 @@ -LIBRARY GLcore -VERSION LIBRARY_VERSION -EXPORTS - -_mesa_set_aa_triangle_function -_mesa_Accum -_mesa_ClearAccum -_mesa_alloc_accum_buffer -_mesa_clear_accum_buffer -_mesa_AlphaFunc -_mesa_alpha_test -_mesa_alloc_alpha_buffers -_mesa_clear_alpha_buffers -_mesa_read_alpha_pixels -_mesa_read_alpha_span -_mesa_write_alpha_pixels -_mesa_write_alpha_span -_mesa_write_mono_alpha_pixels -_mesa_write_mono_alpha_span -_mesa_PopAttrib -_mesa_PopClientAttrib -_mesa_PushAttrib -_mesa_PushClientAttrib -_mesa_Bitmap -_mesa_BlendColor -_mesa_BlendEquation -_mesa_BlendFunc -_mesa_BlendFuncSeparateEXT -_mesa_blend_pixels -_mesa_blend_span -_mesa_Clear -_mesa_ClearColor -_mesa_ClearIndex -_mesa_DrawBuffer -_mesa_ReadBuffer -_mesa_ResizeBuffersMESA -_mesa_ClipPlane -_mesa_GetClipPlane -gl_init_clip -gl_update_clipmask -gl_update_userclip -gl_user_cliptest -gl_userclip_point -gl_viewclip_point -_mesa_ColorSubTable -_mesa_ColorTable -_mesa_ColorTableParameterfv -_mesa_ColorTableParameteriv -_mesa_CopyColorSubTable -_mesa_CopyColorTable -_mesa_GetColorTable -_mesa_GetColorTableParameterfv -_mesa_GetColorTableParameteriv -_mesa_free_colortable_data -_mesa_init_colortable -gl_read_config_file -gl_register_config_var -_mesa_Finish -_mesa_Flush -_mesa_create_visual -_mesa_destroy_visual -_mesa_get_dispatch -_mesa_initialize_context -_mesa_initialize_framebuffer -_mesa_initialize_visual -_mesa_swapbuffers -gl_compile_error -gl_context_initialize -gl_copy_context -gl_create_context -gl_create_framebuffer -gl_create_visual -gl_destroy_context -gl_destroy_framebuffer -gl_destroy_visual -gl_error -gl_free_context_data -gl_get_current_context -gl_make_current -gl_make_current2 -gl_problem -gl_warning -_mesa_CopyPixels -_mesa_LockArraysEXT -_mesa_UnlockArraysEXT -gl_alloc_cva_store -gl_cva_compile_cassette -gl_cva_force_precalc -gl_cva_init -gl_free_cva_store -gl_merge_cva -gl_prepare_arrays_cva -gl_rescue_cva -_mesa_ClearDepth -_mesa_DepthFunc -_mesa_DepthMask -_mesa_alloc_depth_buffer -_mesa_clear_depth_buffer -_mesa_depth_test_pixels -_mesa_depth_test_span -_mesa_read_depth_span -_mesa_read_depth_span_float -_mesa_zbuffer_address -glAccum -glActiveTextureARB -glAlphaFunc -glAreTexturesResident -glAreTexturesResidentEXT -glArrayElement -glArrayElementEXT -glBegin -glBindTexture -glBindTextureEXT -glBitmap -glBlendColor -glBlendColorEXT -glBlendEquation -glBlendEquationEXT -glBlendFunc -glBlendFuncSeparateEXT -glBlendFuncSeparateINGR -glCallList -glCallLists -glClear -glClearAccum -glClearColor -glClearDepth -glClearIndex -glClearStencil -glClientActiveTextureARB -glClipPlane -glColor3b -glColor3bv -glColor3d -glColor3dv -glColor3f -glColor3fv -glColor3i -glColor3iv -glColor3s -glColor3sv -glColor3ub -glColor3ubv -glColor3ui -glColor3uiv -glColor3us -glColor3usv -glColor4b -glColor4bv -glColor4d -glColor4dv -glColor4f -glColor4fv -glColor4i -glColor4iv -glColor4s -glColor4sv -glColor4ub -glColor4ubv -glColor4ui -glColor4uiv -glColor4us -glColor4usv -glColorMask -glColorMaterial -glColorPointer -glColorPointerEXT -glColorSubTable -glColorSubTableEXT -glColorTable -glColorTableEXT -glColorTableParameterfv -glColorTableParameterfvSGI -glColorTableParameteriv -glColorTableParameterivSGI -glColorTableSGI -glCombinerInputNV -glCombinerOutputNV -glCombinerParameterfNV -glCombinerParameterfvNV -glCombinerParameteriNV -glCombinerParameterivNV -glCompressedTexImage1DARB -glCompressedTexImage2DARB -glCompressedTexImage3DARB -glCompressedTexSubImage1DARB -glCompressedTexSubImage2DARB -glCompressedTexSubImage3DARB -glConvolutionFilter1D -glConvolutionFilter1DEXT -glConvolutionFilter2D -glConvolutionFilter2DEXT -glConvolutionParameterf -glConvolutionParameterfEXT -glConvolutionParameterfv -glConvolutionParameterfvEXT -glConvolutionParameteri -glConvolutionParameteriEXT -glConvolutionParameteriv -glConvolutionParameterivEXT -glCopyColorSubTable -glCopyColorSubTableEXT -glCopyColorTable -glCopyColorTableSGI -glCopyConvolutionFilter1D -glCopyConvolutionFilter1DEXT -glCopyConvolutionFilter2D -glCopyConvolutionFilter2DEXT -glCopyPixels -glCopyTexImage1D -glCopyTexImage1DEXT -glCopyTexImage2D -glCopyTexImage2DEXT -glCopyTexSubImage1D -glCopyTexSubImage1DEXT -glCopyTexSubImage2D -glCopyTexSubImage2DEXT -glCopyTexSubImage3D -glCopyTexSubImage3DEXT -glCullFace -glCullParameterdvEXT -glCullParameterfvEXT -glDeleteLists -glDeleteTextures -glDeleteTexturesEXT -glDepthFunc -glDepthMask -glDepthRange -glDetailTexFuncSGIS -glDisable -glDisableClientState -glDrawArrays -glDrawArraysEXT -glDrawBuffer -glDrawElements -glDrawPixels -glDrawRangeElements -glDrawRangeElementsEXT -glEdgeFlag -glEdgeFlagPointer -glEdgeFlagPointerEXT -glEdgeFlagv -glEnable -glEnableClientState -glEnd -glEndList -glEvalCoord1d -glEvalCoord1dv -glEvalCoord1f -glEvalCoord1fv -glEvalCoord2d -glEvalCoord2dv -glEvalCoord2f -glEvalCoord2fv -glEvalMesh1 -glEvalMesh2 -glEvalPoint1 -glEvalPoint2 -glFeedbackBuffer -glFinalCombinerInputNV -glFinish -glFlush -glFlushRasterSGIX -glFlushVertexArrayRangeNV -glFogCoordPointerEXT -glFogCoorddEXT -glFogCoorddvEXT -glFogCoordfEXT -glFogCoordfvEXT -glFogf -glFogfv -glFogi -glFogiv -glFragmentColorMaterialSGIX -glFragmentLightModelfSGIX -glFragmentLightModelfvSGIX -glFragmentLightModeliSGIX -glFragmentLightModelivSGIX -glFragmentLightfSGIX -glFragmentLightfvSGIX -glFragmentLightiSGIX -glFragmentLightivSGIX -glFragmentMaterialfSGIX -glFragmentMaterialfvSGIX -glFragmentMaterialiSGIX -glFragmentMaterialivSGIX -glFrameZoomSGIX -glFrontFace -glFrustum -glGenLists -glGenTextures -glGenTexturesEXT -glGetBooleanv -glGetClipPlane -glGetColorTable -glGetColorTableEXT -glGetColorTableParameterfv -glGetColorTableParameterfvEXT -glGetColorTableParameterfvSGI -glGetColorTableParameteriv -glGetColorTableParameterivEXT -glGetColorTableParameterivSGI -glGetColorTableSGI -glGetCombinerInputParameterfvNV -glGetCombinerInputParameterivNV -glGetCombinerOutputParameterfvNV -glGetCombinerOutputParameterivNV -glGetCompressedTexImageARB -glGetConvolutionFilter -glGetConvolutionFilterEXT -glGetConvolutionParameterfv -glGetConvolutionParameterfvEXT -glGetConvolutionParameteriv -glGetConvolutionParameterivEXT -glGetDetailTexFuncSGIS -glGetDoublev -glGetError -glGetFinalCombinerInputParameterfvNV -glGetFinalCombinerInputParameterivNV -glGetFloatv -glGetFragmentLightfvSGIX -glGetFragmentLightivSGIX -glGetFragmentMaterialfvSGIX -glGetFragmentMaterialivSGIX -glGetHistogram -glGetHistogramEXT -glGetHistogramParameterfv -glGetHistogramParameterfvEXT -glGetHistogramParameteriv -glGetHistogramParameterivEXT -glGetInstrumentsSGIX -glGetIntegerv -glGetLightfv -glGetLightiv -glGetListParameterfvSGIX -glGetListParameterivSGIX -glGetMapdv -glGetMapfv -glGetMapiv -glGetMaterialfv -glGetMaterialiv -glGetMinmax -glGetMinmaxEXT -glGetMinmaxParameterfv -glGetMinmaxParameterfvEXT -glGetMinmaxParameteriv -glGetMinmaxParameterivEXT -glGetPixelMapfv -glGetPixelMapuiv -glGetPixelMapusv -glGetPixelTexGenParameterfvSGIS -glGetPixelTexGenParameterivSGIS -glGetPointerv -glGetPointervEXT -glGetPolygonStipple -glGetSeparableFilter -glGetSeparableFilterEXT -glGetSharpenTexFuncSGIS -glGetString -glGetTexEnvfv -glGetTexEnviv -glGetTexFilterFuncSGIS -glGetTexGendv -glGetTexGenfv -glGetTexGeniv -glGetTexImage -glGetTexLevelParameterfv -glGetTexLevelParameteriv -glGetTexParameterfv -glGetTexParameteriv -glHint -glHintPGI -glHistogram -glHistogramEXT -glIndexFuncEXT -glIndexMask -glIndexMaterialEXT -glIndexPointer -glIndexPointerEXT -glIndexd -glIndexdv -glIndexf -glIndexfv -glIndexi -glIndexiv -glIndexs -glIndexsv -glIndexub -glIndexubv -glInitNames -glInstrumentsBufferSGIX -glInterleavedArrays -glIsEnabled -glIsList -glIsTexture -glIsTextureEXT -glLightEnviSGIX -glLightModelf -glLightModelfv -glLightModeli -glLightModeliv -glLightf -glLightfv -glLighti -glLightiv -glLineStipple -glLineWidth -glListBase -glListParameterfSGIX -glListParameterfvSGIX -glListParameteriSGIX -glListParameterivSGIX -glLoadIdentity -glLoadMatrixd -glLoadMatrixf -glLoadName -glLoadTransposeMatrixdARB -glLoadTransposeMatrixfARB -glLockArraysEXT -glLogicOp -glMap1d -glMap1f -glMap2d -glMap2f -glMapGrid1d -glMapGrid1f -glMapGrid2d -glMapGrid2f -glMaterialf -glMaterialfv -glMateriali -glMaterialiv -glMatrixMode -glMinmax -glMinmaxEXT -glMultMatrixd -glMultMatrixf -glMultTransposeMatrixdARB -glMultTransposeMatrixfARB -glMultiTexCoord1dARB -glMultiTexCoord1dvARB -glMultiTexCoord1fARB -glMultiTexCoord1fvARB -glMultiTexCoord1iARB -glMultiTexCoord1ivARB -glMultiTexCoord1sARB -glMultiTexCoord1svARB -glMultiTexCoord2dARB -glMultiTexCoord2dvARB -glMultiTexCoord2fARB -glMultiTexCoord2fvARB -glMultiTexCoord2iARB -glMultiTexCoord2ivARB -glMultiTexCoord2sARB -glMultiTexCoord2svARB -glMultiTexCoord3dARB -glMultiTexCoord3dvARB -glMultiTexCoord3fARB -glMultiTexCoord3fvARB -glMultiTexCoord3iARB -glMultiTexCoord3ivARB -glMultiTexCoord3sARB -glMultiTexCoord3svARB -glMultiTexCoord4dARB -glMultiTexCoord4dvARB -glMultiTexCoord4fARB -glMultiTexCoord4fvARB -glMultiTexCoord4iARB -glMultiTexCoord4ivARB -glMultiTexCoord4sARB -glMultiTexCoord4svARB -glNewList -glNormal3b -glNormal3bv -glNormal3d -glNormal3dv -glNormal3f -glNormal3fv -glNormal3i -glNormal3iv -glNormal3s -glNormal3sv -glNormalPointer -glNormalPointerEXT -glOrtho -glPassThrough -glPixelMapfv -glPixelMapuiv -glPixelMapusv -glPixelStoref -glPixelStorei -glPixelTexGenParameterfSGIS -glPixelTexGenParameterfvSGIS -glPixelTexGenParameteriSGIS -glPixelTexGenParameterivSGIS -glPixelTexGenSGIX -glPixelTransferf -glPixelTransferi -glPixelZoom -glPointParameterfEXT -glPointParameterfSGIS -glPointParameterfvEXT -glPointParameterfvSGIS -glPointSize -glPollInstrumentsSGIX -glPolygonMode -glPolygonOffset -glPolygonOffsetEXT -glPolygonStipple -glPopAttrib -glPopClientAttrib -glPopMatrix -glPopName -glPrioritizeTextures -glPrioritizeTexturesEXT -glPushAttrib -glPushClientAttrib -glPushMatrix -glPushName -glRasterPos2d -glRasterPos2dv -glRasterPos2f -glRasterPos2fv -glRasterPos2i -glRasterPos2iv -glRasterPos2s -glRasterPos2sv -glRasterPos3d -glRasterPos3dv -glRasterPos3f -glRasterPos3fv -glRasterPos3i -glRasterPos3iv -glRasterPos3s -glRasterPos3sv -glRasterPos4d -glRasterPos4dv -glRasterPos4f -glRasterPos4fv -glRasterPos4i -glRasterPos4iv -glRasterPos4s -glRasterPos4sv -glReadBuffer -glReadInstrumentsSGIX -glReadPixels -glRectd -glRectdv -glRectf -glRectfv -glRecti -glRectiv -glRects -glRectsv -glReferencePlaneSGIX -glRenderMode -glResetHistogram -glResetHistogramEXT -glResetMinmax -glResetMinmaxEXT -glResizeBuffersMESA -glRotated -glRotatef -glSampleCoverageARB -glSampleMaskEXT -glSampleMaskSGIS -glSamplePassARB -glSamplePatternEXT -glSamplePatternSGIS -glScaled -glScalef -glScissor -glSelectBuffer -glSeparableFilter2D -glSeparableFilter2DEXT -glShadeModel -glSharpenTexFuncSGIS -glSpriteParameterfSGIX -glSpriteParameterfvSGIX -glSpriteParameteriSGIX -glSpriteParameterivSGIX -glStartInstrumentsSGIX -glStencilFunc -glStencilMask -glStencilOp -glStopInstrumentsSGIX -glTagSampleBufferSGIX -glTbufferMask3DFX -glTexCoord1d -glTexCoord1dv -glTexCoord1f -glTexCoord1fv -glTexCoord1i -glTexCoord1iv -glTexCoord1s -glTexCoord1sv -glTexCoord2d -glTexCoord2dv -glTexCoord2f -glTexCoord2fv -glTexCoord2i -glTexCoord2iv -glTexCoord2s -glTexCoord2sv -glTexCoord3d -glTexCoord3dv -glTexCoord3f -glTexCoord3fv -glTexCoord3i -glTexCoord3iv -glTexCoord3s -glTexCoord3sv -glTexCoord4d -glTexCoord4dv -glTexCoord4f -glTexCoord4fv -glTexCoord4i -glTexCoord4iv -glTexCoord4s -glTexCoord4sv -glTexCoordPointer -glTexCoordPointerEXT -glTexEnvf -glTexEnvfv -glTexEnvi -glTexEnviv -glTexFilterFuncSGIS -glTexGend -glTexGendv -glTexGenf -glTexGenfv -glTexGeni -glTexGeniv -glTexImage1D -glTexImage2D -glTexImage3D -glTexImage3DEXT -glTexImage4DSGIS -glTexParameterf -glTexParameterfv -glTexParameteri -glTexParameteriv -glTexSubImage1D -glTexSubImage1DEXT -glTexSubImage2D -glTexSubImage2DEXT -glTexSubImage3D -glTexSubImage3DEXT -glTexSubImage4DSGIS -glTranslated -glTranslatef -glUnlockArraysEXT -glVertex2d -glVertex2dv -glVertex2f -glVertex2fv -glVertex2i -glVertex2iv -glVertex2s -glVertex2sv -glVertex3d -glVertex3dv -glVertex3f -glVertex3fv -glVertex3i -glVertex3iv -glVertex3s -glVertex3sv -glVertex4d -glVertex4dv -glVertex4f -glVertex4fv -glVertex4i -glVertex4iv -glVertex4s -glVertex4sv -glVertexArrayRangeNV -glVertexPointer -glVertexPointerEXT -glVertexWeightPointerEXT -glVertexWeightfEXT -glVertexWeightfvEXT -glViewport -glWindowPos2dMESA -glWindowPos2dvMESA -glWindowPos2fMESA -glWindowPos2fvMESA -glWindowPos2iMESA -glWindowPos2ivMESA -glWindowPos2sMESA -glWindowPos2svMESA -glWindowPos3dMESA -glWindowPos3dvMESA -glWindowPos3fMESA -glWindowPos3fvMESA -glWindowPos3iMESA -glWindowPos3ivMESA -glWindowPos3sMESA -glWindowPos3svMESA -glWindowPos4dMESA -glWindowPos4dvMESA -glWindowPos4fMESA -glWindowPos4fvMESA -glWindowPos4iMESA -glWindowPos4ivMESA -glWindowPos4sMESA -glWindowPos4svMESA -_mesa_CallList -_mesa_CallLists -_mesa_DeleteLists -_mesa_EndList -_mesa_GenLists -_mesa_IsList -_mesa_ListBase -_mesa_NewList -_mesa_init_dlist_table -gl_compile_cassette -gl_destroy_list -gl_init_lists -gl_save_error -mesa_print_display_list -_mesa_DrawPixels -_mesa_clip_pixelrect -_mesa_Disable -_mesa_DisableClientState -_mesa_Enable -_mesa_EnableClientState -_mesa_IsEnabled -_mesa_set_enable -gl_lookup_enum_by_name -gl_lookup_enum_by_nr -_mesa_EvalCoord1d -_mesa_EvalCoord1dv -_mesa_EvalCoord1f -_mesa_EvalCoord1fv -_mesa_EvalCoord2d -_mesa_EvalCoord2dv -_mesa_EvalCoord2f -_mesa_EvalCoord2fv -_mesa_EvalMesh1 -_mesa_EvalMesh2 -_mesa_EvalPoint1 -_mesa_EvalPoint2 -_mesa_GetMapdv -_mesa_GetMapfv -_mesa_GetMapiv -_mesa_Map1d -_mesa_Map1f -_mesa_Map2d -_mesa_Map2f -_mesa_MapGrid1d -_mesa_MapGrid1f -_mesa_MapGrid2d -_mesa_MapGrid2f -_mesa_evaluator_components -gl_copy_map_points1d -gl_copy_map_points1f -gl_copy_map_points2d -gl_copy_map_points2f -gl_eval_vb -gl_init_eval -gl_extension_is_enabled -gl_extensions_add -gl_extensions_ctr -gl_extensions_disable -gl_extensions_dtr -gl_extensions_enable -gl_extensions_get_string -_mesa_FeedbackBuffer -_mesa_InitNames -_mesa_LoadName -_mesa_PassThrough -_mesa_PopName -_mesa_PushName -_mesa_RenderMode -_mesa_SelectBuffer -gl_feedback_line -gl_feedback_points -gl_feedback_triangle -gl_feedback_vertex -gl_select_line -gl_select_points -gl_select_triangle -gl_update_hitflag -_mesa_Fogf -_mesa_Fogfv -_mesa_Fogi -_mesa_Fogiv -_mesa_fog_ci_pixels -_mesa_fog_rgba_pixels -_mesa_fog_vertices -_mesa_init_fog -_mesa_GetBooleanv -_mesa_GetDoublev -_mesa_GetError -_mesa_GetFloatv -_mesa_GetIntegerv -_mesa_GetPointerv -_mesa_GetString -_glapi_add_entrypoint -_glapi_check_multithread -_glapi_check_table -_glapi_get_context -_glapi_get_dispatch -_glapi_get_dispatch_table_size -_glapi_get_proc_address -_glapi_get_proc_name -_glapi_get_proc_offset -_glapi_get_version -_glapi_set_context -_glapi_set_dispatch -_glapi_noop_enable_warnings -_glthread_GetID -_glthread_GetTSD -_glthread_InitTSD -_glthread_SetTSD -_mesa_DeleteHashTable -_mesa_HashFindFreeKeyBlock -_mesa_HashFirstEntry -_mesa_HashInsert -_mesa_HashLookup -_mesa_HashPrint -_mesa_HashRemove -_mesa_NewHashTable -_mesa_Hint -_mesa_HintPGI -_mesa_try_Hint -_mesa_bytes_per_pixel -_mesa_components_in_format -_mesa_image_address -_mesa_image_row_stride -_mesa_is_legal_format_and_type -_mesa_native_packing -_mesa_pack_bitmap -_mesa_pack_polygon_stipple -_mesa_pack_rgba_span -_mesa_sizeof_packed_type -_mesa_sizeof_type -_mesa_swap2 -_mesa_swap4 -_mesa_unpack_bitmap -_mesa_unpack_depth_span -_mesa_unpack_float_color_span -_mesa_unpack_image -_mesa_unpack_index_span -_mesa_unpack_polygon_stipple -_mesa_unpack_stencil_span -_mesa_unpack_ubyte_color_span -_mesa_ConvolutionFilter1D -_mesa_ConvolutionFilter2D -_mesa_ConvolutionParameterf -_mesa_ConvolutionParameterfv -_mesa_ConvolutionParameteri -_mesa_ConvolutionParameteriv -_mesa_CopyConvolutionFilter1D -_mesa_CopyConvolutionFilter2D -_mesa_GetConvolutionFilter -_mesa_GetConvolutionParameterfv -_mesa_GetConvolutionParameteriv -_mesa_GetHistogram -_mesa_GetHistogramParameterfv -_mesa_GetHistogramParameteriv -_mesa_GetMinmax -_mesa_GetMinmaxParameterfv -_mesa_GetMinmaxParameteriv -_mesa_GetSeparableFilter -_mesa_Histogram -_mesa_Minmax -_mesa_ResetHistogram -_mesa_ResetMinmax -_mesa_SeparableFilter2D -_mesa_update_histogram -_mesa_update_minmax -_mesa_ColorMaterial -_mesa_GetLightfv -_mesa_GetLightiv -_mesa_GetMaterialfv -_mesa_GetMaterialiv -_mesa_LightModelf -_mesa_LightModelfv -_mesa_LightModeli -_mesa_LightModeliv -_mesa_Lightf -_mesa_Lightfv -_mesa_Lighti -_mesa_Lightiv -_mesa_Materialf -_mesa_Materialfv -_mesa_Materiali -_mesa_Materialiv -_mesa_ShadeModel -gl_compute_light_positions -gl_compute_shine_table -gl_compute_spot_exp_table -gl_material_bitmask -gl_update_color_material -gl_update_lighting -gl_update_material -gl_update_normal_transform -_mesa_LineStipple -_mesa_LineWidth -gl_set_line_function -_mesa_LogicOp -_mesa_logicop_ci_pixels -_mesa_logicop_ci_span -_mesa_logicop_rgba_pixels -_mesa_logicop_rgba_span -_mesa_ColorMask -_mesa_IndexMask -_mesa_mask_index_pixels -_mesa_mask_index_span -_mesa_mask_rgba_pixels -_mesa_mask_rgba_span -_mesa_DepthRange -_mesa_Frustum -_mesa_LoadIdentity -_mesa_LoadMatrixd -_mesa_LoadMatrixf -_mesa_LoadTransposeMatrixdARB -_mesa_LoadTransposeMatrixfARB -_mesa_MatrixMode -_mesa_MultMatrixd -_mesa_MultMatrixf -_mesa_MultTransposeMatrixdARB -_mesa_MultTransposeMatrixfARB -_mesa_Ortho -_mesa_PopMatrix -_mesa_PushMatrix -_mesa_Rotated -_mesa_Rotatef -_mesa_Scaled -_mesa_Scalef -_mesa_Translated -_mesa_Translatef -_mesa_Viewport -gl_Viewport -gl_calculate_model_project_matrix -gl_mat_mul_floats -gl_mat_mul_mat -gl_matrix_alloc_inv -gl_matrix_analyze -gl_matrix_copy -gl_matrix_ctr -gl_matrix_dtr -gl_matrix_invert -gl_matrix_mul -gl_matrix_transposed -gl_matrix_transposef -gl_print_matrix -gl_rotation_matrix -_mesa_calloc -_mesa_free -_mesa_malloc -_mesa_bitcount -_mesa_init_math -gl_sqrt -gl_alloc_pb -gl_flush_pb -gl_build_immediate_pipeline -gl_build_precalc_pipeline -gl_pipeline_init -gl_print_active_pipeline -gl_print_pipe_ops -gl_print_pipeline -gl_print_tri_caps -gl_print_vert_flags -gl_reset_cva_vb -gl_run_pipeline -gl_update_pipelines -_mesa_GetPixelMapfv -_mesa_GetPixelMapuiv -_mesa_GetPixelMapusv -_mesa_PixelMapfv -_mesa_PixelMapuiv -_mesa_PixelMapusv -_mesa_PixelStoref -_mesa_PixelStorei -_mesa_PixelTransferf -_mesa_PixelTransferi -_mesa_PixelZoom -_mesa_lookup_rgba -_mesa_map_ci -_mesa_map_ci8_to_rgba -_mesa_map_ci_to_rgba -_mesa_map_ci_to_rgba_ubyte -_mesa_map_rgba -_mesa_map_stencil -_mesa_scale_and_bias_rgba -_mesa_shift_and_offset_ci -_mesa_shift_and_offset_stencil -_mesa_transform_rgba -_mesa_GetPixelTexGenParameterfvSGIS -_mesa_GetPixelTexGenParameterivSGIS -_mesa_PixelTexGenParameterfSGIS -_mesa_PixelTexGenParameterfvSGIS -_mesa_PixelTexGenParameteriSGIS -_mesa_PixelTexGenParameterivSGIS -_mesa_PixelTexGenSGIX -_mesa_pixeltexgen -_mesa_PointParameterfEXT -_mesa_PointParameterfvEXT -_mesa_PointSize -gl_set_point_function -_mesa_CullFace -_mesa_FrontFace -_mesa_GetPolygonStipple -_mesa_PolygonMode -_mesa_PolygonOffset -_mesa_PolygonOffsetEXT -_mesa_PolygonStipple -gl_set_quad_function -_mesa_RasterPos2d -_mesa_RasterPos2dv -_mesa_RasterPos2f -_mesa_RasterPos2fv -_mesa_RasterPos2i -_mesa_RasterPos2iv -_mesa_RasterPos2s -_mesa_RasterPos2sv -_mesa_RasterPos3d -_mesa_RasterPos3dv -_mesa_RasterPos3f -_mesa_RasterPos3fv -_mesa_RasterPos3i -_mesa_RasterPos3iv -_mesa_RasterPos3s -_mesa_RasterPos3sv -_mesa_RasterPos4d -_mesa_RasterPos4dv -_mesa_RasterPos4f -_mesa_RasterPos4fv -_mesa_RasterPos4i -_mesa_RasterPos4iv -_mesa_RasterPos4s -_mesa_RasterPos4sv -_mesa_ReadPixels -_mesa_Rectd -_mesa_Rectdv -_mesa_Rectf -_mesa_Rectfv -_mesa_Recti -_mesa_Rectiv -_mesa_Rects -_mesa_Rectsv -_mesa_Scissor -gl_scissor_pixels -gl_scissor_span -gl_init_shade -gl_shade_rastpos -gl_update_lighting_function -gl_read_index_span -gl_read_rgba_span -gl_write_index_span -gl_write_monocolor_span -gl_write_monoindex_span -gl_write_multitexture_span -gl_write_rgba_span -gl_write_texture_span -gl_clean_color -gl_default_nr_stages -gl_default_pipeline -gl_import_client_data -gl_init_vbxform -gl_update_materials -_mesa_init_exec_table -_mesa_init_no_op_table -gl_print_enable_flags -gl_print_state -gl_update_state -_mesa_ClearStencil -_mesa_StencilFunc -_mesa_StencilMask -_mesa_StencilOp -_mesa_alloc_stencil_buffer -_mesa_clear_stencil_buffer -_mesa_read_stencil_span -_mesa_stencil_and_ztest_pixels -_mesa_stencil_and_ztest_span -_mesa_write_stencil_span -_mesa_CompressedTexImage1DARB -_mesa_CompressedTexImage2DARB -_mesa_CompressedTexImage3DARB -_mesa_CompressedTexSubImage1DARB -_mesa_CompressedTexSubImage2DARB -_mesa_CompressedTexSubImage3DARB -_mesa_CopyTexImage1D -_mesa_CopyTexImage2D -_mesa_CopyTexSubImage1D -_mesa_CopyTexSubImage2D -_mesa_CopyTexSubImage3D -_mesa_GetCompressedTexImageARB -_mesa_GetTexImage -_mesa_TexImage1D -_mesa_TexImage2D -_mesa_TexImage3D -_mesa_TexImage3DEXT -_mesa_TexSubImage1D -_mesa_TexSubImage2D -_mesa_TexSubImage3D -_mesa_alloc_texture_image -_mesa_base_tex_format -_mesa_compressed_image_size -_mesa_free_texture_image -_mesa_get_teximage_from_driver -_mesa_select_tex_image -_mesa_select_tex_object -_mesa_AreTexturesResident -_mesa_BindTexture -_mesa_DeleteTextures -_mesa_GenTextures -_mesa_IsTexture -_mesa_PrioritizeTextures -_mesa_test_texobj_completeness -gl_alloc_texture_object -gl_free_texture_object -_mesa_ActiveTextureARB -_mesa_ClientActiveTextureARB -_mesa_GetTexEnvfv -_mesa_GetTexEnviv -_mesa_GetTexGendv -_mesa_GetTexGenfv -_mesa_GetTexGeniv -_mesa_GetTexLevelParameterfv -_mesa_GetTexLevelParameteriv -_mesa_GetTexParameterfv -_mesa_GetTexParameteriv -_mesa_TexEnvf -_mesa_TexEnvfv -_mesa_TexEnvi -_mesa_TexEnviv -_mesa_TexGend -_mesa_TexGendv -_mesa_TexGenf -_mesa_TexGenfv -_mesa_TexGeni -_mesa_TexGeniv -_mesa_TexParameterf -_mesa_TexParameterfv -_mesa_TexParameteri -_mesa_TexParameteriv -gl_put_texobj_on_dirty_list -gl_remove_texobj_from_dirty_list -gl_update_dirty_texobjs -_mesa_set_texture_sampler -gl_init_texture -gl_texture_pixels -gl_update_texture_unit -gl_init_translate -gl_cull_triangle -gl_set_triangle_function -_mesa_ArrayElement -_mesa_ColorPointer -_mesa_ColorPointerEXT -_mesa_DrawArrays -_mesa_DrawElements -_mesa_DrawRangeElements -_mesa_EdgeFlagPointer -_mesa_EdgeFlagPointerEXT -_mesa_IndexPointer -_mesa_IndexPointerEXT -_mesa_InterleavedArrays -_mesa_NormalPointer -_mesa_NormalPointerEXT -_mesa_TexCoordPointer -_mesa_TexCoordPointerEXT -_mesa_VertexPointer -_mesa_VertexPointerEXT -gl_exec_array_elements -gl_update_client_state -gl_immediate_alloc -gl_immediate_free -gl_vb_create_for_cva -gl_vb_create_for_immediate -gl_vb_free -gl_cull_vb -gl_dont_cull_vb -gl_fast_copy_vb -gl_make_normal_cullmask -gl_purge_vertices -_mesa_Begin -_mesa_Color3b -_mesa_Color3bv -_mesa_Color3d -_mesa_Color3dv -_mesa_Color3f -_mesa_Color3fv -_mesa_Color3i -_mesa_Color3iv -_mesa_Color3s -_mesa_Color3sv -_mesa_Color3ub -_mesa_Color3ubv -_mesa_Color3ui -_mesa_Color3uiv -_mesa_Color3us -_mesa_Color3usv -_mesa_Color4b -_mesa_Color4bv -_mesa_Color4d -_mesa_Color4dv -_mesa_Color4f -_mesa_Color4fv -_mesa_Color4i -_mesa_Color4iv -_mesa_Color4s -_mesa_Color4sv -_mesa_Color4ub -_mesa_Color4ubv -_mesa_Color4ui -_mesa_Color4uiv -_mesa_Color4us -_mesa_Color4usv -_mesa_EdgeFlag -_mesa_EdgeFlagv -_mesa_End -_mesa_Indexd -_mesa_Indexdv -_mesa_Indexf -_mesa_Indexfv -_mesa_Indexi -_mesa_Indexiv -_mesa_Indexs -_mesa_Indexsv -_mesa_Indexub -_mesa_Indexubv -_mesa_MultiTexCoord1dARB -_mesa_MultiTexCoord1dvARB -_mesa_MultiTexCoord1fARB -_mesa_MultiTexCoord1fvARB -_mesa_MultiTexCoord1iARB -_mesa_MultiTexCoord1ivARB -_mesa_MultiTexCoord1sARB -_mesa_MultiTexCoord1svARB -_mesa_MultiTexCoord2dARB -_mesa_MultiTexCoord2dvARB -_mesa_MultiTexCoord2fARB -_mesa_MultiTexCoord2fvARB -_mesa_MultiTexCoord2iARB -_mesa_MultiTexCoord2ivARB -_mesa_MultiTexCoord2sARB -_mesa_MultiTexCoord2svARB -_mesa_MultiTexCoord3dARB -_mesa_MultiTexCoord3dvARB -_mesa_MultiTexCoord3fARB -_mesa_MultiTexCoord3fvARB -_mesa_MultiTexCoord3iARB -_mesa_MultiTexCoord3ivARB -_mesa_MultiTexCoord3sARB -_mesa_MultiTexCoord3svARB -_mesa_MultiTexCoord4dARB -_mesa_MultiTexCoord4dvARB -_mesa_MultiTexCoord4fARB -_mesa_MultiTexCoord4fvARB -_mesa_MultiTexCoord4iARB -_mesa_MultiTexCoord4ivARB -_mesa_MultiTexCoord4sARB -_mesa_MultiTexCoord4svARB -_mesa_Normal3b -_mesa_Normal3bv -_mesa_Normal3d -_mesa_Normal3dv -_mesa_Normal3f -_mesa_Normal3fv -_mesa_Normal3i -_mesa_Normal3iv -_mesa_Normal3s -_mesa_Normal3sv -_mesa_TexCoord1d -_mesa_TexCoord1dv -_mesa_TexCoord1f -_mesa_TexCoord1fv -_mesa_TexCoord1i -_mesa_TexCoord1iv -_mesa_TexCoord1s -_mesa_TexCoord1sv -_mesa_TexCoord2d -_mesa_TexCoord2dv -_mesa_TexCoord2f -_mesa_TexCoord2fv -_mesa_TexCoord2i -_mesa_TexCoord2iv -_mesa_TexCoord2s -_mesa_TexCoord2sv -_mesa_TexCoord3d -_mesa_TexCoord3dv -_mesa_TexCoord3f -_mesa_TexCoord3fv -_mesa_TexCoord3i -_mesa_TexCoord3iv -_mesa_TexCoord3s -_mesa_TexCoord3sv -_mesa_TexCoord4d -_mesa_TexCoord4dv -_mesa_TexCoord4f -_mesa_TexCoord4fv -_mesa_TexCoord4i -_mesa_TexCoord4iv -_mesa_TexCoord4s -_mesa_TexCoord4sv -_mesa_Vertex2d -_mesa_Vertex2dv -_mesa_Vertex2f -_mesa_Vertex2fv -_mesa_Vertex2i -_mesa_Vertex2iv -_mesa_Vertex2s -_mesa_Vertex2sv -_mesa_Vertex3d -_mesa_Vertex3dv -_mesa_Vertex3f -_mesa_Vertex3fv -_mesa_Vertex3i -_mesa_Vertex3iv -_mesa_Vertex3s -_mesa_Vertex3sv -_mesa_Vertex4d -_mesa_Vertex4dv -_mesa_Vertex4f -_mesa_Vertex4fv -_mesa_Vertex4i -_mesa_Vertex4iv -_mesa_Vertex4s -_mesa_Vertex4sv -gl_Begin -gl_End -gl_Vertex2f -gl_render_elts -gl_render_vb_indirect -gl_init_vbrender -gl_reduced_prim_change -gl_render_clipped_line -gl_render_clipped_triangle -gl_render_vb -gl_set_render_vb_function -RESET_IMMEDIATE -gl_compute_orflag -gl_copy_prev_vertices -gl_copy_to_current -gl_execute_cassette -gl_fixup_cassette -gl_fixup_input -gl_flush_vb -gl_internal_flush -gl_maybe_transform_vb -gl_print_cassette -gl_print_cassette_flags -gl_reset_input -gl_reset_vb -gl_texcoord_size -gl_vector1ub_alloc -gl_vector1ub_free -gl_vector1ub_init -gl_vector1ui_alloc -gl_vector1ui_free -gl_vector1ui_init -gl_vector3f_alloc -gl_vector3f_free -gl_vector3f_init -gl_vector3f_print -gl_vector4f_alloc -gl_vector4f_clean_elem -gl_vector4f_free -gl_vector4f_init -gl_vector4f_print -gl_vector4ub_alloc -gl_vector4ub_free -gl_vector4ub_init -gl_init_vertices -_mesa_WindowPos2dMESA -_mesa_WindowPos2dvMESA -_mesa_WindowPos2fMESA -_mesa_WindowPos2fvMESA -_mesa_WindowPos2iMESA -_mesa_WindowPos2ivMESA -_mesa_WindowPos2sMESA -_mesa_WindowPos2svMESA -_mesa_WindowPos3dMESA -_mesa_WindowPos3dvMESA -_mesa_WindowPos3fMESA -_mesa_WindowPos3fvMESA -_mesa_WindowPos3iMESA -_mesa_WindowPos3ivMESA -_mesa_WindowPos3sMESA -_mesa_WindowPos3svMESA -_mesa_WindowPos4dMESA -_mesa_WindowPos4dvMESA -_mesa_WindowPos4fMESA -_mesa_WindowPos4fvMESA -_mesa_WindowPos4iMESA -_mesa_WindowPos4ivMESA -_mesa_WindowPos4sMESA -_mesa_WindowPos4svMESA -gl_init_transformation -gl_project_points -gl_transform_point_sz -gl_transform_vector -gl_write_zoomed_index_span -gl_write_zoomed_rgb_span -gl_write_zoomed_rgba_span -gl_write_zoomed_stencil_span -__MESA_beginDispatchOverride -__MESA_copyContext -__MESA_createBuffer -__MESA_createContext -__MESA_destroyBuffer -__MESA_destroyContext -__MESA_dispatchExec -__MESA_endDispatchOverride -__MESA_forceCurrent -__MESA_initVisuals -__MESA_loseCurrent -__MESA_makeCurrent -__MESA_notifyDestroy -__MESA_notifyResize -__MESA_notifySwapBuffers -__MESA_resetExtension -__MESA_resizeBuffers -__MESA_screenProbe -__MESA_setVisualConfigs -__MESA_shareContext -__MESA_swapBuffers -__glFloorLog2 -XMesaCreateImage -XMesaDestroyImage -XMesaGetPixel -XMesaPutImageHelper -XMesaCopySubBuffer -XMesaCreateContext -XMesaCreatePixmapBuffer -XMesaCreateVisual -XMesaCreateWindowBuffer -XMesaCreateWindowBuffer2 -XMesaDestroyBuffer -XMesaDestroyContext -XMesaDestroyVisual -XMesaDitherColor -XMesaFindBuffer -XMesaFlush -XMesaForceCurrent -XMesaGarbageCollect -XMesaGetBackBuffer -XMesaGetCurrentBuffer -XMesaGetCurrentContext -XMesaGetCurrentReadBuffer -XMesaGetDepthBuffer -XMesaGetString -XMesaLoseCurrent -XMesaMakeCurrent -XMesaMakeCurrent2 -XMesaReset -XMesaSetFXmode -XMesaSetVisualDisplay -XMesaSwapBuffers -XMesaUnbindContext -xmesa_alloc_back_buffer -xmesa_color_to_pixel -xmesa_update_state -xmesa_get_line_func -xmesa_get_points_func -xmesa_get_triangle_func - diff --git a/nx-X11/programs/Xserver/GL/mesa/GLcore/GLcoremodule.c b/nx-X11/programs/Xserver/GL/mesa/GLcore/GLcoremodule.c deleted file mode 100644 index 34eb4d673..000000000 --- a/nx-X11/programs/Xserver/GL/mesa/GLcore/GLcoremodule.c +++ /dev/null @@ -1,63 +0,0 @@ -/************************************************************************** - -Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas. -All Rights Reserved. - -Permission is hereby granted, free of charge, to any person obtaining a -copy of this software and associated documentation files (the -"Software"), to deal in the Software without restriction, including -without limitation the rights to use, copy, modify, merge, publish, -distribute, sub license, and/or sell copies of the Software, and to -permit persons to whom the Software is furnished to do so, subject to -the following conditions: - -The above copyright notice and this permission notice (including the -next paragraph) shall be included in all copies or substantial portions -of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. -IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR -ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -**************************************************************************/ - -/* - * Authors: - * Kevin E. Martin <kevin@precisioninsight.com> - * - */ - -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - -#include "xf86Module.h" - -static MODULESETUPPROTO(GLcoreSetup); - -static XF86ModuleVersionInfo VersRec = -{ - "GLcore", - MODULEVENDORSTRING, - MODINFOSTRING1, - MODINFOSTRING2, - XORG_VERSION_CURRENT, - 1, 0, 0, - ABI_CLASS_EXTENSION, - ABI_EXTENSION_VERSION, - MOD_CLASS_NONE, - {0,0,0,0} -}; - -XF86ModuleData GLcoreModuleData = { &VersRec, GLcoreSetup, NULL }; - -static void * -GLcoreSetup(void * module, void * opts, int *errmaj, int *errmin) -{ - /* Need a non-NULL return value to indicate success */ - return (void *)1; -} diff --git a/nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile b/nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile index 698cba2d9..5fb93b364 100644 --- a/nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/GLcore/Imakefile @@ -1,7 +1,3 @@ -#if DoLoadableServer -#define IHaveModules -#endif - #include <Server.tmpl> #define NeedAllMesaSrc @@ -29,11 +25,6 @@ #include "../X/Imakefile.inc" #include "../Imakefile.inc" -#ifdef IHaveModules - MSRCS = GLcoremodule.c - MOBJS = GLcoremodule.o -#endif - XOBJS = ../X/?*.o OBJS = $(COREMESAOBJS) $(MOBJS) @@ -50,16 +41,8 @@ DEFINES = $(GLX_DEFINES) -#ifdef IHaveModules -ModuleObjectRule() - -DepLibraryModuleTarget(GLcore, $(DONES) $(OBJS),$(OBJS) $(XOBJS)) -InstallLibraryModule(GLcore,$(MODULEDIR),extensions) - -#else NormalDepLibraryTarget(GLcore, $(DONES) $(OBJS), $(OBJS) $(XOBJS)) NormalLibraryObjectRule() -#endif InstallDriverSDKLibraryModule(GLcore,$(DRIVERSDKMODULEDIR),extensions) diff --git a/nx-X11/programs/Xserver/GL/mesa/Imakefile b/nx-X11/programs/Xserver/GL/mesa/Imakefile index 7f9b5191c..f1dbbe101 100644 --- a/nx-X11/programs/Xserver/GL/mesa/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/Imakefile @@ -1,7 +1,3 @@ -#if DoLoadableServer -#define IHaveModules -#endif - #define IHaveSubdirs SUBDIRS = main math array_cache swrast swrast_setup tnl shader X GLcore $(MODSUBDIR) @@ -20,11 +16,7 @@ DEFINES = $(GLX_DEFINES) -#ifdef IHaveModules -ModuleObjectRule() -#else NormalLibraryObjectRule() -#endif #ifdef IHaveSubdirs MakeSubdirs($(SUBDIRS)) diff --git a/nx-X11/programs/Xserver/GL/mesa/X/Imakefile b/nx-X11/programs/Xserver/GL/mesa/X/Imakefile index c8ea2ab72..f8812e096 100644 --- a/nx-X11/programs/Xserver/GL/mesa/X/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/X/Imakefile @@ -1,7 +1,3 @@ -#if DoLoadableServer -#define IHaveModules -#endif - #include <Server.tmpl> #define NeedAllMesaSrc @@ -42,11 +38,7 @@ LinkSourceFile(compsize.c,$(MESASRCDIR)/src/glx/x11) DEFINES = $(GLX_DEFINES) $(GLXSRV_DEFINES) -DNXAGENT_SERVER /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ -#ifdef IHaveModules -ModuleObjectRule() -#else NormalLibraryObjectRule() -#endif SubdirLibraryRule($(OBJS)) @@ -59,10 +51,6 @@ MakeSubdirs($(SUBDIRS)) DependSubdirs($(SUBDIRS)) #endif -#if defined(IHaveModules) && BuildModuleInSubdir -LinkSourceFile(xf86glx.c,..) -LinkSourceFile(xf86glx_util.c,..) -#endif #ifndef MesaDrvSrcDir #define MesaDrvSrcDir $(MESASRCDIR)/src/mesa/drivers/dri diff --git a/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile b/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile index 548c6adb0..474710747 100644 --- a/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/array_cache/Imakefile @@ -1,7 +1,3 @@ -#if DoLoadableServer -#define IHaveModules -#endif - #include <Server.tmpl> #define NeedAllMesaSrc @@ -25,11 +21,7 @@ DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ -#ifdef IHaveModules -ModuleObjectRule() -#else NormalLibraryObjectRule() -#endif SubdirLibraryRule($(OBJS)) diff --git a/nx-X11/programs/Xserver/GL/mesa/main/Imakefile b/nx-X11/programs/Xserver/GL/mesa/main/Imakefile index ff95bd187..d6e914b89 100644 --- a/nx-X11/programs/Xserver/GL/mesa/main/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/main/Imakefile @@ -1,7 +1,3 @@ -#if DoLoadableServer -#define IHaveModules -#endif - /* Large PIC tables needed for Solaris/SPARC builds */ #if defined(SunArchitecture) && defined(SparcArchitecture) && defined(LargePositionIndependentCFlags) PICFLAGS = LargePositionIndependentCFlags @@ -29,11 +25,7 @@ DEFINES = $(GLX_DEFINES) -DNXAGENT_SERVER /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ -#ifdef IHaveModules -ModuleObjectRule() -#else NormalLibraryObjectRule() -#endif SubdirLibraryRule($(OBJS)) diff --git a/nx-X11/programs/Xserver/GL/mesa/math/Imakefile b/nx-X11/programs/Xserver/GL/mesa/math/Imakefile index 77e7f7664..6af3a0a0c 100644 --- a/nx-X11/programs/Xserver/GL/mesa/math/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/math/Imakefile @@ -1,7 +1,3 @@ -#if DoLoadableServer -#define IHaveModules -#endif - #include <Server.tmpl> #define NeedAllMesaSrc @@ -24,11 +20,7 @@ DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ -#ifdef IHaveModules -ModuleObjectRule() -#else NormalLibraryObjectRule() -#endif SubdirLibraryRule($(OBJS)) diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile b/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile index b52d193d3..bf3acd4f6 100644 --- a/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/shader/Imakefile @@ -1,6 +1,3 @@ -#if DoLoadableServer -#define IHaveModules -#endif #define IHaveSubdirs SUBDIRS = grammar slang @@ -29,11 +26,7 @@ DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ -#ifdef IHaveModules -ModuleObjectRule() -#else NormalLibraryObjectRule() -#endif SubdirLibraryRule($(OBJS)) diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile b/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile index 56cfb4bc9..3fe604f2e 100644 --- a/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/shader/grammar/Imakefile @@ -1,6 +1,3 @@ -#if DoLoadableServer -#define IHaveModules -#endif #include <Server.tmpl> @@ -25,11 +22,7 @@ DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ -#ifdef IHaveModules -ModuleObjectRule() -#else NormalLibraryObjectRule() -#endif SubdirLibraryRule($(OBJS)) diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile b/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile index 572000f26..d5ec4d6cf 100644 --- a/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/shader/slang/Imakefile @@ -1,6 +1,3 @@ -#if DoLoadableServer -#define IHaveModules -#endif #define IHaveSubdirs SUBDIRS = library @@ -28,11 +25,7 @@ DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ -#ifdef IHaveModules -ModuleObjectRule() -#else NormalLibraryObjectRule() -#endif SubdirLibraryRule($(OBJS)) diff --git a/nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile b/nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile index d6de08e1b..8c216804d 100644 --- a/nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/shader/slang/library/Imakefile @@ -1,6 +1,3 @@ -#if DoLoadableServer -#define IHaveModules -#endif #include <Server.tmpl> @@ -22,11 +19,7 @@ DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ -#ifdef IHaveModules -ModuleObjectRule() -#else NormalLibraryObjectRule() -#endif DependTarget() diff --git a/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile b/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile index bf4df7b4a..df47a1caa 100644 --- a/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/swrast/Imakefile @@ -1,7 +1,3 @@ -#if DoLoadableServer -#define IHaveModules -#endif - /* Large PIC tables needed for Solaris/SPARC builds */ #if defined(SunArchitecture) && defined(SparcArchitecture) && defined(LargePositionIndependentCFlags) PICFLAGS = LargePositionIndependentCFlags @@ -32,11 +28,7 @@ DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ -#ifdef IHaveModules -ModuleObjectRule() -#else NormalLibraryObjectRule() -#endif SubdirLibraryRule($(OBJS)) diff --git a/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile b/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile index ca29177a0..be2ce62a4 100644 --- a/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/swrast_setup/Imakefile @@ -1,7 +1,3 @@ -#if DoLoadableServer -#define IHaveModules -#endif - #include <Server.tmpl> #define NeedAllMesaSrc @@ -24,11 +20,7 @@ DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ -#ifdef IHaveModules -ModuleObjectRule() -#else NormalLibraryObjectRule() -#endif SubdirLibraryRule($(OBJS)) diff --git a/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile b/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile index 2fec2d03f..b36454259 100644 --- a/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile +++ b/nx-X11/programs/Xserver/GL/mesa/tnl/Imakefile @@ -1,7 +1,3 @@ -#if DoLoadableServer -#define IHaveModules -#endif - /* Large PIC tables needed for Solaris/SPARC builds */ #if defined(SunArchitecture) && defined(SparcArchitecture) && defined(LargePositionIndependentCFlags) PICFLAGS = LargePositionIndependentCFlags @@ -34,11 +30,7 @@ DEFINES = $(GLX_DEFINES) /*-DUSE_X86_ASM*/ /*-DUSE_SPARC_ASM*/ -#ifdef IHaveModules -ModuleObjectRule() -#else NormalLibraryObjectRule() -#endif SubdirLibraryRule($(OBJS)) diff --git a/nx-X11/programs/Xserver/Imakefile b/nx-X11/programs/Xserver/Imakefile index ae11a18c2..7bb8132da 100644 --- a/nx-X11/programs/Xserver/Imakefile +++ b/nx-X11/programs/Xserver/Imakefile @@ -61,13 +61,8 @@ INSTPGMFLAGS = #define AllFBLibs PreFbLibs $(FB) PostFbLibs #if BuildGlxExt -# if DoLoadableServer GLXLIB = GL/glx/ModuleLibraryTargetName(glx) \ GL/mesa/GLcore/ModuleLibraryTargetName(GLcore) -# else - GLXLIB = GL/glx/ModuleLibraryTargetName(glx) \ - GL/mesa/GLcore/ModuleLibraryTargetName(GLcore) -# endif GLXDIR = GL GLXEXT = $(GLXLIB) #endif @@ -101,14 +96,8 @@ INSTPGMFLAGS = #ifdef SiteExtensionDirs SITEEXTDIRS = SiteExtensionDirs #endif -#if DoLoadableServer && HasDlopen - LIBDL = DlLibrary -#endif LIBREGEX = RegexLibrary -#if DoLoadableServer - LIBCWRAPPER = os/libcwrapper.o -#endif #if BuildRender RENDERDIR = render @@ -130,46 +119,24 @@ INSTPGMFLAGS = CWDIR = miext/cw COMPOSITEDIR = composite COMPOSITELIB = $(COMPOSITEDIR)/libcomposite.a -#if DoLoadableServer - CW = miext/cw/ModuleLibraryTargetName(cw) -#else CW = miext/cw/LibraryTargetName(cw) #endif -#endif -#if DoLoadableServer - EXTENSIONS = $(COMPOSITELIB) $(DAMAGELIB) $(DAMAGE) $(FIXESLIB) $(CW) \ - $(OTHEREXTS) $(RANDRLIB) $(RENDERLIB) - LOADABLEEXTS = $(MISCEXT) $(DBEEXT) $(RECORDEXT) $(GLXEXT) - MISCEXT = Xext/LibraryTargetName(ext) - OTHEREXTS = Xext/LibraryTargetName(exts) $(XKBEXT) $(XINPUTEXT) \ - $(SITEEXTS) -#else EXTENSIONS = $(COMPOSITELIB) $(DAMAGELIB) $(DAMAGE) $(FIXESLIB) $(CW) \ $(OTHEREXTS) $(GLXEXT) $(RANDRLIB) $(RENDERLIB) OTHEREXTS = Xext/LibraryTargetName(ext) $(XKBEXT) $(XINPUTEXT) \ $(DBEEXT) $(RECORDEXT) $(SITEEXTS) -#endif EXTDIRS = Xext $(XKBDIR) $(XIDIR) $(GLXDIR) \ $(DBEDIR) $(RECORDDIR) $(SITEEXTDIRS) \ $(RANDRDIR) $(RENDERDIR) $(XPCONFIGDIR) \ $(FIXESDIR) $(DAMAGEDIR) $(CWDIR) $(COMPOSITEDIR) OS = os/LibraryTargetName(os) BSDEMUL = $(DEPXBSDLIB) -#if DoLoadableServer - FB = fb/ModuleLibraryTargetName(fb) -#if (!(defined(NXAgentServer) && NXAgentServer)) - DAMAGE = miext/damage/ModuleLibraryTargetName(damage) -#endif - SHADOW = miext/shadow/ModuleLibraryTargetName(shadow) - LAYER = miext/layer/ModuleLibraryTargetName(layer) -#else FB = fb/LibraryTargetName(fb) #if (!(defined(NXAgentServer) && NXAgentServer)) DAMAGE = miext/damage/LibraryTargetName(damage) #endif SHADOW = miext/shadow/LibraryTargetName(shadow) LAYER = miext/layer/LibraryTargetName(layer) -#endif #if !HasFfs && (defined(mingwArchitecture) || defined(cygwinArchitecture)) /* Order of libraries is important when linking in mingw or * cygwin. libmi.a requires ffs from libdix.a. So it is added @@ -220,11 +187,11 @@ XCOMM #if defined(NXAgentServer) && NXAgentServer NXAGENT = nxagent #endif -#if defined(NXWinServer) && NXWinServer && !MakeDllModules +#if defined(NXWinServer) && NXWinServer NXWIN = NXWin #endif #if (defined(NXAgentServer) && NXAgentServer) || \ - (!MakeDllModules && defined(NXWinServer) && NXWinServer) + (defined(NXWinServer) && NXWinServer) MakeMutex($(NXAGENT) $(NXWIN)) #endif MakeMutex($(STDDIRS) fb) @@ -568,20 +535,3 @@ ForceSubdirs($(DEPDIRS) $(SUBDIRS)) DEFAULTFONTPATH = DefaultFontPath EXTRAMANDEFS = -D__default_font_path__="`echo $(DEFAULTFONTPATH) | sed -e 's/,/, /g'`" - -#if MakeDllModules && DoLoadableServer && \ - (defined(SunArchitecture) && defined(SVR4Architecture)) -XCOMM Hackery for building dlopen-able .so modules on Solaris - -AllTarget(linker-deps) - -LINKER_DEPS_DIRS = $(SUBDIRS) - -XCOMM After everything is built, run through and generate linker dependencies -linker-deps: - RunPerlScript($(XF86SRC)/os-support/sunos/find_deps.pl,-R ProjectRoot $(LINKER_DEPS_DIRS)) - for i in $(LINKER_DEPS_DIRS) ; do \ - echo "relinking with dependency flags in $(CURRENT_DIR)/$$i..."; \ - MakeNamedTargetSubdir($$i,NullParameter,all) ; \ - done -#endif diff --git a/nx-X11/programs/Xserver/Xext/Imakefile b/nx-X11/programs/Xserver/Xext/Imakefile index 745ba1788..becc7b66e 100644 --- a/nx-X11/programs/Xserver/Xext/Imakefile +++ b/nx-X11/programs/Xserver/Xext/Imakefile @@ -25,11 +25,6 @@ #include <Server.tmpl> -#if DoLoadableServer -#define IHaveSubdirs -SUBDIRS = extmod -#endif - #if HasShm && (!(defined(NXAgentServer) && NXAgentServer)) SHMSRCS = shm.c SHMOBJS = shm.o @@ -123,10 +118,6 @@ NormalLibraryTarget(ext,$(OBJS)) LintLibraryTarget(ext,$(SRCS)) NormalLintTarget($(SRCS)) -#if DoLoadableServer -NormalLibraryTarget(exts,$(SOBJS)) -#endif - #if BuildXF86BigfontExt SpecialCObjectRule(xf86bigfont,$(ICONFIGFILES),$(SHM_DEFINES)) #endif @@ -136,18 +127,11 @@ SpecialCObjectRule(security,$(ICONFIGFILES),$(POLICYFILEDEF)) LinkConfDirectory(xserver,.,xserver,.) -LinkSourceFile(modinit.h,extmod) - #if BuildXCSecurity && InstallSecurityConfig InstallNonExecFile(SecurityPolicy,$(SERVERCONFIGDIR)) #endif DependTarget() -#if DoLoadableServer -MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) -#endif - InstallDriverSDKNonExecFile(xvdix.h,$(DRIVERSDKINCLUDEDIR)) InstallDriverSDKNonExecFile(xvmcext.h,$(DRIVERSDKINCLUDEDIR)) diff --git a/nx-X11/programs/Xserver/Xext/bigreq.c b/nx-X11/programs/Xserver/Xext/bigreq.c index 00e67c058..be5919328 100644 --- a/nx-X11/programs/Xserver/Xext/bigreq.c +++ b/nx-X11/programs/Xserver/Xext/bigreq.c @@ -38,7 +38,6 @@ from The Open Group. #include "extnsionst.h" #include <nx-X11/extensions/bigreqstr.h> #include "opaque.h" -#include "modinit.h" #if 0 static unsigned char XBigReqCode; diff --git a/nx-X11/programs/Xserver/Xext/dpms.c b/nx-X11/programs/Xserver/Xext/dpms.c index 3f75918ad..ea9781353 100644 --- a/nx-X11/programs/Xserver/Xext/dpms.c +++ b/nx-X11/programs/Xserver/Xext/dpms.c @@ -48,7 +48,6 @@ Equipment Corporation. #include <nx-X11/extensions/dpms.h> #include <nx-X11/extensions/dpmsstr.h> #include "dpmsproc.h" -#include "modinit.h" #if 0 static unsigned char DPMSCode; diff --git a/nx-X11/programs/Xserver/Xext/extmod/Imakefile b/nx-X11/programs/Xserver/Xext/extmod/Imakefile deleted file mode 100644 index 0105cf775..000000000 --- a/nx-X11/programs/Xserver/Xext/extmod/Imakefile +++ /dev/null @@ -1,66 +0,0 @@ -#define IHaveModules -#include <Server.tmpl> - -#if BuildScreenSaverExt - SCRNSAVSRC = saver.c - SCRNSAVOBJ = saver.o -LinkSourceFile(saver.c,..) -#endif - -#if BuildDPMS - DPMSSRCS = dpms.c - DPMSOBJS = dpms.o -LinkSourceFile(dpms.c,..) -#endif - -#if BuildXvExt - XVSRCS = xvmain.c xvdisp.c xvmod.c xvmc.c - XVOBJS = xvmain.o xvdisp.o xvmod.o xvmc.o -LinkSourceFile(xvmain.c,..) -LinkSourceFile(xvdisp.c,..) -LinkSourceFile(xvmod.c,..) -LinkSourceFile(xvmc.c,..) -#endif - -#if BuildXResExt - XRESSRCS = xres.c - XRESOBJS = xres.o -LinkSourceFile(xres.c,..) -#endif - - MODINITSRCS = modinit.c - MODINITOBJS = modinit.o - - SRCS = shape.c \ - bigreq.c sync.c $(SCRNSAVSRC) xcmisc.c \ - $(DPMSSRCS) \ - $(XVSRCS) $(MODINITSRCS) $(XRESSRCS) - - MOBJS = $(MODINITOBJS) shape.o \ - bigreq.o sync.o $(SCRNSAVOBJ) xcmisc.o \ - $(DPMSOBJS) \ - $(XVOBJS) $(XRESOBJS) - - DEFINES = -DEXTMODULE $(EXT_DEFINES) - -XF86INCLUDES = -I$(XF86COMSRC) - INCLUDES = -I.. -I../../include -I$(XINCLUDESRC) -I$(EXTINCSRC) \ - $(XF86INCLUDES) - LINTLIBS = ../../dix/llib-ldix.ln ../../os/llib-los.ln - -LinkSourceFile(shape.c,..) -LinkSourceFile(bigreq.c,..) -LinkSourceFile(sync.c,..) -LinkSourceFile(xcmisc.c,..) - -ModuleObjectRule() - -SpecialCObjectRule(modinit,$(ICONFIGFILES),$(EXT_DEFINES)) -LibraryModuleTarget(extmod,$(MOBJS)) -NormalLintTarget($(SRCS)) - -InstallLibraryModule(extmod,$(MODULEDIR),extensions) - -DependTarget() - -InstallDriverSDKLibraryModule(extmod,$(DRIVERSDKMODULEDIR),extensions) diff --git a/nx-X11/programs/Xserver/Xext/extmod/modinit.c b/nx-X11/programs/Xserver/Xext/extmod/modinit.c deleted file mode 100644 index 7b5530973..000000000 --- a/nx-X11/programs/Xserver/Xext/extmod/modinit.c +++ /dev/null @@ -1,182 +0,0 @@ - -/* - * - * Copyright (c) 1997 Matthieu Herrb - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Matthieu Herrb not be used in - * advertising or publicity pertaining to distribution of the software without - * specific, written prior permission. Matthieu Herrb makes no - * representations about the suitability of this software for any purpose. - * It is provided "as is" without express or implied warranty. - * - * MATTHIEU HERRB DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, - * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO - * EVENT SHALL MATTHIEU HERRB BE LIABLE FOR ANY SPECIAL, INDIRECT OR - * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, - * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER - * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR - * PERFORMANCE OF THIS SOFTWARE. - */ - -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - -#ifdef XFree86LOADER -#include "xf86_ansic.h" - -#include "xf86Module.h" -#include "xf86Opt.h" - -#include <nx-X11/Xproto.h> - -#include "modinit.h" -#include "globals.h" - -static MODULESETUPPROTO(extmodSetup); - -/* - * Array describing extensions to be initialized - */ -ExtensionModule extensionModules[] = { -#ifdef SHAPE - { - ShapeExtensionInit, - SHAPENAME, - &noShapeExtension, - NULL, - NULL - }, -#endif -#ifdef notyet - { - XTestExtensionInit, - XTestExtensionName, - &noTestExtensions, - NULL, - NULL - }, -#endif -#ifdef BIGREQS - { - BigReqExtensionInit, - XBigReqExtensionName, - &noBigReqExtension, - NULL, - NULL - }, -#endif -#ifdef XSYNC - { - SyncExtensionInit, - SYNC_NAME, - &noSyncExtension, - NULL, - NULL - }, -#endif -#ifdef SCREENSAVER - { - ScreenSaverExtensionInit, - ScreenSaverName, - &noScreenSaverExtension, - NULL, - NULL - }, -#endif -#ifdef DPMSExtension - { - DPMSExtensionInit, - DPMSExtensionName, - &noDPMSExtension, - NULL, - NULL - }, -#endif -#ifdef XV - { - XvExtensionInit, - XvName, - &noXvExtension, - XvRegister, - NULL - }, - { - XvMCExtensionInit, - XvMCName, - &noXvExtension, - NULL, - NULL - }, -#endif -#ifdef RES - { - ResExtensionInit, - XRES_NAME, - &noResExtension, - NULL, - NULL - }, -#endif - { /* DON'T delete this entry ! */ - NULL, - NULL, - NULL, - NULL, - NULL - } -}; - -static XF86ModuleVersionInfo VersRec = -{ - "extmod", - MODULEVENDORSTRING, - MODINFOSTRING1, - MODINFOSTRING2, - XORG_VERSION_CURRENT, - 1, 0, 0, - ABI_CLASS_EXTENSION, - ABI_EXTENSION_VERSION, - MOD_CLASS_EXTENSION, - {0,0,0,0} -}; - -/* - * Data for the loader - */ -XF86ModuleData extmodModuleData = { &VersRec, extmodSetup, NULL }; - -static void * -extmodSetup(void * module, void * opts, int *errmaj, int *errmin) -{ - int i; - - /* XXX the option stuff here is largely a sample/test case */ - - for (i = 0; extensionModules[i].name != NULL; i++) { - if (opts) { - char *s; - s = (char *)malloc(strlen(extensionModules[i].name) + 5); - if (s) { - void * o; - strcpy(s, "omit"); - strcat(s, extensionModules[i].name); - o = xf86FindOption(opts, s); - free(s); - if (o) { - xf86MarkOptionUsed(o); - continue; - } - } - } - LoadExtension(&extensionModules[i], FALSE); - } - /* Need a non-NULL return */ - return (void *)1; -} - -#endif /* XFree86LOADER */ diff --git a/nx-X11/programs/Xserver/Xext/extmod/modinit.h b/nx-X11/programs/Xserver/Xext/extmod/modinit.h deleted file mode 100644 index 96ba2da48..000000000 --- a/nx-X11/programs/Xserver/Xext/extmod/modinit.h +++ /dev/null @@ -1,91 +0,0 @@ - -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - -#ifdef SHAPE -extern void ShapeExtensionInit(void); -#include <X11/extensions/shapeproto.h> -#endif - -#ifdef XTEST -extern void XTestExtensionInit(void); -#define _XTEST_SERVER_ -#include <nx-X11/extensions/xtestconst.h> -#include <nx-X11/extensions/xteststr.h> -#endif - -#if 1 -extern void XTestExtension1Init(void); -#endif - -#ifdef BIGREQS -extern void BigReqExtensionInit(void); -#include <nx-X11/extensions/bigreqstr.h> -#endif - -#ifdef XSYNC -extern void SyncExtensionInit(void); -#define _SYNC_SERVER -#include <nx-X11/extensions/sync.h> -#include <nx-X11/extensions/syncstr.h> -#endif - -#ifdef SCREENSAVER -extern void ScreenSaverExtensionInit (void); -#include <nx-X11/extensions/saver.h> -#endif - -#ifdef XCMISC -extern void XCMiscExtensionInit(void); -#include <nx-X11/extensions/xcmiscstr.h> -#endif - -#ifdef DPMSExtension -extern void DPMSExtensionInit(void); -#include <nx-X11/extensions/dpmsstr.h> -#endif - -#ifdef XV -extern void XvExtensionInit(void); -extern void XvMCExtensionInit(void); -extern void XvRegister(void); -#include <nx-X11/extensions/Xv.h> -#include <nx-X11/extensions/XvMC.h> -#endif - -#ifdef RES -extern void ResExtensionInit(void); -#include <nx-X11/extensions/XResproto.h> -#endif - -#ifdef SHM -extern void ShmExtensionInit(void); -#include <X11/extensions/shmproto.h> -extern void ShmSetPixmapFormat( - ScreenPtr pScreen, - int format); -extern void ShmRegisterFuncs( - ScreenPtr pScreen, - ShmFuncsPtr funcs); -#endif - -#if 1 -extern void SecurityExtensionInit(void); -#endif - -#if 1 -extern void XagExtensionInit(void); -#endif - -#if 1 -extern void XpExtensionInit(void); -#endif - -#if 1 -extern void PanoramiXExtensionInit(int argc, char *argv[]); -#endif - -#if 1 -extern void XkbExtensionInit(void); -#endif diff --git a/nx-X11/programs/Xserver/Xext/panoramiX.c b/nx-X11/programs/Xserver/Xext/panoramiX.c index 206fa5406..3809890bc 100644 --- a/nx-X11/programs/Xserver/Xext/panoramiX.c +++ b/nx-X11/programs/Xserver/Xext/panoramiX.c @@ -55,7 +55,6 @@ Equipment Corporation. #ifdef RENDER #include "picturestr.h" #endif -#include "modinit.h" #include "protocol-versions.h" #ifdef GLXPROXY diff --git a/nx-X11/programs/Xserver/Xext/saver.c b/nx-X11/programs/Xserver/Xext/saver.c index 51f18e4e4..0cb71de42 100644 --- a/nx-X11/programs/Xserver/Xext/saver.c +++ b/nx-X11/programs/Xserver/Xext/saver.c @@ -59,8 +59,6 @@ in this Software without prior written authorization from the X Consortium. #include <stdio.h> #endif -#include "modinit.h" - #include "protocol-versions.h" #if 0 diff --git a/nx-X11/programs/Xserver/Xext/security.c b/nx-X11/programs/Xserver/Xext/security.c index c1b7b50a9..6883db5f8 100644 --- a/nx-X11/programs/Xserver/Xext/security.c +++ b/nx-X11/programs/Xserver/Xext/security.c @@ -112,8 +112,6 @@ static char _NXPolicyFilePath[1024]; #endif -#include "modinit.h" - static int SecurityErrorBase; /* first Security error number */ static int SecurityEventBase; /* first Security event number */ diff --git a/nx-X11/programs/Xserver/Xext/shape.c b/nx-X11/programs/Xserver/Xext/shape.c index 165bee50c..50a6db119 100644 --- a/nx-X11/programs/Xserver/Xext/shape.c +++ b/nx-X11/programs/Xserver/Xext/shape.c @@ -46,7 +46,6 @@ in this Software without prior written authorization from The Open Group. #ifdef EXTMODULE #include "xf86_ansic.h" #endif -#include "modinit.h" typedef RegionPtr (*CreateDftPtr)( WindowPtr /* pWin */ diff --git a/nx-X11/programs/Xserver/Xext/shm.c b/nx-X11/programs/Xserver/Xext/shm.c index a91afdaf0..f27d70ffe 100644 --- a/nx-X11/programs/Xserver/Xext/shm.c +++ b/nx-X11/programs/Xserver/Xext/shm.c @@ -68,8 +68,6 @@ in this Software without prior written authorization from The Open Group. #include "panoramiXsrv.h" #endif -#include "modinit.h" - typedef struct _ShmDesc { struct _ShmDesc *next; int shmid; diff --git a/nx-X11/programs/Xserver/Xext/sync.c b/nx-X11/programs/Xserver/Xext/sync.c index 945dec250..0421cd9f9 100644 --- a/nx-X11/programs/Xserver/Xext/sync.c +++ b/nx-X11/programs/Xserver/Xext/sync.c @@ -77,8 +77,6 @@ PERFORMANCE OF THIS SOFTWARE. #endif #endif -#include "modinit.h" - /* * Local Global Variables */ diff --git a/nx-X11/programs/Xserver/Xext/xcmisc.c b/nx-X11/programs/Xserver/Xext/xcmisc.c index b7f55aa6d..bb47df979 100644 --- a/nx-X11/programs/Xserver/Xext/xcmisc.c +++ b/nx-X11/programs/Xserver/Xext/xcmisc.c @@ -38,7 +38,6 @@ from The Open Group. #include "extnsionst.h" #include "swaprep.h" #include <nx-X11/extensions/xcmiscstr.h> -#include "modinit.h" #include <stdint.h> diff --git a/nx-X11/programs/Xserver/Xext/xres.c b/nx-X11/programs/Xserver/Xext/xres.c index 243de9c39..426983135 100644 --- a/nx-X11/programs/Xserver/Xext/xres.c +++ b/nx-X11/programs/Xserver/Xext/xres.c @@ -15,7 +15,6 @@ #include "swaprep.h" #include <nx-X11/extensions/XResproto.h> #include "pixmapstr.h" -#include "modinit.h" #include "protocol-versions.h" static int diff --git a/nx-X11/programs/Xserver/Xext/xtest.c b/nx-X11/programs/Xserver/Xext/xtest.c index 6cd7d1111..c410a4955 100644 --- a/nx-X11/programs/Xserver/Xext/xtest.c +++ b/nx-X11/programs/Xserver/Xext/xtest.c @@ -54,8 +54,6 @@ from The Open Group. #include "xf86_ansic.h" #endif -#include "modinit.h" - #if 0 static unsigned char XTestReqCode; #endif diff --git a/nx-X11/programs/Xserver/Xext/xtest1.frags b/nx-X11/programs/Xserver/Xext/xtest1.frags deleted file mode 100644 index bdf7943b7..000000000 --- a/nx-X11/programs/Xserver/Xext/xtest1.frags +++ /dev/null @@ -1,90 +0,0 @@ -There are several code fragments that need to be placed in the device -dependent part of the server. These are described below. These code -fragments are device and implementation dependent. - -This code fragment should go in your ddx InitInput() routine: - -#ifdef XTESTEXT1 -extern KeyCode xtest_command_key; -#endif - -#ifdef XTESTEXT1 - xtest_command_key = <whatever-is-a-good-keycode-for-your-keyboard>; -#endif - -This code fragment should go at the front of the file that handles -keyboards: - -#ifdef XTESTEXT1 -/* - * defined in xtestext1di.c - */ -extern int on_steal_input; -extern Bool XTestStealKeyData(); -#endif XTESTEXT1 - -This code fragment should go in the function that parses input from the -keyboard or pointer after you know what input action has occurred, but before -you have told the server about it. If conditionalizes the actual function -call to pass the information on: - -#ifdef XTESTEXT1 - if (!on_steal_input || - XTestStealKeyData(code, direction, dev_type, x, y)) -#endif /* XTESTEXT1 */ - handle_device_event(...); - -This code fragment should go in the function that handles mouse motion after -you have figured out how much the mouse has moved: - -#ifdef XTESTEXT1 - if (on_steal_input) - XTestStealMotionData(dx, dy, dev, x, y); -#endif XTESTEXT1 - - -This code fragment should go at the front of the os-specific code where -you wait (by doing a select on the socket in our implementation) for -something to happen: - -#ifdef XTESTEXT1 -extern int playback_on; -void XTestComputeWaitTime(); -#endif XTESTEXT1 - -These code fragments should go in the os-specific code on both sides of -where you wait (by doing a select on the socket in our implementation) -for something to happen: - -#ifdef XTESTEXT1 - if (playback_on) - XTestComputeWaitTime(wt = &waittime); -#endif XTESTEXT1 - ... code to do select ... - WakeupHandler(i, LastSelectMask); -#ifdef XTESTEXT1 - if (playback_on) - i = XTestProcessInputAction(i, &waittime); -#endif XTESTEXT1 - - -You also need to implement the following routines (documentation -is needed; for now, see server/ddx/hp/hp/x_hil.c): - -void -XTestGenerateEvent(dev_type, keycode, keystate, mousex, mousey) - int dev_type; - int keycode; - int keystate; - int mousex; - int mousey; - -void -XTestGetPointerPos(fmousex, fmousey) - short *fmousex, *fmousey; - -void -XTestJumpPointer(jx, jy, dev_type) - int jx; - int jy; - int dev_type; diff --git a/nx-X11/programs/Xserver/Xext/xtest1di.c b/nx-X11/programs/Xserver/Xext/xtest1di.c index ac49ba2a3..b1d69ef47 100644 --- a/nx-X11/programs/Xserver/Xext/xtest1di.c +++ b/nx-X11/programs/Xserver/Xext/xtest1di.c @@ -71,7 +71,6 @@ University of California. #include "opaque.h" #define XTestSERVER_SIDE #include <nx-X11/extensions/xtestext1.h> -#include "modinit.h" #include "xtest1dd.h" diff --git a/nx-X11/programs/Xserver/Xext/xvmod.c b/nx-X11/programs/Xserver/Xext/xvmod.c deleted file mode 100644 index 469bd950d..000000000 --- a/nx-X11/programs/Xserver/Xext/xvmod.c +++ /dev/null @@ -1,23 +0,0 @@ - -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - -#include <nx-X11/X.h> -#include "misc.h" -#include "scrnintstr.h" -#include "gc.h" -#include <nx-X11/extensions/Xv.h> -#include <nx-X11/extensions/Xvproto.h> -#include "xvdix.h" -#include "xvmodproc.h" - -void -XvRegister() -{ - XvScreenInitProc = XvScreenInit; - XvGetScreenIndexProc = XvGetScreenIndex; - XvGetRTPortProc = XvGetRTPort; - XvMCScreenInitProc = XvMCScreenInit; -} - diff --git a/nx-X11/programs/Xserver/Xext/xvmodproc.h b/nx-X11/programs/Xserver/Xext/xvmodproc.h deleted file mode 100644 index 81356a149..000000000 --- a/nx-X11/programs/Xserver/Xext/xvmodproc.h +++ /dev/null @@ -1,13 +0,0 @@ - -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - -#include "xvmcext.h" - -extern int (*XvGetScreenIndexProc)(void); -extern unsigned long (*XvGetRTPortProc)(void); -extern int (*XvScreenInitProc)(ScreenPtr); -extern int (*XvMCScreenInitProc)(ScreenPtr, int, XvMCAdaptorPtr); - -extern void XvRegister(void); diff --git a/nx-X11/programs/Xserver/dbe/Imakefile b/nx-X11/programs/Xserver/dbe/Imakefile index 4e03a03ad..54ce471c5 100644 --- a/nx-X11/programs/Xserver/dbe/Imakefile +++ b/nx-X11/programs/Xserver/dbe/Imakefile @@ -1,12 +1,5 @@ -#if DoLoadableServer -#define IHaveSubdirs -#endif - #include <Server.tmpl> -#if DoLoadableServer - SUBDIRS = module -#endif SRCS = dbe.c midbe.c OBJS = dbe.o midbe.o @@ -20,10 +13,6 @@ NormalLibraryTarget(dbe,$(OBJS)) LintLibraryTarget(dbe,$(SRCS)) NormalLintTarget($(SRCS)) -#if DoLoadableServer -MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) -#endif DependTarget() diff --git a/nx-X11/programs/Xserver/dbe/dbemodule.c b/nx-X11/programs/Xserver/dbe/dbemodule.c deleted file mode 100644 index 00be6cb49..000000000 --- a/nx-X11/programs/Xserver/dbe/dbemodule.c +++ /dev/null @@ -1,47 +0,0 @@ - -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - -#include "xf86Module.h" -#include "globals.h" - -static MODULESETUPPROTO(dbeSetup); - -extern void DbeExtensionInit(void); - -ExtensionModule dbeExt = { - DbeExtensionInit, - "DOUBLE-BUFFER", - &noDbeExtension, - NULL, - NULL -}; - -static XF86ModuleVersionInfo VersRec = -{ - "dbe", - MODULEVENDORSTRING, - MODINFOSTRING1, - MODINFOSTRING2, - XORG_VERSION_CURRENT, - 1, 0, 0, - ABI_CLASS_EXTENSION, - ABI_EXTENSION_VERSION, - MOD_CLASS_EXTENSION, - {0,0,0,0} -}; - -/* - * Data for the loader - */ -XF86ModuleData dbeModuleData = { &VersRec, dbeSetup, NULL }; - -static void * -dbeSetup(void * module, void * opts, int *errmaj, int *errmin) -{ - LoadExtension(&dbeExt, FALSE); - - /* Need a non-NULL return value to indicate success */ - return (void *)1; -} diff --git a/nx-X11/programs/Xserver/dbe/module/Imakefile b/nx-X11/programs/Xserver/dbe/module/Imakefile deleted file mode 100644 index 8b099e844..000000000 --- a/nx-X11/programs/Xserver/dbe/module/Imakefile +++ /dev/null @@ -1,30 +0,0 @@ -#define IHaveModules -#include <Server.tmpl> - -#if DoLoadableServer - MSRCS = dbemodule.c - MOBJS = dbemodule.o -#endif - - SRCS = dbe.c midbe.c $(MSRCS) - OBJS = dbe.o midbe.o $(MOBJS) - INCLUDES = -I.. -I$(SERVERSRC)/include -I$(XINCLUDESRC) -I$(EXTINCSRC) $(EXTRAINCLUDES) - LINTLIBS = ../../dix/llib-ldix.ln ../../os/llib-los.ln - DEFINES = $(EXT_DEFINES) - -LinkSourceFile(dbemodule.c,..) -LinkSourceFile(midbe.c,..) -LinkSourceFile(dbe.c,..) - -ModuleObjectRule() - -LibraryModuleTarget(dbe,$(OBJS)) - -LintLibraryTarget(dbe,$(SRCS)) -NormalLintTarget($(SRCS)) - -InstallLibraryModule(dbe,$(MODULEDIR),extensions) - -DependTarget() - -InstallDriverSDKLibraryModule(dbe,$(DRIVERSDKMODULEDIR),extensions) diff --git a/nx-X11/programs/Xserver/fb/Imakefile b/nx-X11/programs/Xserver/fb/Imakefile index 43960fc98..eb61db95a 100644 --- a/nx-X11/programs/Xserver/fb/Imakefile +++ b/nx-X11/programs/Xserver/fb/Imakefile @@ -17,14 +17,6 @@ SpecialCObjectRule(fbcopy,fbcopy.c,$(USEMMXOPTIONS)) #endif */ -#if DoLoadableServer -#if !BuildModuleInSubdir -#define IHaveModules -#elif !defined(IHaveModules) -#define IHaveSubdirs -SUBDIRS = module -#endif -#endif #include <Server.tmpl> @@ -32,10 +24,6 @@ SUBDIRS = module FB_DEFINES=-DFBNOPIXADDR -DFBNO24BIT #endif -#if defined(IHaveModules) -XFMODSRC = fbmodule.c -XFMODOBJ = fbmodule.o -#endif #if BuildRender RENDERSRC = fbcompose.c @@ -131,21 +119,13 @@ OBJS = $(XFMODOBJ) \ LINTLIBS = $(SERVERSRC)/dix/llib-ldix.ln $(SERVERSRC)/os/llib-los.ln \ $(SERVERSRC)/mi/llib-lmi.ln -#ifdef IHaveModules -ModuleObjectRule() -LibraryModuleTarget(fb,$(OBJS)) -#else NormalLibraryObjectRule() NormalLibraryTarget(fb,$(OBJS)) -#endif LintLibraryTarget(fb,$(SRCS)) NormalLintTarget($(SRCS)) -#ifdef IHaveModules -InstallLibraryModule(fb,$(MODULEDIR),.) -#endif DependTarget() diff --git a/nx-X11/programs/Xserver/fb/fb24_32.h b/nx-X11/programs/Xserver/fb/fb24_32.h deleted file mode 100644 index 023042025..000000000 --- a/nx-X11/programs/Xserver/fb/fb24_32.h +++ /dev/null @@ -1,53 +0,0 @@ -/* - * $XFree86$ - * - * Copyright © 2000 SuSE, Inc. - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of SuSE not be used in advertising or - * publicity pertaining to distribution of the software without specific, - * written prior permission. SuSE makes no representations about the - * suitability of this software for any purpose. It is provided "as is" - * without express or implied warranty. - * - * SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE - * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * Author: Keith Packard, SuSE, Inc. - */ - -#ifdef HAVE_DIX_CONFIG_H -#include <dix-config.h> -#endif - -#ifndef _FB24_32_H_ -#define _FB24_32_H_ - -Bool -fb24_32FinishScreenInit(ScreenPtr pScreen, - void *pbits, - int xsize, - int ysize, - int dpix, - int dpiy, - int width, - int bpp); - -Bool -fb24_32ScreenInit(ScreenPtr pScreen, - void *pbits, - int xsize, - int ysize, - int dpix, - int dpiy, - int width, - int bpp); - -#endif diff --git a/nx-X11/programs/Xserver/fb/fbmodule.c b/nx-X11/programs/Xserver/fb/fbmodule.c deleted file mode 100644 index 0e6cd2dba..000000000 --- a/nx-X11/programs/Xserver/fb/fbmodule.c +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Copyright (C) 1998 The XFree86 Project, Inc. All Rights Reserved. - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to - * deal in the Software without restriction, including without limitation the - * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * XFREE86 PROJECT BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - * Except as contained in this notice, the name of the XFree86 Project shall - * not be used in advertising or otherwise to promote the sale, use or other - * dealings in this Software without prior written authorization from the - * XFree86 Project. - */ - -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - -#ifdef XFree86LOADER - -#include "xf86Module.h" -#include "fb.h" - -static XF86ModuleVersionInfo VersRec = -{ - "fb", - MODULEVENDORSTRING, - MODINFOSTRING1, - MODINFOSTRING2, - XORG_VERSION_CURRENT, - 1, 0, 0, - ABI_CLASS_ANSIC, /* Only need the ansic layer */ - ABI_ANSIC_VERSION, - MOD_CLASS_NONE, - {0,0,0,0} /* signature, to be patched into the file by a tool */ -}; - -XF86ModuleData fbModuleData = { &VersRec, NULL, NULL }; - -#endif diff --git a/nx-X11/programs/Xserver/fb/module/Imakefile b/nx-X11/programs/Xserver/fb/module/Imakefile deleted file mode 100644 index d063bc28d..000000000 --- a/nx-X11/programs/Xserver/fb/module/Imakefile +++ /dev/null @@ -1,4 +0,0 @@ -#define IHaveModules -#define LinkDirectory .. - -#include "../Imakefile" diff --git a/nx-X11/programs/Xserver/include/Imakefile b/nx-X11/programs/Xserver/include/Imakefile index 03c389989..8c89fbc2b 100644 --- a/nx-X11/programs/Xserver/include/Imakefile +++ b/nx-X11/programs/Xserver/include/Imakefile @@ -2,10 +2,6 @@ HEADERS = os.h misc.h #if defined(XorgVersion) \ || defined(BSDOSArchitecture) -#if DoLoadableServer -LinkSourceFile(xf86Module.h,$(XF86COMSRC)) -LinkSourceFile(xf86Opt.h,$(XF86COMSRC)) -#endif #endif LinkSourceFile(osdep.h,../os) diff --git a/nx-X11/programs/Xserver/mi/Imakefile b/nx-X11/programs/Xserver/mi/Imakefile index 9f7b062df..fda19aa59 100644 --- a/nx-X11/programs/Xserver/mi/Imakefile +++ b/nx-X11/programs/Xserver/mi/Imakefile @@ -36,12 +36,8 @@ CBRT_OBJ = cbrt.o FFS_DEFINES = -DHAS_FFS #endif -#if DoLoadableServer -EXTRAMIINITEXTOBJ = miinitext.o -#else MIINITEXTSRC = miinitext.c MIINITEXTOBJ = miinitext.o -#endif #if (!(defined(NXAgentServer) && NXAgentServer)) NXAGENT_SKIP_SRCS = \ diff --git a/nx-X11/programs/Xserver/miext/cw/Imakefile b/nx-X11/programs/Xserver/miext/cw/Imakefile index 795ed1987..395e60a48 100644 --- a/nx-X11/programs/Xserver/miext/cw/Imakefile +++ b/nx-X11/programs/Xserver/miext/cw/Imakefile @@ -1,4 +1,3 @@ -#define IHaveModules #include <Server.tmpl> SRCS = cw.c cw_ops.c cw_render.c diff --git a/nx-X11/programs/Xserver/os/Imakefile b/nx-X11/programs/Xserver/os/Imakefile index 047ad6615..e78b422ab 100644 --- a/nx-X11/programs/Xserver/os/Imakefile +++ b/nx-X11/programs/Xserver/os/Imakefile @@ -188,9 +188,4 @@ SpecialCObjectRule(oscolor,$(ICONFIGFILES),$(DBM_DEFINES)) LinkSourceFile(snprintf.c,$(LIBSRC)/misc) #endif -#if DoLoadableServer -AllTarget(libcwrapper.o) -ObjectFromSpecialSource(libcwrapper,$(XF86OSSRC)/shared/libc_wrapper,-DSELF_CONTAINED_WRAPPER) -#endif - DependTarget() diff --git a/nx-X11/programs/Xserver/randr/registry.h b/nx-X11/programs/Xserver/randr/registry.h deleted file mode 100644 index 28b1510f2..000000000 --- a/nx-X11/programs/Xserver/randr/registry.h +++ /dev/null @@ -1,64 +0,0 @@ -/*********************************************************** - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN -AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN -CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -******************************************************************/ - -#ifndef DIX_REGISTRY_H -#define DIX_REGISTRY_H - -/* - * Result returned from any unsuccessful lookup - */ -#define XREGISTRY_UNKNOWN "<unknown>" - -#ifdef XREGISTRY - -#include "resource.h" -#include "extnsionst.h" - -/* Internal string registry - for auditing, debugging, security, etc. */ - -/* - * Registration functions. The name string is not copied, so it must - * not be a stack variable. - */ -void RegisterResourceName(RESTYPE type, char *name); -void RegisterExtensionNames(ExtensionEntry * ext); - -/* - * Lookup functions. The returned string must not be modified or freed. - */ -const char *LookupMajorName(int major); -const char *LookupRequestName(int major, int minor); -const char *LookupEventName(int event); -const char *LookupErrorName(int error); -const char *LookupResourceName(RESTYPE rtype); - -/* - * Setup and teardown - */ -void dixResetRegistry(void); - -#else /* XREGISTRY */ - -/* Define calls away when the registry is not being built. */ - -#define RegisterResourceName(a, b) { ; } -#define RegisterExtensionNames(a) { ; } - -#define LookupMajorName(a) XREGISTRY_UNKNOWN -#define LookupRequestName(a, b) XREGISTRY_UNKNOWN -#define LookupEventName(a) XREGISTRY_UNKNOWN -#define LookupErrorName(a) XREGISTRY_UNKNOWN -#define LookupResourceName(a) XREGISTRY_UNKNOWN - -#define dixResetRegistry() { ; } - -#endif /* XREGISTRY */ -#endif /* DIX_REGISTRY_H */ diff --git a/nx-X11/programs/Xserver/record/Imakefile b/nx-X11/programs/Xserver/record/Imakefile index fc74ec4da..40c29fe6f 100644 --- a/nx-X11/programs/Xserver/record/Imakefile +++ b/nx-X11/programs/Xserver/record/Imakefile @@ -1,14 +1,8 @@ NULL = -#if DoLoadableServer -#define IHaveSubdirs -#endif #include <Server.tmpl> -#if DoLoadableServer - SUBDIRS = module -#endif SRCS = record.c set.c OBJS = record.o set.o INCLUDES = -I../include -I$(XINCLUDESRC) -I$(EXTINCSRC) -I$(SERVERSRC)/Xext `pkg-config --cflags-only-I pixman-1` @@ -28,9 +22,5 @@ NormalLibraryTarget(record,$(OBJS)) LintLibraryTarget(record,$(SRCS)) NormalLintTarget($(SRCS)) -#if DoLoadableServer -MakeSubdirs($(SUBDIRS)) -DependSubdirs($(SUBDIRS)) -#endif DependTarget() diff --git a/nx-X11/programs/Xserver/record/module/Imakefile b/nx-X11/programs/Xserver/record/module/Imakefile deleted file mode 100644 index fd78192fb..000000000 --- a/nx-X11/programs/Xserver/record/module/Imakefile +++ /dev/null @@ -1,29 +0,0 @@ -#define IHaveModules -#include <Server.tmpl> - -#if DoLoadableServer - MSRCS = recordmod.c - MOBJS = recordmod.o -#endif - - SRCS = record.c set.c $(MSRCS) - OBJS = record.o set.o $(MOBJS) - INCLUDES = -I.. -I../../include -I$(XINCLUDESRC) -I$(EXTINCSRC) \ - -I$(SERVERSRC)/Xext - LINTLIBS = ../../dix/llib-ldix.ln - DEFINES = -DNDEBUG - -LinkSourceFile(recordmod.c,..) -LinkSourceFile(record.c,..) -LinkSourceFile(set.c,..) - -ModuleObjectRule() -LibraryModuleTarget(record,$(OBJS)) -LintLibraryTarget(record,$(SRCS)) -NormalLintTarget($(SRCS)) - -InstallLibraryModule(record,$(MODULEDIR),extensions) - -DependTarget() - -InstallDriverSDKLibraryModule(record,$(DRIVERSDKMODULEDIR),extensions) diff --git a/nx-X11/programs/Xserver/record/recordmod.c b/nx-X11/programs/Xserver/record/recordmod.c deleted file mode 100644 index bd50bbd5b..000000000 --- a/nx-X11/programs/Xserver/record/recordmod.c +++ /dev/null @@ -1,45 +0,0 @@ - -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> -#endif - -#include "xf86Module.h" - -extern Bool noTestExtensions; - -static MODULESETUPPROTO(recordSetup); - -extern void RecordExtensionInit(void); - -ExtensionModule recordExt = { - RecordExtensionInit, - "RECORD", - &noTestExtensions, - NULL, - NULL -}; - -static XF86ModuleVersionInfo VersRec = { - "record", - MODULEVENDORSTRING, - MODINFOSTRING1, - MODINFOSTRING2, - XORG_VERSION_CURRENT, - 1, 13, 0, - ABI_CLASS_EXTENSION, - ABI_EXTENSION_VERSION, - MOD_CLASS_EXTENSION, - {0,0,0,0} -}; - -XF86ModuleData recordModuleData = { &VersRec, recordSetup, NULL }; - -static void * -recordSetup(void * module, void * opts, int *errmaj, int *errmin) -{ - LoadExtension(&recordExt, FALSE); - - /* Need a non-NULL return value to indicate success */ - return (void *)1; -} - diff --git a/nx-X11/programs/Xserver/xkb/Imakefile b/nx-X11/programs/Xserver/xkb/Imakefile index 1417cbc3f..07d715301 100644 --- a/nx-X11/programs/Xserver/xkb/Imakefile +++ b/nx-X11/programs/Xserver/xkb/Imakefile @@ -65,8 +65,6 @@ AllTarget($(XF86_OBJS)) SpecialCObjectRule(xkbInit,$(ICONFIGFILES),$(XKB_DEFINES)) -LinkSourceFile(modinit.h,../Xext/extmod) - #if BuildLibraries #if UseConfDirForXkb LinkConfDirectory(xkb,.,xkb,.) |