KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Move src/mapi/mapi/* to src/mapi/ 

Tested-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-and-Tested-by: Andreas Boll <andreas.boll.dev@gmail.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
This commit is contained in:
Matt Turner 2013-01-21 10:27:25 -08:00
parent 3c690524e2
commit d5e9426b96
39 changed files with 45 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/gallium/state_trackers/vega/Makefile.am
View File

@ -63,6 +63,6 @@ libvega_la_SOURCES = \
BUILT_SOURCES = api_tmp.h BUILT_SOURCES = api_tmp.h
CLEANFILES = api_tmp.h CLEANFILES = api_tmp.h
api_tmp.h: $(top_srcdir)/src/mapi/vgapi/vgapi.csv $(top_srcdir)/src/mapi/mapi/mapi_abi.py api_tmp.h: $(top_srcdir)/src/mapi/vgapi/vgapi.csv $(top_srcdir)/src/mapi/mapi_abi.py
$(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) $(top_srcdir)/src/mapi/mapi/mapi_abi.py \ $(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) $(top_srcdir)/src/mapi/mapi_abi.py \
--printer vgapi --mode app $< > $@ --printer vgapi --mode app $< > $@

2
src/gallium/state_trackers/vega/SConscript
View File

@ -49,7 +49,7 @@ vega_sources = [
api_tmp, = env.CodeGenerate( api_tmp, = env.CodeGenerate(
target = 'api_tmp.h', target = 'api_tmp.h',
script = '#src/mapi/mapi/mapi_abi.py', script = '#src/mapi/mapi_abi.py',
source = '#src/mapi/vgapi/vgapi.csv', source = '#src/mapi/vgapi/vgapi.csv',
command = python_cmd + ' $SCRIPT --printer vgapi --mode app $SOURCE > $TARGET' command = python_cmd + ' $SCRIPT --printer vgapi --mode app $SOURCE > $TARGET'
) )

2
src/gallium/state_trackers/vega/api.c
View File

@ -26,7 +26,7 @@
* Chia-I Wu <olv@lunarg.com> * Chia-I Wu <olv@lunarg.com>
*/ */
#include "mapi/mapi.h" #include "mapi.h"
/* define vega_spec and vega_procs for use with mapi */ /* define vega_spec and vega_procs for use with mapi */
#define API_TMP_DEFINE_SPEC #define API_TMP_DEFINE_SPEC

16
src/mapi/Android.mk
View File

@ -36,12 +36,12 @@ include $(CLEAR_VARS)
abi_header := shared-glapi/glapi_mapi_tmp.h abi_header := shared-glapi/glapi_mapi_tmp.h
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
mapi/entry.c \ entry.c \
mapi/mapi_glapi.c \ mapi_glapi.c \
mapi/stub.c \ stub.c \
mapi/table.c \ table.c \
mapi/u_current.c \ u_current.c \
mapi/u_execmem.c u_execmem.c
LOCAL_CFLAGS := \ LOCAL_CFLAGS := \
-DMAPI_MODE_GLAPI \ -DMAPI_MODE_GLAPI \
@ -68,9 +68,9 @@ include $(BUILD_SHARED_LIBRARY)
mapi_abi_deps := \ mapi_abi_deps := \
$(wildcard $(LOCAL_PATH)/glapi/gen/*.py) \ $(wildcard $(LOCAL_PATH)/glapi/gen/*.py) \
$(wildcard $(LOCAL_PATH)/glapi/gen/*.xml) \ $(wildcard $(LOCAL_PATH)/glapi/gen/*.xml) \
$(LOCAL_PATH)/mapi/mapi_abi.py $(LOCAL_PATH)/mapi_abi.py
$(mapi_abi_headers): PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/mapi/mapi_abi.py $(mapi_abi_headers): PRIVATE_SCRIPT := $(MESA_PYTHON2) $(LOCAL_PATH)/mapi_abi.py
$(mapi_abi_headers): PRIVATE_APIXML := $(LOCAL_PATH)/glapi/gen/gl_and_es_API.xml $(mapi_abi_headers): PRIVATE_APIXML := $(LOCAL_PATH)/glapi/gen/gl_and_es_API.xml
$(mapi_abi_headers): $(mapi_abi_deps) $(mapi_abi_headers): $(mapi_abi_deps)
@mkdir -p $(dir $@) @mkdir -p $(dir $@)

24
src/mapi/mapi/Makefile.sources → src/mapi/Makefile.sources
View File

@ -1,4 +1,4 @@
# src/mapi/mapi/Makefile.sources # src/mapi/Makefile.sources
# #
# mapi may be used in several ways # mapi may be used in several ways
# #
@ -15,22 +15,22 @@
# this mode, compile MAPI_BRIDGE_FILES with MAPI_MODE_BRIDGE defined. # this mode, compile MAPI_BRIDGE_FILES with MAPI_MODE_BRIDGE defined.
MAPI_UTIL_FILES = \ MAPI_UTIL_FILES = \
$(TOP)/src/mapi/mapi/u_current.c \ $(TOP)/src/mapi/u_current.c \
$(TOP)/src/mapi/mapi/u_execmem.c $(TOP)/src/mapi/u_execmem.c
MAPI_FILES = \ MAPI_FILES = \
$(TOP)/src/mapi/mapi/entry.c \ $(TOP)/src/mapi/entry.c \
$(TOP)/src/mapi/mapi/mapi.c \ $(TOP)/src/mapi/mapi.c \
$(TOP)/src/mapi/mapi/stub.c \ $(TOP)/src/mapi/stub.c \
$(TOP)/src/mapi/mapi/table.c \ $(TOP)/src/mapi/table.c \
$(MAPI_UTIL_FILES) $(MAPI_UTIL_FILES)
MAPI_GLAPI_FILES = \ MAPI_GLAPI_FILES = \
$(TOP)/src/mapi/mapi/entry.c \ $(TOP)/src/mapi/entry.c \
$(TOP)/src/mapi/mapi/mapi_glapi.c \ $(TOP)/src/mapi/mapi_glapi.c \
$(TOP)/src/mapi/mapi/stub.c \ $(TOP)/src/mapi/stub.c \
$(TOP)/src/mapi/mapi/table.c \ $(TOP)/src/mapi/table.c \
$(MAPI_UTIL_FILES) $(MAPI_UTIL_FILES)
MAPI_BRIDGE_FILES = \ MAPI_BRIDGE_FILES = \
$(TOP)/src/mapi/mapi/entry.c $(TOP)/src/mapi/entry.c

0
src/mapi/mapi/entry.c → src/mapi/entry.c
View File

0
src/mapi/mapi/entry.h → src/mapi/entry.h
View File

0
src/mapi/mapi/entry_x86-64_tls.h → src/mapi/entry_x86-64_tls.h
View File

0
src/mapi/mapi/entry_x86_tls.h → src/mapi/entry_x86_tls.h
View File

0
src/mapi/mapi/entry_x86_tsd.h → src/mapi/entry_x86_tsd.h
View File

2
src/mapi/es1api/Makefile.am
View File

@ -42,7 +42,7 @@ GLES_include_HEADERS = \
lib_LTLIBRARIES = libGLESv1_CM.la lib_LTLIBRARIES = libGLESv1_CM.la
libGLESv1_CM_la_SOURCES = ../mapi/entry.c glapi_mapi_tmp.h libGLESv1_CM_la_SOURCES = ../entry.c glapi_mapi_tmp.h
libGLESv1_CM_la_LIBADD = $(GLESv1_CM_LIB_DEPS) libGLESv1_CM_la_LIBADD = $(GLESv1_CM_LIB_DEPS)
libGLESv1_CM_la_LDFLAGS = -version-number 1:1 -no-undefined libGLESv1_CM_la_LDFLAGS = -version-number 1:1 -no-undefined

2
src/mapi/es2api/Makefile.am
View File

@ -46,7 +46,7 @@ GLES3_include_HEADERS = \
lib_LTLIBRARIES = libGLESv2.la lib_LTLIBRARIES = libGLESv2.la
libGLESv2_la_SOURCES = ../mapi/entry.c glapi_mapi_tmp.h libGLESv2_la_SOURCES = ../entry.c glapi_mapi_tmp.h
libGLESv2_la_LIBADD = $(GLESv2_LIB_DEPS) libGLESv2_la_LIBADD = $(GLESv2_LIB_DEPS)
libGLESv2_la_LDFLAGS = -version-number 2 -no-undefined libGLESv2_la_LDFLAGS = -version-number 2 -no-undefined

2
src/mapi/glapi/Makefile.am
View File

@ -21,7 +21,7 @@
TOP = $(top_srcdir) TOP = $(top_srcdir)
include Makefile.sources include Makefile.sources
include ../mapi/Makefile.sources include ../Makefile.sources
AM_CPPFLAGS = \ AM_CPPFLAGS = \
$(DEFINES) \ $(DEFINES) \

2
src/mapi/glapi/SConscript
View File

@ -43,7 +43,7 @@ mapi_sources = [
'u_execmem.c', 'u_execmem.c',
] ]
for s in mapi_sources: for s in mapi_sources:
o = env.SharedObject(s[:-2], '../mapi/' + s) o = env.SharedObject(s[:-2], '../' + s)
glapi_sources.append(o) glapi_sources.append(o)
# #

2
src/mapi/glapi/gen/Makefile.am
View File

@ -20,7 +20,7 @@ XORG_INDENT_FLAGS = -linux -bad -bap -blf -bli0 -cbi0 -cdw -nce -cs -i4 -lc80 -p
MESA_DIR = $(top_srcdir)/src/mesa MESA_DIR = $(top_srcdir)/src/mesa
MESA_GLAPI_DIR = $(top_srcdir)/src/mapi/glapi MESA_GLAPI_DIR = $(top_srcdir)/src/mapi/glapi
MESA_MAPI_DIR = $(top_srcdir)/src/mapi/mapi MESA_MAPI_DIR = $(top_srcdir)/src/mapi
MESA_GLX_DIR = $(top_srcdir)/src/glx MESA_GLX_DIR = $(top_srcdir)/src/glx
MESA_GLAPI_OUTPUTS = \ MESA_GLAPI_OUTPUTS = \

2
src/mapi/glapi/gen/glapi_gen.mk
View File

@ -4,7 +4,7 @@ glapi_gen_common_deps := \
$(wildcard $(top_srcdir)/src/mapi/glapi/gen/*.xml) \ $(wildcard $(top_srcdir)/src/mapi/glapi/gen/*.xml) \
$(wildcard $(top_srcdir)/src/mapi/glapi/gen/*.py) $(wildcard $(top_srcdir)/src/mapi/glapi/gen/*.py)
glapi_gen_mapi_script := $(top_srcdir)/src/mapi/mapi/mapi_abi.py glapi_gen_mapi_script := $(top_srcdir)/src/mapi/mapi_abi.py
glapi_gen_mapi_deps := \ glapi_gen_mapi_deps := \
$(glapi_gen_mapi_script) \ $(glapi_gen_mapi_script) \
$(glapi_gen_common_deps) $(glapi_gen_common_deps)

2
src/mapi/glapi/glapi.c
View File

@ -27,7 +27,7 @@
*/ */
#include "glapi/glapi.h" #include "glapi/glapi.h"
#include "mapi/u_current.h" #include "u_current.h"
/* /*
* Global variables, _glapi_get_context, and _glapi_get_dispatch are defined in * Global variables, _glapi_get_context, and _glapi_get_dispatch are defined in

2
src/mapi/glapi/glapi_entrypoint.c
View File

@ -30,7 +30,7 @@
#include "glapi/glapi_priv.h" #include "glapi/glapi_priv.h"
#include "mapi/u_execmem.h" #include "u_execmem.h"
#ifdef USE_X86_ASM #ifdef USE_X86_ASM

2
src/mapi/glapi/glthread.h
View File

@ -1,7 +1,7 @@
#ifndef GLTHREAD_H #ifndef GLTHREAD_H
#define GLTHREAD_H #define GLTHREAD_H
#include "mapi/u_thread.h" #include "u_thread.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

0
src/mapi/mapi/mapi.c → src/mapi/mapi.c
View File

0
src/mapi/mapi/mapi.h → src/mapi/mapi.h
View File

2
src/mapi/mapi/mapi_abi.py → src/mapi/mapi_abi.py
View File

@ -29,7 +29,7 @@
import sys import sys
# make it possible to import glapi # make it possible to import glapi
import os import os
GLAPI = os.path.join(".", os.path.dirname(sys.argv[0]), "../glapi/gen") GLAPI = os.path.join(".", os.path.dirname(sys.argv[0]), "glapi/gen")
sys.path.append(GLAPI) sys.path.append(GLAPI)
import re import re

6
src/mapi/mapi/mapi_glapi.c → src/mapi/mapi_glapi.c
View File

@ -29,9 +29,9 @@
#include <string.h> #include <string.h>
#include "glapi/glapi.h" #include "glapi/glapi.h"
#include "mapi/u_current.h" #include "u_current.h"
#include "mapi/table.h" /* for MAPI_TABLE_NUM_SLOTS */ #include "table.h" /* for MAPI_TABLE_NUM_SLOTS */
#include "mapi/stub.h" #include "stub.h"
/* /*
* Global variables, _glapi_get_context, and _glapi_get_dispatch are defined in * Global variables, _glapi_get_context, and _glapi_get_dispatch are defined in

0
src/mapi/mapi/mapi_tmp.h → src/mapi/mapi_tmp.h
View File

2
src/mapi/shared-glapi/Makefile.am
View File

@ -2,7 +2,7 @@
TOP = $(top_srcdir) TOP = $(top_srcdir)
GLAPI = $(top_srcdir)/src/mapi/glapi GLAPI = $(top_srcdir)/src/mapi/glapi
include $(top_srcdir)/src/mapi/mapi/Makefile.sources include $(top_srcdir)/src/mapi/Makefile.sources
lib_LTLIBRARIES = libglapi.la lib_LTLIBRARIES = libglapi.la
libglapi_la_SOURCES = $(MAPI_GLAPI_FILES) libglapi_la_SOURCES = $(MAPI_GLAPI_FILES)

4
src/mapi/shared-glapi/SConscript
View File

@ -28,7 +28,7 @@ def mapi_objects(env, printer, mode):
# generate ABI header # generate ABI header
header = env.CodeGenerate( header = env.CodeGenerate(
target = header_name, target = header_name,
script = '../mapi/mapi_abi.py', script = '../mapi_abi.py',
source = '../glapi/gen/gl_and_es_API.xml', source = '../glapi/gen/gl_and_es_API.xml',
command = python_cmd + ' $SCRIPT ' + \ command = python_cmd + ' $SCRIPT ' + \
'--printer %s --mode lib $SOURCE > $TARGET' % (printer), '--printer %s --mode lib $SOURCE > $TARGET' % (printer),
@ -59,7 +59,7 @@ def mapi_objects(env, printer, mode):
for s in mapi_sources[mode]: for s in mapi_sources[mode]:
o = env.SharedObject( o = env.SharedObject(
target = '%s-%s' % (printer, s[:-2]), target = '%s-%s' % (printer, s[:-2]),
source = '../mapi/' + s, source = '../' + s,
CPPPATH = cpppath, CPPPATH = cpppath,
CPPDEFINES = cppdefines, CPPDEFINES = cppdefines,
) )

0
src/mapi/mapi/stub.c → src/mapi/stub.c
View File

0
src/mapi/mapi/stub.h → src/mapi/stub.h
View File

0
src/mapi/mapi/table.c → src/mapi/table.c
View File

0
src/mapi/mapi/table.h → src/mapi/table.h
View File

0
src/mapi/mapi/u_compiler.h → src/mapi/u_compiler.h
View File

0
src/mapi/mapi/u_current.c → src/mapi/u_current.c
View File

0
src/mapi/mapi/u_current.h → src/mapi/u_current.h
View File

0
src/mapi/mapi/u_execmem.c → src/mapi/u_execmem.c
View File

0
src/mapi/mapi/u_execmem.h → src/mapi/u_execmem.h
View File

0
src/mapi/mapi/u_macros.h → src/mapi/u_macros.h
View File

0
src/mapi/mapi/u_thread.h → src/mapi/u_thread.h
View File

6
src/mapi/vgapi/Makefile.am
View File

@ -40,13 +40,13 @@ VG_include_HEADERS = \
lib_LTLIBRARIES = libOpenVG.la lib_LTLIBRARIES = libOpenVG.la
TOP=$(top_srcdir) TOP=$(top_srcdir)
include ../mapi/Makefile.sources include ../Makefile.sources
libOpenVG_la_SOURCES = $(MAPI_FILES) vgapi_tmp.h libOpenVG_la_SOURCES = $(MAPI_FILES) vgapi_tmp.h
libOpenVG_la_LIBADD = $(VG_LIB_DEPS) libOpenVG_la_LIBADD = $(VG_LIB_DEPS)
libOpenVG_la_LDFLAGS = -version-number 1 -no-undefined libOpenVG_la_LDFLAGS = -version-number 1 -no-undefined
vgapi_tmp.h: $(srcdir)/vgapi.csv $(top_srcdir)/src/mapi/mapi/mapi_abi.py vgapi_tmp.h: $(srcdir)/vgapi.csv $(top_srcdir)/src/mapi/mapi_abi.py
$(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) $(top_srcdir)/src/mapi/mapi/mapi_abi.py \ $(AM_V_GEN) $(PYTHON2) $(PYTHON_FLAGS) $(top_srcdir)/src/mapi/mapi_abi.py \
--printer vgapi --mode lib $< > $@ --printer vgapi --mode lib $< > $@
BUILT_SOURCES = vgapi_tmp.h BUILT_SOURCES = vgapi_tmp.h

4
src/mapi/vgapi/SConscript
View File

@ -9,7 +9,7 @@ env = env.Clone()
vgapi_header, = env.CodeGenerate( vgapi_header, = env.CodeGenerate(
target = 'vgapi_tmp.h', target = 'vgapi_tmp.h',
script = '../mapi/mapi_abi.py', script = '../mapi_abi.py',
source = 'vgapi.csv', source = 'vgapi.csv',
command = python_cmd + ' $SCRIPT --printer vgapi --mode lib $SOURCE > $TARGET' command = python_cmd + ' $SCRIPT --printer vgapi --mode lib $SOURCE > $TARGET'
) )
@ -37,7 +37,7 @@ mapi_sources = [
vgapi_objects = [] vgapi_objects = []
for s in mapi_sources: for s in mapi_sources:
o = env.SharedObject(s[:-2], '../mapi/' + s) o = env.SharedObject(s[:-2], '../' + s)
vgapi_objects.append(o) vgapi_objects.append(o)
env.Depends(vgapi_objects, vgapi_header) env.Depends(vgapi_objects, vgapi_header)