summaryrefslogtreecommitdiff
path: root/lib/mesa/src/mapi
diff options
context:
space:
mode:
Diffstat (limited to 'lib/mesa/src/mapi')
-rw-r--r--lib/mesa/src/mapi/Makefile.am11
-rw-r--r--lib/mesa/src/mapi/Makefile.in143
-rw-r--r--lib/mesa/src/mapi/glapi/gen/Makefile.am26
-rw-r--r--lib/mesa/src/mapi/glapi/gen/Makefile.in49
4 files changed, 137 insertions, 92 deletions
diff --git a/lib/mesa/src/mapi/Makefile.am b/lib/mesa/src/mapi/Makefile.am
index e5e1a64f1..42442534b 100644
--- a/lib/mesa/src/mapi/Makefile.am
+++ b/lib/mesa/src/mapi/Makefile.am
@@ -56,14 +56,17 @@ PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
glapi_gen_mapi_deps := \
mapi_abi.py \
- $(wildcard glapi/gen/*.xml) \
- $(wildcard glapi/gen/*.py)
+ $(wildcard $(top_srcdir)/src/mapi/glapi/gen/*.xml) \
+ $(wildcard $(top_srcdir)/src/mapi/glapi/gen/*.py)
if HAVE_SHARED_GLAPI
BUILT_SOURCES += shared-glapi/glapi_mapi_tmp.h
lib_LTLIBRARIES += shared-glapi/libglapi.la
shared_glapi_libglapi_la_SOURCES = $(MAPI_GLAPI_FILES) shared-glapi/glapi_mapi_tmp.h
+shared_glapi_libglapi_la_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(VISIBILITY_CFLAGS)
shared_glapi_libglapi_la_CPPFLAGS = \
$(AM_CPPFLAGS) \
-DMAPI_MODE_GLAPI \
@@ -118,6 +121,9 @@ glapi_libglapi_la_CPPFLAGS = \
if HAVE_APPLEDRI
glapi_libglapi_la_SOURCES += glapi/glapi_gentable.c
endif
+if HAVE_WINDOWSDRI
+glapi_libglapi_la_SOURCES += glapi/glapi_gentable.c
+endif
if HAVE_SHARED_GLAPI
glapi_libglapi_la_SOURCES += $(MAPI_BRIDGE_FILES) glapi/glapi_mapi_tmp.h
@@ -211,6 +217,7 @@ GLES3_includedir = $(includedir)/GLES3
GLES3_include_HEADERS = \
$(top_srcdir)/include/GLES3/gl3.h \
$(top_srcdir)/include/GLES3/gl31.h \
+ $(top_srcdir)/include/GLES3/gl32.h \
$(top_srcdir)/include/GLES3/gl3ext.h \
$(top_srcdir)/include/GLES3/gl3platform.h
diff --git a/lib/mesa/src/mapi/Makefile.in b/lib/mesa/src/mapi/Makefile.in
index 51201b6ae..dae1c4116 100644
--- a/lib/mesa/src/mapi/Makefile.in
+++ b/lib/mesa/src/mapi/Makefile.in
@@ -93,8 +93,8 @@ POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
-TESTS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__append_12) \
- $(am__append_17)
+TESTS = $(am__EXEEXT_1) $(am__EXEEXT_2) $(am__append_13) \
+ $(am__append_18)
check_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2)
DIST_COMMON = $(am__GLES2_include_HEADERS_DIST) \
$(am__GLES3_include_HEADERS_DIST) \
@@ -106,15 +106,16 @@ DIST_COMMON = $(am__GLES2_include_HEADERS_DIST) \
@HAVE_SHARED_GLAPI_TRUE@am__append_3 = shared-glapi-test
@HAVE_SHARED_GLAPI_TRUE@am__append_4 = shared-glapi-test
@HAVE_APPLEDRI_TRUE@@HAVE_OPENGL_TRUE@am__append_5 = glapi/glapi_gentable.c
-@HAVE_OPENGL_TRUE@@HAVE_SHARED_GLAPI_TRUE@am__append_6 = $(MAPI_BRIDGE_FILES) glapi/glapi_mapi_tmp.h
-@HAVE_OPENGL_TRUE@@HAVE_SHARED_GLAPI_TRUE@am__append_7 = \
+@HAVE_OPENGL_TRUE@@HAVE_WINDOWSDRI_TRUE@am__append_6 = glapi/glapi_gentable.c
+@HAVE_OPENGL_TRUE@@HAVE_SHARED_GLAPI_TRUE@am__append_7 = $(MAPI_BRIDGE_FILES) glapi/glapi_mapi_tmp.h
+@HAVE_OPENGL_TRUE@@HAVE_SHARED_GLAPI_TRUE@am__append_8 = \
@HAVE_OPENGL_TRUE@@HAVE_SHARED_GLAPI_TRUE@ -DMAPI_MODE_BRIDGE \
@HAVE_OPENGL_TRUE@@HAVE_SHARED_GLAPI_TRUE@ -DMAPI_ABI_HEADER=\"glapi/glapi_mapi_tmp.h\"
-@HAVE_OPENGL_TRUE@@HAVE_SHARED_GLAPI_FALSE@am__append_8 = \
+@HAVE_OPENGL_TRUE@@HAVE_SHARED_GLAPI_FALSE@am__append_9 = \
@HAVE_OPENGL_TRUE@@HAVE_SHARED_GLAPI_FALSE@ -DMAPI_MODE_UTIL
-@HAVE_OPENGL_TRUE@@HAVE_SHARED_GLAPI_FALSE@am__append_9 = \
+@HAVE_OPENGL_TRUE@@HAVE_SHARED_GLAPI_FALSE@am__append_10 = \
@HAVE_OPENGL_TRUE@@HAVE_SHARED_GLAPI_FALSE@ glapi/glapi_dispatch.c \
@HAVE_OPENGL_TRUE@@HAVE_SHARED_GLAPI_FALSE@ glapi/glapi_entrypoint.c \
@HAVE_OPENGL_TRUE@@HAVE_SHARED_GLAPI_FALSE@ glapi/glapi_getproc.c \
@@ -125,18 +126,18 @@ DIST_COMMON = $(am__GLES2_include_HEADERS_DIST) \
@HAVE_OPENGL_TRUE@@HAVE_SHARED_GLAPI_FALSE@ $(GLAPI_ASM_SOURCES) \
@HAVE_OPENGL_TRUE@@HAVE_SHARED_GLAPI_FALSE@ $(MAPI_UTIL_FILES)
-@HAVE_OPENGL_TRUE@@HAVE_SHARED_GLAPI_FALSE@am__append_10 = glapi-test
@HAVE_OPENGL_TRUE@@HAVE_SHARED_GLAPI_FALSE@am__append_11 = glapi-test
-@HAVE_OPENGL_ES1_TRUE@am__append_12 = es1api/ABI-check
-@HAVE_OPENGL_ES1_TRUE@am__append_13 = es1api/glapi_mapi_tmp.h
-@HAVE_OPENGL_ES1_TRUE@am__append_14 = es1api/glesv1_cm.pc
-@HAVE_OPENGL_ES1_TRUE@am__append_15 = es1api/libGLESv1_CM.la
-@HAVE_OPENGL_ES1_TRUE@@HAVE_SHARED_GLAPI_TRUE@am__append_16 = shared-glapi/libglapi.la
-@HAVE_OPENGL_ES2_TRUE@am__append_17 = es2api/ABI-check
-@HAVE_OPENGL_ES2_TRUE@am__append_18 = es2api/glapi_mapi_tmp.h
-@HAVE_OPENGL_ES2_TRUE@am__append_19 = es2api/glesv2.pc
-@HAVE_OPENGL_ES2_TRUE@am__append_20 = es2api/libGLESv2.la
-@HAVE_OPENGL_ES2_TRUE@@HAVE_SHARED_GLAPI_TRUE@am__append_21 = shared-glapi/libglapi.la
+@HAVE_OPENGL_TRUE@@HAVE_SHARED_GLAPI_FALSE@am__append_12 = glapi-test
+@HAVE_OPENGL_ES1_TRUE@am__append_13 = es1api/ABI-check
+@HAVE_OPENGL_ES1_TRUE@am__append_14 = es1api/glapi_mapi_tmp.h
+@HAVE_OPENGL_ES1_TRUE@am__append_15 = es1api/glesv1_cm.pc
+@HAVE_OPENGL_ES1_TRUE@am__append_16 = es1api/libGLESv1_CM.la
+@HAVE_OPENGL_ES1_TRUE@@HAVE_SHARED_GLAPI_TRUE@am__append_17 = shared-glapi/libglapi.la
+@HAVE_OPENGL_ES2_TRUE@am__append_18 = es2api/ABI-check
+@HAVE_OPENGL_ES2_TRUE@am__append_19 = es2api/glapi_mapi_tmp.h
+@HAVE_OPENGL_ES2_TRUE@am__append_20 = es2api/glesv2.pc
+@HAVE_OPENGL_ES2_TRUE@am__append_21 = es2api/libGLESv2.la
+@HAVE_OPENGL_ES2_TRUE@@HAVE_SHARED_GLAPI_TRUE@am__append_22 = shared-glapi/libglapi.la
subdir = src/mapi
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_gnu_make.m4 \
@@ -187,7 +188,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(pkgconfigdir)" \
LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
am__DEPENDENCIES_1 =
@HAVE_OPENGL_ES1_TRUE@es1api_libGLESv1_CM_la_DEPENDENCIES = \
-@HAVE_OPENGL_ES1_TRUE@ $(am__DEPENDENCIES_1) $(am__append_16)
+@HAVE_OPENGL_ES1_TRUE@ $(am__DEPENDENCIES_1) $(am__append_17)
am__es1api_libGLESv1_CM_la_SOURCES_DIST = entry.c \
es1api/glapi_mapi_tmp.h
@HAVE_OPENGL_ES1_TRUE@am_es1api_libGLESv1_CM_la_OBJECTS = \
@@ -205,7 +206,7 @@ es1api_libGLESv1_CM_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
@HAVE_OPENGL_ES1_TRUE@ $(libdir)
am__dirstamp = $(am__leading_dot)dirstamp
@HAVE_OPENGL_ES2_TRUE@es2api_libGLESv2_la_DEPENDENCIES = \
-@HAVE_OPENGL_ES2_TRUE@ $(am__DEPENDENCIES_1) $(am__append_21)
+@HAVE_OPENGL_ES2_TRUE@ $(am__DEPENDENCIES_1) $(am__append_22)
am__es2api_libGLESv2_la_SOURCES_DIST = entry.c es2api/glapi_mapi_tmp.h
@HAVE_OPENGL_ES2_TRUE@am_es2api_libGLESv2_la_OBJECTS = \
@HAVE_OPENGL_ES2_TRUE@ es2api_libGLESv2_la-entry.lo
@@ -225,23 +226,25 @@ am__glapi_libglapi_la_SOURCES_DIST = glapi/glapi_gentable.c entry.c \
glapi/glapi_x86-64.S u_current.c u_current.h u_execmem.c \
u_execmem.h
@HAVE_APPLEDRI_TRUE@@HAVE_OPENGL_TRUE@am__objects_1 = glapi/glapi_libglapi_la-glapi_gentable.lo
-am__objects_2 = glapi_libglapi_la-entry.lo
-@HAVE_OPENGL_TRUE@@HAVE_SHARED_GLAPI_TRUE@am__objects_3 = \
-@HAVE_OPENGL_TRUE@@HAVE_SHARED_GLAPI_TRUE@ $(am__objects_2)
-@HAVE_OPENGL_TRUE@@HAVE_SPARC_ASM_FALSE@@HAVE_X86_64_ASM_FALSE@@HAVE_X86_ASM_TRUE@am__objects_4 = glapi/glapi_libglapi_la-glapi_x86.lo
-@HAVE_OPENGL_TRUE@@HAVE_SPARC_ASM_FALSE@@HAVE_X86_64_ASM_TRUE@@HAVE_X86_ASM_TRUE@am__objects_4 = glapi/glapi_libglapi_la-glapi_x86-64.lo
-@HAVE_OPENGL_TRUE@@HAVE_SPARC_ASM_TRUE@am__objects_4 = glapi/glapi_libglapi_la-glapi_sparc.lo
-am__objects_5 = glapi_libglapi_la-u_current.lo \
+@HAVE_OPENGL_TRUE@@HAVE_WINDOWSDRI_TRUE@am__objects_2 = glapi/glapi_libglapi_la-glapi_gentable.lo
+am__objects_3 = glapi_libglapi_la-entry.lo
+@HAVE_OPENGL_TRUE@@HAVE_SHARED_GLAPI_TRUE@am__objects_4 = \
+@HAVE_OPENGL_TRUE@@HAVE_SHARED_GLAPI_TRUE@ $(am__objects_3)
+@HAVE_OPENGL_TRUE@@HAVE_SPARC_ASM_FALSE@@HAVE_X86_64_ASM_FALSE@@HAVE_X86_ASM_TRUE@am__objects_5 = glapi/glapi_libglapi_la-glapi_x86.lo
+@HAVE_OPENGL_TRUE@@HAVE_SPARC_ASM_FALSE@@HAVE_X86_64_ASM_TRUE@@HAVE_X86_ASM_TRUE@am__objects_5 = glapi/glapi_libglapi_la-glapi_x86-64.lo
+@HAVE_OPENGL_TRUE@@HAVE_SPARC_ASM_TRUE@am__objects_5 = glapi/glapi_libglapi_la-glapi_sparc.lo
+am__objects_6 = glapi_libglapi_la-u_current.lo \
glapi_libglapi_la-u_execmem.lo
-@HAVE_OPENGL_TRUE@@HAVE_SHARED_GLAPI_FALSE@am__objects_6 = glapi/glapi_libglapi_la-glapi_dispatch.lo \
+@HAVE_OPENGL_TRUE@@HAVE_SHARED_GLAPI_FALSE@am__objects_7 = glapi/glapi_libglapi_la-glapi_dispatch.lo \
@HAVE_OPENGL_TRUE@@HAVE_SHARED_GLAPI_FALSE@ glapi/glapi_libglapi_la-glapi_entrypoint.lo \
@HAVE_OPENGL_TRUE@@HAVE_SHARED_GLAPI_FALSE@ glapi/glapi_libglapi_la-glapi_getproc.lo \
@HAVE_OPENGL_TRUE@@HAVE_SHARED_GLAPI_FALSE@ glapi/glapi_libglapi_la-glapi_nop.lo \
@HAVE_OPENGL_TRUE@@HAVE_SHARED_GLAPI_FALSE@ glapi/glapi_libglapi_la-glapi.lo \
-@HAVE_OPENGL_TRUE@@HAVE_SHARED_GLAPI_FALSE@ $(am__objects_4) \
-@HAVE_OPENGL_TRUE@@HAVE_SHARED_GLAPI_FALSE@ $(am__objects_5)
+@HAVE_OPENGL_TRUE@@HAVE_SHARED_GLAPI_FALSE@ $(am__objects_5) \
+@HAVE_OPENGL_TRUE@@HAVE_SHARED_GLAPI_FALSE@ $(am__objects_6)
@HAVE_OPENGL_TRUE@am_glapi_libglapi_la_OBJECTS = $(am__objects_1) \
-@HAVE_OPENGL_TRUE@ $(am__objects_3) $(am__objects_6)
+@HAVE_OPENGL_TRUE@ $(am__objects_2) $(am__objects_4) \
+@HAVE_OPENGL_TRUE@ $(am__objects_7)
glapi_libglapi_la_OBJECTS = $(am_glapi_libglapi_la_OBJECTS)
@HAVE_OPENGL_TRUE@am_glapi_libglapi_la_rpath =
@HAVE_SHARED_GLAPI_TRUE@shared_glapi_libglapi_la_DEPENDENCIES = \
@@ -250,20 +253,20 @@ glapi_libglapi_la_OBJECTS = $(am_glapi_libglapi_la_OBJECTS)
am__shared_glapi_libglapi_la_SOURCES_DIST = entry.c mapi_glapi.c \
stub.c stub.h table.c table.h u_current.c u_current.h \
u_execmem.c u_execmem.h shared-glapi/glapi_mapi_tmp.h
-am__objects_7 = shared_glapi_libglapi_la-u_current.lo \
+am__objects_8 = shared_glapi_libglapi_la-u_current.lo \
shared_glapi_libglapi_la-u_execmem.lo
-am__objects_8 = shared_glapi_libglapi_la-entry.lo \
+am__objects_9 = shared_glapi_libglapi_la-entry.lo \
shared_glapi_libglapi_la-mapi_glapi.lo \
shared_glapi_libglapi_la-stub.lo \
- shared_glapi_libglapi_la-table.lo $(am__objects_7)
+ shared_glapi_libglapi_la-table.lo $(am__objects_8)
@HAVE_SHARED_GLAPI_TRUE@am_shared_glapi_libglapi_la_OBJECTS = \
-@HAVE_SHARED_GLAPI_TRUE@ $(am__objects_8)
+@HAVE_SHARED_GLAPI_TRUE@ $(am__objects_9)
shared_glapi_libglapi_la_OBJECTS = \
$(am_shared_glapi_libglapi_la_OBJECTS)
shared_glapi_libglapi_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
- $(AM_CFLAGS) $(CFLAGS) $(shared_glapi_libglapi_la_LDFLAGS) \
- $(LDFLAGS) -o $@
+ $(shared_glapi_libglapi_la_CFLAGS) $(CFLAGS) \
+ $(shared_glapi_libglapi_la_LDFLAGS) $(LDFLAGS) -o $@
@HAVE_SHARED_GLAPI_TRUE@am_shared_glapi_libglapi_la_rpath = -rpath \
@HAVE_SHARED_GLAPI_TRUE@ $(libdir)
@HAVE_SHARED_GLAPI_TRUE@am__EXEEXT_1 = shared-glapi-test$(EXEEXT)
@@ -369,6 +372,7 @@ am__GLES2_include_HEADERS_DIST = $(top_srcdir)/include/GLES2/gl2.h \
$(top_srcdir)/include/GLES2/gl2platform.h
am__GLES3_include_HEADERS_DIST = $(top_srcdir)/include/GLES3/gl3.h \
$(top_srcdir)/include/GLES3/gl31.h \
+ $(top_srcdir)/include/GLES3/gl32.h \
$(top_srcdir)/include/GLES3/gl3ext.h \
$(top_srcdir)/include/GLES3/gl3platform.h
am__GLES_include_HEADERS_DIST = $(top_srcdir)/include/GLES/egl.h \
@@ -483,6 +487,8 @@ GLESv2_LIB_DEPS = @GLESv2_LIB_DEPS@
GLESv2_PC_LIB_PRIV = @GLESv2_PC_LIB_PRIV@
GLPROTO_CFLAGS = @GLPROTO_CFLAGS@
GLPROTO_LIBS = @GLPROTO_LIBS@
+GLVND_CFLAGS = @GLVND_CFLAGS@
+GLVND_LIBS = @GLVND_LIBS@
GLX_TLS = @GLX_TLS@
GL_LIB = @GL_LIB@
GL_LIB_DEPS = @GL_LIB_DEPS@
@@ -514,11 +520,10 @@ LIBELF_CFLAGS = @LIBELF_CFLAGS@
LIBELF_LIBS = @LIBELF_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LIBSENSORS_LDFLAGS = @LIBSENSORS_LDFLAGS@
LIBSHA1_CFLAGS = @LIBSHA1_CFLAGS@
LIBSHA1_LIBS = @LIBSHA1_LIBS@
LIBTOOL = @LIBTOOL@
-LIBUDEV_CFLAGS = @LIBUDEV_CFLAGS@
-LIBUDEV_LIBS = @LIBUDEV_LIBS@
LIB_DIR = @LIB_DIR@
LIB_EXT = @LIB_EXT@
LIPO = @LIPO@
@@ -581,6 +586,8 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POSIX_SHELL = @POSIX_SHELL@
PRESENTPROTO_CFLAGS = @PRESENTPROTO_CFLAGS@
PRESENTPROTO_LIBS = @PRESENTPROTO_LIBS@
+PTHREADSTUBS_CFLAGS = @PTHREADSTUBS_CFLAGS@
+PTHREADSTUBS_LIBS = @PTHREADSTUBS_LIBS@
PTHREAD_CC = @PTHREAD_CC@
PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
PTHREAD_LIBS = @PTHREAD_LIBS@
@@ -601,11 +608,19 @@ SIMPENROSE_CFLAGS = @SIMPENROSE_CFLAGS@
SIMPENROSE_LIBS = @SIMPENROSE_LIBS@
SSE41_CFLAGS = @SSE41_CFLAGS@
STRIP = @STRIP@
+SWR_AVX2_CXXFLAGS = @SWR_AVX2_CXXFLAGS@
+SWR_AVX_CXXFLAGS = @SWR_AVX_CXXFLAGS@
+SWR_CXX11_CXXFLAGS = @SWR_CXX11_CXXFLAGS@
+TIMESTAMP_CMD = @TIMESTAMP_CMD@
+VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
+VALGRIND_LIBS = @VALGRIND_LIBS@
VA_CFLAGS = @VA_CFLAGS@
VA_LIBS = @VA_LIBS@
VA_LIB_INSTALL_DIR = @VA_LIB_INSTALL_DIR@
VA_MAJOR = @VA_MAJOR@
VA_MINOR = @VA_MINOR@
+VC4_CFLAGS = @VC4_CFLAGS@
+VC4_LIBS = @VC4_LIBS@
VDPAU_CFLAGS = @VDPAU_CFLAGS@
VDPAU_LIBS = @VDPAU_LIBS@
VDPAU_LIB_INSTALL_DIR = @VDPAU_LIB_INSTALL_DIR@
@@ -617,6 +632,7 @@ VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
VISIBILITY_CXXFLAGS = @VISIBILITY_CXXFLAGS@
VL_CFLAGS = @VL_CFLAGS@
VL_LIBS = @VL_LIBS@
+VULKAN_ICD_INSTALL_DIR = @VULKAN_ICD_INSTALL_DIR@
WAYLAND_CFLAGS = @WAYLAND_CFLAGS@
WAYLAND_LIBS = @WAYLAND_LIBS@
WAYLAND_SCANNER = @WAYLAND_SCANNER@
@@ -640,6 +656,7 @@ XVMC_LIBS = @XVMC_LIBS@
XVMC_LIB_INSTALL_DIR = @XVMC_LIB_INSTALL_DIR@
XVMC_MAJOR = @XVMC_MAJOR@
XVMC_MINOR = @XVMC_MINOR@
+XXD = @XXD@
YACC = @YACC@
YFLAGS = @YFLAGS@
abs_builddir = @abs_builddir@
@@ -703,11 +720,11 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
SUBDIRS =
-BUILT_SOURCES = $(am__append_1) $(am__append_13) $(am__append_18)
+BUILT_SOURCES = $(am__append_1) $(am__append_14) $(am__append_19)
CLEANFILES = $(BUILT_SOURCES)
-lib_LTLIBRARIES = $(am__append_2) $(am__append_15) $(am__append_20)
+lib_LTLIBRARIES = $(am__append_2) $(am__append_16) $(am__append_21)
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = $(am__append_14) $(am__append_19)
+pkgconfig_DATA = $(am__append_15) $(am__append_20)
EXTRA_DIST = \
es1api/ABI-check \
es2api/ABI-check \
@@ -765,10 +782,14 @@ MKDIR_GEN = $(AM_V_at)$(MKDIR_P) $(@D)
PYTHON_GEN = $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS)
glapi_gen_mapi_deps := \
mapi_abi.py \
- $(wildcard glapi/gen/*.xml) \
- $(wildcard glapi/gen/*.py)
+ $(wildcard $(top_srcdir)/src/mapi/glapi/gen/*.xml) \
+ $(wildcard $(top_srcdir)/src/mapi/glapi/gen/*.py)
@HAVE_SHARED_GLAPI_TRUE@shared_glapi_libglapi_la_SOURCES = $(MAPI_GLAPI_FILES) shared-glapi/glapi_mapi_tmp.h
+@HAVE_SHARED_GLAPI_TRUE@shared_glapi_libglapi_la_CFLAGS = \
+@HAVE_SHARED_GLAPI_TRUE@ $(AM_CFLAGS) \
+@HAVE_SHARED_GLAPI_TRUE@ $(VISIBILITY_CFLAGS)
+
@HAVE_SHARED_GLAPI_TRUE@shared_glapi_libglapi_la_CPPFLAGS = \
@HAVE_SHARED_GLAPI_TRUE@ $(AM_CPPFLAGS) \
@HAVE_SHARED_GLAPI_TRUE@ -DMAPI_MODE_GLAPI \
@@ -797,11 +818,12 @@ glapi_gen_mapi_deps := \
@HAVE_OPENGL_TRUE@@HAVE_X86_64_ASM_FALSE@@HAVE_X86_ASM_TRUE@GLAPI_ASM_SOURCES = glapi/glapi_x86.S
@HAVE_OPENGL_TRUE@@HAVE_X86_64_ASM_TRUE@@HAVE_X86_ASM_TRUE@GLAPI_ASM_SOURCES = glapi/glapi_x86-64.S
@HAVE_OPENGL_TRUE@glapi_libglapi_la_SOURCES = $(am__append_5) \
-@HAVE_OPENGL_TRUE@ $(am__append_6) $(am__append_9)
+@HAVE_OPENGL_TRUE@ $(am__append_6) $(am__append_7) \
+@HAVE_OPENGL_TRUE@ $(am__append_10)
@HAVE_OPENGL_TRUE@glapi_libglapi_la_CPPFLAGS = $(AM_CPPFLAGS) \
@HAVE_OPENGL_TRUE@ -I$(top_srcdir)/src/mapi/glapi \
-@HAVE_OPENGL_TRUE@ -I$(top_srcdir)/src/mesa $(am__append_7) \
-@HAVE_OPENGL_TRUE@ $(am__append_8)
+@HAVE_OPENGL_TRUE@ -I$(top_srcdir)/src/mesa $(am__append_8) \
+@HAVE_OPENGL_TRUE@ $(am__append_9)
@HAVE_OPENGL_TRUE@@HAVE_SHARED_GLAPI_FALSE@glapi_test_SOURCES = glapi/tests/check_table.cpp
@HAVE_OPENGL_TRUE@@HAVE_SHARED_GLAPI_FALSE@glapi_test_CPPFLAGS = \
@HAVE_OPENGL_TRUE@@HAVE_SHARED_GLAPI_FALSE@ $(AM_CPPFLAGS) \
@@ -829,7 +851,7 @@ glapi_gen_mapi_deps := \
@HAVE_OPENGL_ES1_TRUE@ -DMAPI_ABI_HEADER=\"es1api/glapi_mapi_tmp.h\"
@HAVE_OPENGL_ES1_TRUE@es1api_libGLESv1_CM_la_LIBADD = \
-@HAVE_OPENGL_ES1_TRUE@ $(GLESv1_CM_LIB_DEPS) $(am__append_16)
+@HAVE_OPENGL_ES1_TRUE@ $(GLESv1_CM_LIB_DEPS) $(am__append_17)
@HAVE_OPENGL_ES1_TRUE@es1api_libGLESv1_CM_la_LDFLAGS = \
@HAVE_OPENGL_ES1_TRUE@ -no-undefined \
@HAVE_OPENGL_ES1_TRUE@ -version-number 1:1 \
@@ -846,6 +868,7 @@ glapi_gen_mapi_deps := \
@HAVE_OPENGL_ES2_TRUE@GLES3_include_HEADERS = \
@HAVE_OPENGL_ES2_TRUE@ $(top_srcdir)/include/GLES3/gl3.h \
@HAVE_OPENGL_ES2_TRUE@ $(top_srcdir)/include/GLES3/gl31.h \
+@HAVE_OPENGL_ES2_TRUE@ $(top_srcdir)/include/GLES3/gl32.h \
@HAVE_OPENGL_ES2_TRUE@ $(top_srcdir)/include/GLES3/gl3ext.h \
@HAVE_OPENGL_ES2_TRUE@ $(top_srcdir)/include/GLES3/gl3platform.h
@@ -860,7 +883,7 @@ glapi_gen_mapi_deps := \
@HAVE_OPENGL_ES2_TRUE@ -DMAPI_ABI_HEADER=\"es2api/glapi_mapi_tmp.h\"
@HAVE_OPENGL_ES2_TRUE@es2api_libGLESv2_la_LIBADD = $(GLESv2_LIB_DEPS) \
-@HAVE_OPENGL_ES2_TRUE@ $(am__append_21)
+@HAVE_OPENGL_ES2_TRUE@ $(am__append_22)
@HAVE_OPENGL_ES2_TRUE@es2api_libGLESv2_la_LDFLAGS = \
@HAVE_OPENGL_ES2_TRUE@ -no-undefined \
@HAVE_OPENGL_ES2_TRUE@ -version-number 2 \
@@ -1203,46 +1226,46 @@ glapi_libglapi_la-u_execmem.lo: u_execmem.c
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(glapi_libglapi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o glapi_libglapi_la-u_execmem.lo `test -f 'u_execmem.c' || echo '$(srcdir)/'`u_execmem.c
shared_glapi_libglapi_la-entry.lo: entry.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_glapi_libglapi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared_glapi_libglapi_la-entry.lo -MD -MP -MF $(DEPDIR)/shared_glapi_libglapi_la-entry.Tpo -c -o shared_glapi_libglapi_la-entry.lo `test -f 'entry.c' || echo '$(srcdir)/'`entry.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_glapi_libglapi_la_CPPFLAGS) $(CPPFLAGS) $(shared_glapi_libglapi_la_CFLAGS) $(CFLAGS) -MT shared_glapi_libglapi_la-entry.lo -MD -MP -MF $(DEPDIR)/shared_glapi_libglapi_la-entry.Tpo -c -o shared_glapi_libglapi_la-entry.lo `test -f 'entry.c' || echo '$(srcdir)/'`entry.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/shared_glapi_libglapi_la-entry.Tpo $(DEPDIR)/shared_glapi_libglapi_la-entry.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='entry.c' object='shared_glapi_libglapi_la-entry.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_glapi_libglapi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared_glapi_libglapi_la-entry.lo `test -f 'entry.c' || echo '$(srcdir)/'`entry.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_glapi_libglapi_la_CPPFLAGS) $(CPPFLAGS) $(shared_glapi_libglapi_la_CFLAGS) $(CFLAGS) -c -o shared_glapi_libglapi_la-entry.lo `test -f 'entry.c' || echo '$(srcdir)/'`entry.c
shared_glapi_libglapi_la-mapi_glapi.lo: mapi_glapi.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_glapi_libglapi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared_glapi_libglapi_la-mapi_glapi.lo -MD -MP -MF $(DEPDIR)/shared_glapi_libglapi_la-mapi_glapi.Tpo -c -o shared_glapi_libglapi_la-mapi_glapi.lo `test -f 'mapi_glapi.c' || echo '$(srcdir)/'`mapi_glapi.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_glapi_libglapi_la_CPPFLAGS) $(CPPFLAGS) $(shared_glapi_libglapi_la_CFLAGS) $(CFLAGS) -MT shared_glapi_libglapi_la-mapi_glapi.lo -MD -MP -MF $(DEPDIR)/shared_glapi_libglapi_la-mapi_glapi.Tpo -c -o shared_glapi_libglapi_la-mapi_glapi.lo `test -f 'mapi_glapi.c' || echo '$(srcdir)/'`mapi_glapi.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/shared_glapi_libglapi_la-mapi_glapi.Tpo $(DEPDIR)/shared_glapi_libglapi_la-mapi_glapi.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mapi_glapi.c' object='shared_glapi_libglapi_la-mapi_glapi.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_glapi_libglapi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared_glapi_libglapi_la-mapi_glapi.lo `test -f 'mapi_glapi.c' || echo '$(srcdir)/'`mapi_glapi.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_glapi_libglapi_la_CPPFLAGS) $(CPPFLAGS) $(shared_glapi_libglapi_la_CFLAGS) $(CFLAGS) -c -o shared_glapi_libglapi_la-mapi_glapi.lo `test -f 'mapi_glapi.c' || echo '$(srcdir)/'`mapi_glapi.c
shared_glapi_libglapi_la-stub.lo: stub.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_glapi_libglapi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared_glapi_libglapi_la-stub.lo -MD -MP -MF $(DEPDIR)/shared_glapi_libglapi_la-stub.Tpo -c -o shared_glapi_libglapi_la-stub.lo `test -f 'stub.c' || echo '$(srcdir)/'`stub.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_glapi_libglapi_la_CPPFLAGS) $(CPPFLAGS) $(shared_glapi_libglapi_la_CFLAGS) $(CFLAGS) -MT shared_glapi_libglapi_la-stub.lo -MD -MP -MF $(DEPDIR)/shared_glapi_libglapi_la-stub.Tpo -c -o shared_glapi_libglapi_la-stub.lo `test -f 'stub.c' || echo '$(srcdir)/'`stub.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/shared_glapi_libglapi_la-stub.Tpo $(DEPDIR)/shared_glapi_libglapi_la-stub.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='stub.c' object='shared_glapi_libglapi_la-stub.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_glapi_libglapi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared_glapi_libglapi_la-stub.lo `test -f 'stub.c' || echo '$(srcdir)/'`stub.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_glapi_libglapi_la_CPPFLAGS) $(CPPFLAGS) $(shared_glapi_libglapi_la_CFLAGS) $(CFLAGS) -c -o shared_glapi_libglapi_la-stub.lo `test -f 'stub.c' || echo '$(srcdir)/'`stub.c
shared_glapi_libglapi_la-table.lo: table.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_glapi_libglapi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared_glapi_libglapi_la-table.lo -MD -MP -MF $(DEPDIR)/shared_glapi_libglapi_la-table.Tpo -c -o shared_glapi_libglapi_la-table.lo `test -f 'table.c' || echo '$(srcdir)/'`table.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_glapi_libglapi_la_CPPFLAGS) $(CPPFLAGS) $(shared_glapi_libglapi_la_CFLAGS) $(CFLAGS) -MT shared_glapi_libglapi_la-table.lo -MD -MP -MF $(DEPDIR)/shared_glapi_libglapi_la-table.Tpo -c -o shared_glapi_libglapi_la-table.lo `test -f 'table.c' || echo '$(srcdir)/'`table.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/shared_glapi_libglapi_la-table.Tpo $(DEPDIR)/shared_glapi_libglapi_la-table.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='table.c' object='shared_glapi_libglapi_la-table.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_glapi_libglapi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared_glapi_libglapi_la-table.lo `test -f 'table.c' || echo '$(srcdir)/'`table.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_glapi_libglapi_la_CPPFLAGS) $(CPPFLAGS) $(shared_glapi_libglapi_la_CFLAGS) $(CFLAGS) -c -o shared_glapi_libglapi_la-table.lo `test -f 'table.c' || echo '$(srcdir)/'`table.c
shared_glapi_libglapi_la-u_current.lo: u_current.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_glapi_libglapi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared_glapi_libglapi_la-u_current.lo -MD -MP -MF $(DEPDIR)/shared_glapi_libglapi_la-u_current.Tpo -c -o shared_glapi_libglapi_la-u_current.lo `test -f 'u_current.c' || echo '$(srcdir)/'`u_current.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_glapi_libglapi_la_CPPFLAGS) $(CPPFLAGS) $(shared_glapi_libglapi_la_CFLAGS) $(CFLAGS) -MT shared_glapi_libglapi_la-u_current.lo -MD -MP -MF $(DEPDIR)/shared_glapi_libglapi_la-u_current.Tpo -c -o shared_glapi_libglapi_la-u_current.lo `test -f 'u_current.c' || echo '$(srcdir)/'`u_current.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/shared_glapi_libglapi_la-u_current.Tpo $(DEPDIR)/shared_glapi_libglapi_la-u_current.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='u_current.c' object='shared_glapi_libglapi_la-u_current.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_glapi_libglapi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared_glapi_libglapi_la-u_current.lo `test -f 'u_current.c' || echo '$(srcdir)/'`u_current.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_glapi_libglapi_la_CPPFLAGS) $(CPPFLAGS) $(shared_glapi_libglapi_la_CFLAGS) $(CFLAGS) -c -o shared_glapi_libglapi_la-u_current.lo `test -f 'u_current.c' || echo '$(srcdir)/'`u_current.c
shared_glapi_libglapi_la-u_execmem.lo: u_execmem.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_glapi_libglapi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT shared_glapi_libglapi_la-u_execmem.lo -MD -MP -MF $(DEPDIR)/shared_glapi_libglapi_la-u_execmem.Tpo -c -o shared_glapi_libglapi_la-u_execmem.lo `test -f 'u_execmem.c' || echo '$(srcdir)/'`u_execmem.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_glapi_libglapi_la_CPPFLAGS) $(CPPFLAGS) $(shared_glapi_libglapi_la_CFLAGS) $(CFLAGS) -MT shared_glapi_libglapi_la-u_execmem.lo -MD -MP -MF $(DEPDIR)/shared_glapi_libglapi_la-u_execmem.Tpo -c -o shared_glapi_libglapi_la-u_execmem.lo `test -f 'u_execmem.c' || echo '$(srcdir)/'`u_execmem.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/shared_glapi_libglapi_la-u_execmem.Tpo $(DEPDIR)/shared_glapi_libglapi_la-u_execmem.Plo
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='u_execmem.c' object='shared_glapi_libglapi_la-u_execmem.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_glapi_libglapi_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o shared_glapi_libglapi_la-u_execmem.lo `test -f 'u_execmem.c' || echo '$(srcdir)/'`u_execmem.c
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(shared_glapi_libglapi_la_CPPFLAGS) $(CPPFLAGS) $(shared_glapi_libglapi_la_CFLAGS) $(CFLAGS) -c -o shared_glapi_libglapi_la-u_execmem.lo `test -f 'u_execmem.c' || echo '$(srcdir)/'`u_execmem.c
.cpp.o:
@am__fastdepCXX_TRUE@ $(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
diff --git a/lib/mesa/src/mapi/glapi/gen/Makefile.am b/lib/mesa/src/mapi/glapi/gen/Makefile.am
index 075b6280b..28b5b77d9 100644
--- a/lib/mesa/src/mapi/glapi/gen/Makefile.am
+++ b/lib/mesa/src/mapi/glapi/gen/Makefile.am
@@ -32,6 +32,9 @@ MESA_GLAPI_OUTPUTS = \
if HAVE_APPLEDRI
MESA_GLAPI_OUTPUTS += $(MESA_GLAPI_DIR)/glapi_gentable.c
endif
+if HAVE_WINDOWSDRI
+MESA_GLAPI_OUTPUTS += $(MESA_GLAPI_DIR)/glapi_gentable.c
+endif
MESA_GLAPI_ASM_OUTPUTS =
if HAVE_X86_ASM
@@ -89,18 +92,7 @@ EXTRA_DIST= \
XORG_GLX_DIR = $(XORG_BASE)/glx
XORG_GLAPI_DIR = $(XORG_BASE)/glx
-XORG_GLAPI_OUTPUTS = \
- $(XORG_GLAPI_DIR)/glprocs.h \
- $(XORG_GLAPI_DIR)/glapitable.h \
- $(XORG_GLAPI_DIR)/dispatch.h
-
-if HAVE_APPLEDRI
-XORG_GLAPI_OUTPUTS += \
- $(XORG_GLAPI_DIR)/glapi_gentable.c
-endif
-
XORG_OUTPUTS = \
- $(XORG_GLAPI_OUTPUTS) \
$(XORG_GLX_DIR)/indirect_dispatch.c \
$(XORG_GLX_DIR)/indirect_dispatch_swap.c \
$(XORG_GLX_DIR)/indirect_dispatch.h \
@@ -111,6 +103,8 @@ XORG_OUTPUTS = \
$(XORG_GLX_DIR)/indirect_size_get.h \
$(XORG_GLX_DIR)/indirect_table.c
+.PHONY: $(XORG_OUTPUTS)
+
######################################################################
API_XML = \
@@ -126,6 +120,7 @@ API_XML = \
ARB_color_buffer_float.xml \
ARB_compressed_texture_pixel_storage.xml \
ARB_compute_shader.xml \
+ ARB_compute_variable_group_size.xml \
ARB_copy_buffer.xml \
ARB_copy_image.xml \
ARB_debug_output.xml \
@@ -148,6 +143,7 @@ API_XML = \
ARB_indirect_parameters.xml \
ARB_instanced_arrays.xml \
ARB_internalformat_query.xml \
+ ARB_internalformat_query2.xml \
ARB_invalidate_subdata.xml \
ARB_map_buffer_range.xml \
ARB_multi_bind.xml \
@@ -196,10 +192,13 @@ API_XML = \
EXT_texture_array.xml \
EXT_texture_integer.xml \
EXT_transform_feedback.xml \
+ EXT_window_rectangles.xml \
GREMEDY_string_marker.xml \
INTEL_performance_query.xml \
KHR_debug.xml \
KHR_context_flush_control.xml \
+ KHR_robustness.xml \
+ KHR_robustness_es.xml \
KHR_texture_compression_astc.xml \
NV_conditional_render.xml \
NV_primitive_restart.xml \
@@ -208,6 +207,7 @@ API_XML = \
OES_EGL_image.xml \
OES_fixed_point.xml \
OES_single_precision.xml \
+ OES_texture_compression_astc.xml \
GL3x.xml \
GL4x.xml
@@ -330,7 +330,7 @@ $(XORG_GLX_DIR)/indirect_dispatch.h: glX_proto_recv.py gl_and_glX_API.xml $(COMM
$(XORG_GLX_DIR)/indirect_size_get.h: glX_proto_size.py $(COMMON_GLX)
$(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml -m size_h \
- --only-get -h '_INDIRECT_SIZE_GET_H_' \
+ --only-get --header-tag '_INDIRECT_SIZE_GET_H_' \
| $(INDENT) $(XORG_INDENT_FLAGS) > $@
$(XORG_GLX_DIR)/indirect_size_get.c: glX_proto_size.py $(COMMON_GLX)
@@ -339,7 +339,7 @@ $(XORG_GLX_DIR)/indirect_size_get.c: glX_proto_size.py $(COMMON_GLX)
$(XORG_GLX_DIR)/indirect_reqsize.h: glX_proto_size.py $(COMMON_GLX)
$(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml -m reqsize_h \
- --only-get -h '_INDIRECT_SIZE_GET_H_' \
+ --only-get --header-tag '_INDIRECT_SIZE_GET_H_' \
| $(INDENT) $(XORG_INDENT_FLAGS) > $@
$(XORG_GLX_DIR)/indirect_reqsize.c: glX_proto_size.py $(COMMON_GLX)
diff --git a/lib/mesa/src/mapi/glapi/gen/Makefile.in b/lib/mesa/src/mapi/glapi/gen/Makefile.in
index 2d699e7db..a6f3e8cb2 100644
--- a/lib/mesa/src/mapi/glapi/gen/Makefile.in
+++ b/lib/mesa/src/mapi/glapi/gen/Makefile.in
@@ -51,12 +51,10 @@ build_triplet = @build@
host_triplet = @host@
target_triplet = @target@
@HAVE_APPLEDRI_TRUE@am__append_1 = $(MESA_GLAPI_DIR)/glapi_gentable.c
-@HAVE_X86_64_ASM_TRUE@@HAVE_X86_ASM_TRUE@am__append_2 = $(MESA_GLAPI_DIR)/glapi_x86-64.S
-@HAVE_X86_64_ASM_FALSE@@HAVE_X86_ASM_TRUE@am__append_3 = $(MESA_GLAPI_DIR)/glapi_x86.S
-@HAVE_SPARC_ASM_TRUE@am__append_4 = $(MESA_GLAPI_DIR)/glapi_sparc.S
-@HAVE_APPLEDRI_TRUE@am__append_5 = \
-@HAVE_APPLEDRI_TRUE@ $(XORG_GLAPI_DIR)/glapi_gentable.c
-
+@HAVE_WINDOWSDRI_TRUE@am__append_2 = $(MESA_GLAPI_DIR)/glapi_gentable.c
+@HAVE_X86_64_ASM_TRUE@@HAVE_X86_ASM_TRUE@am__append_3 = $(MESA_GLAPI_DIR)/glapi_x86-64.S
+@HAVE_X86_64_ASM_FALSE@@HAVE_X86_ASM_TRUE@am__append_4 = $(MESA_GLAPI_DIR)/glapi_x86.S
+@HAVE_SPARC_ASM_TRUE@am__append_5 = $(MESA_GLAPI_DIR)/glapi_sparc.S
subdir = src/mapi/glapi/gen
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
@@ -163,6 +161,8 @@ GLESv2_LIB_DEPS = @GLESv2_LIB_DEPS@
GLESv2_PC_LIB_PRIV = @GLESv2_PC_LIB_PRIV@
GLPROTO_CFLAGS = @GLPROTO_CFLAGS@
GLPROTO_LIBS = @GLPROTO_LIBS@
+GLVND_CFLAGS = @GLVND_CFLAGS@
+GLVND_LIBS = @GLVND_LIBS@
GLX_TLS = @GLX_TLS@
GL_LIB = @GL_LIB@
GL_LIB_DEPS = @GL_LIB_DEPS@
@@ -194,11 +194,10 @@ LIBELF_CFLAGS = @LIBELF_CFLAGS@
LIBELF_LIBS = @LIBELF_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
+LIBSENSORS_LDFLAGS = @LIBSENSORS_LDFLAGS@
LIBSHA1_CFLAGS = @LIBSHA1_CFLAGS@
LIBSHA1_LIBS = @LIBSHA1_LIBS@
LIBTOOL = @LIBTOOL@
-LIBUDEV_CFLAGS = @LIBUDEV_CFLAGS@
-LIBUDEV_LIBS = @LIBUDEV_LIBS@
LIB_DIR = @LIB_DIR@
LIB_EXT = @LIB_EXT@
LIPO = @LIPO@
@@ -261,6 +260,8 @@ PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
POSIX_SHELL = @POSIX_SHELL@
PRESENTPROTO_CFLAGS = @PRESENTPROTO_CFLAGS@
PRESENTPROTO_LIBS = @PRESENTPROTO_LIBS@
+PTHREADSTUBS_CFLAGS = @PTHREADSTUBS_CFLAGS@
+PTHREADSTUBS_LIBS = @PTHREADSTUBS_LIBS@
PTHREAD_CC = @PTHREAD_CC@
PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
PTHREAD_LIBS = @PTHREAD_LIBS@
@@ -281,11 +282,19 @@ SIMPENROSE_CFLAGS = @SIMPENROSE_CFLAGS@
SIMPENROSE_LIBS = @SIMPENROSE_LIBS@
SSE41_CFLAGS = @SSE41_CFLAGS@
STRIP = @STRIP@
+SWR_AVX2_CXXFLAGS = @SWR_AVX2_CXXFLAGS@
+SWR_AVX_CXXFLAGS = @SWR_AVX_CXXFLAGS@
+SWR_CXX11_CXXFLAGS = @SWR_CXX11_CXXFLAGS@
+TIMESTAMP_CMD = @TIMESTAMP_CMD@
+VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
+VALGRIND_LIBS = @VALGRIND_LIBS@
VA_CFLAGS = @VA_CFLAGS@
VA_LIBS = @VA_LIBS@
VA_LIB_INSTALL_DIR = @VA_LIB_INSTALL_DIR@
VA_MAJOR = @VA_MAJOR@
VA_MINOR = @VA_MINOR@
+VC4_CFLAGS = @VC4_CFLAGS@
+VC4_LIBS = @VC4_LIBS@
VDPAU_CFLAGS = @VDPAU_CFLAGS@
VDPAU_LIBS = @VDPAU_LIBS@
VDPAU_LIB_INSTALL_DIR = @VDPAU_LIB_INSTALL_DIR@
@@ -297,6 +306,7 @@ VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@
VISIBILITY_CXXFLAGS = @VISIBILITY_CXXFLAGS@
VL_CFLAGS = @VL_CFLAGS@
VL_LIBS = @VL_LIBS@
+VULKAN_ICD_INSTALL_DIR = @VULKAN_ICD_INSTALL_DIR@
WAYLAND_CFLAGS = @WAYLAND_CFLAGS@
WAYLAND_LIBS = @WAYLAND_LIBS@
WAYLAND_SCANNER = @WAYLAND_SCANNER@
@@ -320,6 +330,7 @@ XVMC_LIBS = @XVMC_LIBS@
XVMC_LIB_INSTALL_DIR = @XVMC_LIB_INSTALL_DIR@
XVMC_MAJOR = @XVMC_MAJOR@
XVMC_MINOR = @XVMC_MINOR@
+XXD = @XXD@
YACC = @YACC@
YFLAGS = @YFLAGS@
abs_builddir = @abs_builddir@
@@ -408,9 +419,9 @@ MESA_MAPI_DIR = $(top_srcdir)/src/mapi
MESA_GLX_DIR = $(top_builddir)/src/glx
MESA_GLAPI_OUTPUTS = $(MESA_GLAPI_DIR)/glapi_mapi_tmp.h \
$(MESA_GLAPI_DIR)/glprocs.h $(MESA_GLAPI_DIR)/glapitemp.h \
- $(MESA_GLAPI_DIR)/glapitable.h $(am__append_1)
-MESA_GLAPI_ASM_OUTPUTS = $(am__append_2) $(am__append_3) \
- $(am__append_4)
+ $(MESA_GLAPI_DIR)/glapitable.h $(am__append_1) $(am__append_2)
+MESA_GLAPI_ASM_OUTPUTS = $(am__append_3) $(am__append_4) \
+ $(am__append_5)
BUILT_SOURCES = \
$(MESA_GLAPI_OUTPUTS) \
$(MESA_GLAPI_ASM_OUTPUTS) \
@@ -454,11 +465,7 @@ EXTRA_DIST = \
######################################################################
XORG_GLX_DIR = $(XORG_BASE)/glx
XORG_GLAPI_DIR = $(XORG_BASE)/glx
-XORG_GLAPI_OUTPUTS = $(XORG_GLAPI_DIR)/glprocs.h \
- $(XORG_GLAPI_DIR)/glapitable.h $(XORG_GLAPI_DIR)/dispatch.h \
- $(am__append_5)
XORG_OUTPUTS = \
- $(XORG_GLAPI_OUTPUTS) \
$(XORG_GLX_DIR)/indirect_dispatch.c \
$(XORG_GLX_DIR)/indirect_dispatch_swap.c \
$(XORG_GLX_DIR)/indirect_dispatch.h \
@@ -484,6 +491,7 @@ API_XML = \
ARB_color_buffer_float.xml \
ARB_compressed_texture_pixel_storage.xml \
ARB_compute_shader.xml \
+ ARB_compute_variable_group_size.xml \
ARB_copy_buffer.xml \
ARB_copy_image.xml \
ARB_debug_output.xml \
@@ -506,6 +514,7 @@ API_XML = \
ARB_indirect_parameters.xml \
ARB_instanced_arrays.xml \
ARB_internalformat_query.xml \
+ ARB_internalformat_query2.xml \
ARB_invalidate_subdata.xml \
ARB_map_buffer_range.xml \
ARB_multi_bind.xml \
@@ -554,10 +563,13 @@ API_XML = \
EXT_texture_array.xml \
EXT_texture_integer.xml \
EXT_transform_feedback.xml \
+ EXT_window_rectangles.xml \
GREMEDY_string_marker.xml \
INTEL_performance_query.xml \
KHR_debug.xml \
KHR_context_flush_control.xml \
+ KHR_robustness.xml \
+ KHR_robustness_es.xml \
KHR_texture_compression_astc.xml \
NV_conditional_render.xml \
NV_primitive_restart.xml \
@@ -566,6 +578,7 @@ API_XML = \
OES_EGL_image.xml \
OES_fixed_point.xml \
OES_single_precision.xml \
+ OES_texture_compression_astc.xml \
GL3x.xml \
GL4x.xml
@@ -775,6 +788,8 @@ uninstall-am:
uninstall uninstall-am
+.PHONY: $(XORG_OUTPUTS)
+
######################################################################
xorg: check-xorg-source $(XORG_OUTPUTS)
@@ -882,7 +897,7 @@ $(XORG_GLAPI_DIR)/%.h: $(MESA_GLAPI_DIR)/%.h
@REGEN_SOURCES_TRUE@$(XORG_GLX_DIR)/indirect_size_get.h: glX_proto_size.py $(COMMON_GLX)
@REGEN_SOURCES_TRUE@ $(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml -m size_h \
-@REGEN_SOURCES_TRUE@ --only-get -h '_INDIRECT_SIZE_GET_H_' \
+@REGEN_SOURCES_TRUE@ --only-get --header-tag '_INDIRECT_SIZE_GET_H_' \
@REGEN_SOURCES_TRUE@ | $(INDENT) $(XORG_INDENT_FLAGS) > $@
@REGEN_SOURCES_TRUE@$(XORG_GLX_DIR)/indirect_size_get.c: glX_proto_size.py $(COMMON_GLX)
@@ -891,7 +906,7 @@ $(XORG_GLAPI_DIR)/%.h: $(MESA_GLAPI_DIR)/%.h
@REGEN_SOURCES_TRUE@$(XORG_GLX_DIR)/indirect_reqsize.h: glX_proto_size.py $(COMMON_GLX)
@REGEN_SOURCES_TRUE@ $(PYTHON_GEN) $< -f $(srcdir)/gl_API.xml -m reqsize_h \
-@REGEN_SOURCES_TRUE@ --only-get -h '_INDIRECT_SIZE_GET_H_' \
+@REGEN_SOURCES_TRUE@ --only-get --header-tag '_INDIRECT_SIZE_GET_H_' \
@REGEN_SOURCES_TRUE@ | $(INDENT) $(XORG_INDENT_FLAGS) > $@
@REGEN_SOURCES_TRUE@$(XORG_GLX_DIR)/indirect_reqsize.c: glX_proto_size.py $(COMMON_GLX)
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-26 12:58:55 +0000