Merge branch 'master' into mpx

Conflicts: Xi/closedev.c Xi/exevents.c Xi/extinit.c Xi/listdev.c dix/window.c hw/xfree86/common/xf86Xinput.c include/extinit.h mi/mipointer.c
mirror · Apr 2, 2007 · e8777a9 · e8777a9
2 parents a120547 + 96ce17a
commit e8777a9
Show file tree

Hide file tree

Showing 280 changed files with 4,649 additions and 5,825 deletions.
diff --git a/GL/glx/Makefile.am b/GL/glx/Makefile.am
@@ -14,7 +14,6 @@ AM_CFLAGS = \
 	-I@MESA_SOURCE@/src/mesa/glapi \
 	-I@MESA_SOURCE@/src/mesa/main \
 	-DXFree86Server \
-	-DNO_LIBCWRAPPER \
 	@GLX_DEFINES@
 
 # none yet

diff --git a/GL/mesa/X/Makefile.am b/GL/mesa/X/Makefile.am
@@ -20,13 +20,11 @@ INCLUDES = -I@MESA_SOURCE@/include \
 AM_CFLAGS = \
 	$(DIX_CFLAGS) \
 	-DXFree86Server \
-	@GLX_DEFINES@ \
-	-DXFree86Server
+	@GLX_DEFINES@
 
 libX_la_SOURCES = xf86glx.c \
                   xf86glx_util.c \
-                  xf86glx_util.h \
-                  xf86glxint.h
+                  xf86glx_util.h
 
 nodist_libX_la_SOURCES = \
                   xm_api.c \

diff --git a/GL/mesa/X/xf86glx.c b/GL/mesa/X/xf86glx.c
@@ -37,40 +37,19 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #endif
 
 #include <string.h>
-#include <regionstr.h>
-#include <resource.h>
-#include <GL/gl.h>
-#include <GL/glxint.h>
-#include <GL/glxtokens.h>
-#include <scrnintstr.h>
-#include <windowstr.h>
-#include <config.h>
+
+#include <GL/xmesa.h>
+#include <GL/internal/glcore.h>
 #include <glxserver.h>
 #include <glxscreens.h>
 #include <glxdrawable.h>
 #include <glxcontext.h>
-#include <glxext.h>
 #include <glxutil.h>
-#include "context.h"
 #include "xmesaP.h"
-#include "context.h"
 
 #include "glcontextmodes.h"
 #include "os.h"
 
-/*
- * This define is for the glcore.h header file.
- * If you add it here, then make sure you also add it in
- * ../../../glx/Imakefile.
- */
-#if 0
-#define DEBUG
-#include <GL/internal/glcore.h>
-#undef DEBUG
-#else
-#include <GL/internal/glcore.h>
-#endif
-
 typedef struct __GLXMESAscreen   __GLXMESAscreen;
 typedef struct __GLXMESAcontext  __GLXMESAcontext;
 typedef struct __GLXMESAdrawable __GLXMESAdrawable;
@@ -218,16 +197,15 @@ __glXMesaContextCopy(__GLXcontext *baseDst,
     __GLXMESAcontext *dst = (__GLXMESAcontext *) baseDst;
     __GLXMESAcontext *src = (__GLXMESAcontext *) baseSrc;
 
-    _mesa_copy_context(&src->xmesa->mesa, &dst->xmesa->mesa, mask);
-    return GL_TRUE;
+    return XMesaCopyContext(src->xmesa, dst->xmesa, mask);
 }
 
 static int
 __glXMesaContextForceCurrent(__GLXcontext *baseContext)
 {
     __GLXMESAcontext *context = (__GLXMESAcontext *) baseContext;
 
-    GlxSetRenderTables (context->xmesa->mesa.CurrentDispatch);
+    /* GlxSetRenderTables() call for XGL moved in XMesaForceCurrent() */
 
     return XMesaForceCurrent(context->xmesa);
 }

diff --git a/GL/mesa/X/xf86glx_util.c b/GL/mesa/X/xf86glx_util.c
@@ -37,8 +37,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <stdlib.h>
 
-#include <gcstruct.h>
-#include "pixmapstr.h"
 #include "xf86glx_util.h"
 #include <X11/Xmd.h>
 

diff --git a/GL/mesa/X/xf86glxint.h b/GL/mesa/X/xf86glxint.h
diff --git a/GL/mesa/main/Makefile.am b/GL/mesa/main/Makefile.am
@@ -68,6 +68,7 @@ nodist_libmain_la_SOURCES = accum.c \
                     rastpos.c \
                     rbadaptors.c \
                     renderbuffer.c \
+                    shaders.c \
                     state.c \
                     stencil.c \
                     texcompress.c \

diff --git a/GL/mesa/shader/Makefile.am b/GL/mesa/shader/Makefile.am
@@ -27,8 +27,13 @@ nodist_libshader_la_SOURCES = \
                       atifragshader.c \
                       nvfragparse.c \
                       nvprogram.c \
-                      nvvertexec.c \
-		      nvvertparse.c \
+                      nvvertparse.c \
+                      prog_debug.c \
+                      prog_execute.c \
+                      prog_instruction.c \
+                      prog_parameter.c \
+                      prog_print.c \
                       program.c \
-                      shaderobjects.c \
-		      shaderobjects_3dlabs.c
+                      programopt.c \
+                      prog_statevars.c \
+                      shader_api.c
diff --git a/GL/mesa/shader/slang/Makefile.am b/GL/mesa/shader/slang/Makefile.am
@@ -18,23 +18,23 @@ INCLUDES = -I@MESA_SOURCE@/include \
            -I../.. \
            -I$(top_srcdir)/hw/xfree86/os-support
 
-nodist_libslang_la_SOURCES = slang_analyse.c \
-		      slang_assemble_assignment.c \
-		      slang_assemble.c \
-		      slang_assemble_conditional.c \
-		      slang_assemble_constructor.c \
-		      slang_assemble_typeinfo.c \
+nodist_libslang_la_SOURCES = slang_builtin.c \
+		      slang_codegen.c \
 		      slang_compile.c \
 		      slang_compile_function.c \
 		      slang_compile_operation.c \
 		      slang_compile_struct.c \
 		      slang_compile_variable.c \
-		      slang_execute.c \
-		      slang_execute_x86.c \
-		      slang_export.c \
-		      slang_library_texsample.c \
+		      slang_emit.c \
+		      slang_ir.c \
+		      slang_label.c \
 		      slang_library_noise.c \
 		      slang_link.c \
+		      slang_log.c \
 		      slang_preprocess.c \
+		      slang_print.c \
+		      slang_simplify.c \
 		      slang_storage.c \
-		      slang_utility.c
+		      slang_typeinfo.c \
+		      slang_utility.c \
+		      slang_vartable.c
diff --git a/GL/mesa/swrast/Makefile.am b/GL/mesa/swrast/Makefile.am
@@ -23,7 +23,6 @@ nodist_libswrast_la_SOURCES = s_aaline.c \
                       s_aatriangle.c \
                       s_accum.c \
                       s_alpha.c \
-                      s_arbshader.c \
                       s_atifragshader.c \
                       s_bitmap.c \
                       s_blend.c \
@@ -35,11 +34,11 @@ nodist_libswrast_la_SOURCES = s_aaline.c \
                       s_drawpix.c \
                       s_feedback.c \
                       s_fog.c \
+		      s_fragprog.c \
                       s_imaging.c \
                       s_lines.c \
                       s_logic.c \
                       s_masking.c \
-                      s_nvfragprog.c \
                       s_points.c \
                       s_readpix.c \
                       s_span.c \

diff --git a/GL/mesa/tnl/Makefile.am b/GL/mesa/tnl/Makefile.am
@@ -23,7 +23,6 @@ nodist_libtnl_la_SOURCES = t_context.c \
                       t_pipeline.c \
                       t_vb_arbprogram.c \
                       t_vb_arbprogram_sse.c \
-                      t_vb_arbshader.c \
                       t_vb_cull.c \
                       t_vb_fog.c \
                       t_vb_light.c \

diff --git a/Xext/appgroup.c b/Xext/appgroup.c
@@ -116,8 +116,7 @@ int XagAppGroupFree(
     return Success;
 }
 
-/* static */
-void XagClientStateChange(
+static void XagClientStateChange(
     CallbackListPtr* pcbl,
     pointer nulldata,
     pointer calldata)
@@ -172,21 +171,6 @@ void XagClientStateChange(
     }
 }
 
-void
-XagExtensionInit(INITARGS)
-{
-    if (AddExtension (XAGNAME,
-		      0,
-		      XagNumberErrors,
-		      ProcXagDispatch,
-		      SProcXagDispatch,
-		      XagResetProc,
-		      StandardMinorOpcode)) {
-	RT_APPGROUP = CreateNewResourceType (XagAppGroupFree);
-	XaceRegisterCallback(XACE_AUTH_AVAIL, XagCallClientStateChange, NULL);
-    }
-}
-
 /*ARGSUSED*/
 static 
 void XagResetProc(
@@ -393,8 +377,7 @@ int AttrValidate(
     return client->noClientException;
 }
 
-/* static */
-int ProcXagCreate (
+static int ProcXagCreate (
     register ClientPtr client)
 {
     REQUEST (xXagCreateReq);
@@ -425,8 +408,7 @@ int ProcXagCreate (
     return client->noClientException;
 }
 
-/* static */
-int ProcXagDestroy(
+static int ProcXagDestroy(
     register ClientPtr client)
 {
     AppGroupPtr pAppGrp;
@@ -743,18 +725,7 @@ XID XagId(
     return (client->appgroup ? client->appgroup->appgroupId : 0);
 }
 
-void XagGetDeltaInfo(
-    ClientPtr client,
-    CARD32* buf)
-{
-    *buf++ = (CARD32) client->appgroup->default_root;
-    *buf++ = (CARD32) client->appgroup->root_visual;
-    *buf++ = (CARD32) client->appgroup->default_colormap;
-    *buf++ = (CARD32) client->appgroup->black_pixel;
-    *buf = (CARD32) client->appgroup->white_pixel;
-}
-
-void XagCallClientStateChange(
+static void XagCallClientStateChange(
     CallbackListPtr *pcbl,
     pointer nulldata,
     pointer calldata)
@@ -785,3 +756,18 @@ void XagCallClientStateChange(
 	XagClientStateChange (NULL, NULL, (pointer)&clientinfo);
     }
 }
+
+void
+XagExtensionInit(INITARGS)
+{
+    if (AddExtension (XAGNAME,
+		      0,
+		      XagNumberErrors,
+		      ProcXagDispatch,
+		      SProcXagDispatch,
+		      XagResetProc,
+		      StandardMinorOpcode)) {
+	RT_APPGROUP = CreateNewResourceType (XagAppGroupFree);
+	XaceRegisterCallback(XACE_AUTH_AVAIL, XagCallClientStateChange, NULL);
+    }
+}
diff --git a/Xext/appgroup.h b/Xext/appgroup.h
@@ -50,12 +50,6 @@ extern ClientPtr XagLeader(
     ClientPtr			/* client */
 );
 
-extern void XagCallClientStateChange(
-    CallbackListPtr *		/* pcbl */,
-    pointer 			/* nulldata */,
-    pointer 			/* calldata */
-);
-
 extern Bool XagIsControlledRoot (
     ClientPtr			/* client */,
     WindowPtr			/* pParent */
@@ -65,22 +59,6 @@ extern XID XagId (
     ClientPtr			/* client */
 );
 
-extern void XagGetDeltaInfo (
-    ClientPtr			/* client */,
-    CARD32*			/* buf */
-);
-
-extern void XagClientStateChange(
-    CallbackListPtr* pcbl,
-    pointer nulldata,
-    pointer calldata);
-
-extern int ProcXagCreate (
-    register ClientPtr client);
-
-extern int ProcXagDestroy(
-    register ClientPtr client);
-
 _XFUNCPROTOEND
 
 #endif /* _APPGROUP_SRV_H_ */