diff options
| author | Ian Romanick <[email protected]> | 2012-07-31 16:40:07 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2012-08-08 10:06:26 -0700 |
| commit | f5dffb7e36487ff8a012725aaf78a4b7d3169102 (patch) | |
| tree | b22888dbf6944e21cd974aaf3537e3521810adbe /src/glx/tests/Makefile.am | |
| parent | 52d6df8aa7231c1d4d80a8599af0e2c5d02c7b6c (diff) | |
glx: Don't rely on struct _glapi_table
When --enable-shared-glapi is used, all non-ABI entries in the table are
lies. There are two completely separate code generation paths used to
assign dispatch offset. Neither has any clue about the other.
Unsurprisingly, the can't agree on what offsets to assign.
This adds a bunch of overhead to __glXNewIndirectAPI, but this function
is called at most once.
The test ExtensionNopDispatch was removed. There was just no way to
make this test work with the information provided in shared-glapi.
Since indirect_glx.c uses _glapi_get_proc_offset now, it was also
impossible to make the tests work without shared-glapi. So much pain.
This fixes indirect rendering with shared-glapi.
Signed-off-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/glx/tests/Makefile.am')
| -rw-r--r-- | src/glx/tests/Makefile.am | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/glx/tests/Makefile.am b/src/glx/tests/Makefile.am index ad18f85fe01..a7a23faf32e 100644 --- a/src/glx/tests/Makefile.am +++ b/src/glx/tests/Makefile.am @@ -1,6 +1,8 @@ +if HAVE_SHARED_GLAPI AM_CPPFLAGS = \ -I$(top_builddir)/src/gtest/include \ -I$(top_builddir)/src/mapi \ + -I$(top_builddir)/src/mesa \ -I$(top_builddir)/src/glx \ -I$(top_builddir)/include \ $(X11_CFLAGS) @@ -18,4 +20,6 @@ glx_test_SOURCES = \ glx_test_LDADD = \ $(top_builddir)/src/glx/libglx.la \ $(top_builddir)/src/gtest/libgtest.la \ + $(top_builddir)/src/mapi/shared-glapi/libglapi.la \ -lpthread +endif |