summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/x11
diff options
context:
space:
mode:
authorKeith Whitwell <[email protected]>2007-06-14 18:23:43 +0100
committerKeith Whitwell <[email protected]>2007-06-14 18:23:43 +0100
commit943964a1e5bad86bdceb0a06d60fb3b302ebce6a (patch)
treea4ed47408b6d7a856b510ae68230d0ba3479071f /src/mesa/drivers/x11
parent6393cda6766b707ef01e925d378239a66d143ae0 (diff)
Rename directories again?!
Some git wierdness going on.
Diffstat (limited to 'src/mesa/drivers/x11')
-rw-r--r--src/mesa/drivers/x11/xm_api.c6
-rw-r--r--src/mesa/drivers/x11/xm_dd.c4
2 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/drivers/x11/xm_api.c b/src/mesa/drivers/x11/xm_api.c
index af1a169a766..396a0923e9d 100644
--- a/src/mesa/drivers/x11/xm_api.c
+++ b/src/mesa/drivers/x11/xm_api.c
@@ -80,8 +80,8 @@
#include "tnl/t_pipeline.h"
#include "drivers/common/driverfuncs.h"
-#include "softpipe/state_tracker/st_public.h"
-#include "softpipe/generic/g_context.h"
+#include "state_tracker/st_public.h"
+#include "pipe/softpipe/sp_context.h"
/**
* Global X driver lock
@@ -1561,7 +1561,7 @@ XMesaContext XMesaCreateContext( XMesaVisual v, XMesaContext share_list )
st_create_context( mesaCtx,
- generic_create() );
+ softpipe_create() );
return c;
}
diff --git a/src/mesa/drivers/x11/xm_dd.c b/src/mesa/drivers/x11/xm_dd.c
index 63e7115e809..eb59d1d05ef 100644
--- a/src/mesa/drivers/x11/xm_dd.c
+++ b/src/mesa/drivers/x11/xm_dd.c
@@ -53,8 +53,8 @@
#include "tnl/tnl.h"
#include "tnl/t_context.h"
-#include "softpipe/generic/g_context.h"
-#include "softpipe/state_tracker/st_public.h"
+#include "pipe/softpipe/sp_context.h"
+#include "state_tracker/st_public.h"
/*