glapi: Move to src/mapi/.

Move glapi to src/mapi/{glapi,es1api,es2api}.

1 files changed, 1 insertions, 28 deletions

diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 9cc5d493111..bf4ad6d2619 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -9,6 +9,7 @@ if env['platform'] != 'winddk':
 	env = env.Clone()
 	
 	env.Append(CPPPATH = [
+		'#/src/mapi',
 		'#/src/mesa',
 	])
 	
@@ -247,16 +248,6 @@ if env['platform'] != 'winddk':
 		slang_sources
 	)
 
-	glapi_sources = [
-		'glapi/glapi.c',
-		'glapi/glapi_dispatch.c',
-		'glapi/glapi_entrypoint.c',
-		'glapi/glapi_execmem.c',
-		'glapi/glapi_getproc.c',
-		'glapi/glapi_nop.c',
-		'glapi/glthread.c',
-	]
-	
 	#
 	# Assembly sources
 	#
@@ -290,9 +281,6 @@ if env['platform'] != 'winddk':
 			'x86/sse_normal.S',
 			'x86/read_rgba_span_x86.S',
 		]
-		glapi_sources += [
-			'glapi/glapi_x86.S',
-		]
 	elif gcc and env['machine'] == 'x86_64':
 		env.Append(CPPDEFINES = [
 			'USE_X86_64_ASM', 
@@ -301,9 +289,6 @@ if env['platform'] != 'winddk':
 			'x86-64/x86-64.c',
 			'x86-64/xform4.S',
 		]
-		glapi_sources += [
-			'glapi/glapi_x86-64.S'
-		]
 	elif gcc and env['machine'] == 'ppc':
 		env.Append(CPPDEFINES = [
 			'USE_PPC_ASM', 
@@ -312,8 +297,6 @@ if env['platform'] != 'winddk':
 		mesa_sources += [
 			'ppc/common_ppc.c',
 		]
-		glapi_sources += [
-		]
 	elif gcc and env['machine'] == 'sparc':
 		mesa_sources += [
 			'sparc/sparc.c',
@@ -321,9 +304,6 @@ if env['platform'] != 'winddk':
 			'sparc/norm.S',
 			'sparc/xform.S',
 		]
-		glapi_sources += [
-			'glapi/glapi_sparc.S'
-		]
 	else:
 		pass
 	
@@ -354,10 +334,3 @@ if env['platform'] != 'winddk':
 		source = mesa_sources,
 	)
 	Export('mesa')
-	
-	glapi = env.ConvenienceLibrary(
-		target = 'glapi',
-		source = glapi_sources,
-	)
-	Export('glapi')
-