<div dir="ltr"><div>LGTM. Nuke it! </div>Reviewed-by: Jason Ekstrand <<a href="mailto:jason@jlekstrand.net">jason@jlekstrand.net</a>> </div><div class="gmail_extra"> <div class="gmail_quote">On Tue, Jun 7, 2016 at 9:33 AM, Emil Velikov <<a href="mailto:emil.l.velikov@gmail.com" target="_blank">emil.l.velikov@gmail.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">From: Emil Velikov <<a href="mailto:emil.velikov@collabora.com">emil.velikov@collabora.com</a>> ... and associated file(s). No longer needed since commit 057259655e7 ("i965: Don't link libmesa or libdri_test_stubs into tests") Cc: Jason Ekstrand <<a href="mailto:jason.ekstrand@intel.com">jason.ekstrand@intel.com</a>> Signed-off-by: Emil Velikov <<a href="mailto:emil.velikov@collabora.com">emil.velikov@collabora.com</a>> --- src/mesa/drivers/dri/common/Makefile.am | 6 +- src/mesa/drivers/dri/common/Makefile.sources | 3 - src/mesa/drivers/dri/common/dri_test.c | 96 ---------------------------- 3 files changed, 1 insertion(+), 104 deletions(-) delete mode 100644 src/mesa/drivers/dri/common/dri_test.c diff --git a/src/mesa/drivers/dri/common/Makefile.am b/src/mesa/drivers/dri/common/Makefile.am index 2973a06..c85c470 100644 --- a/src/mesa/drivers/dri/common/Makefile.am +++ b/src/mesa/drivers/dri/common/Makefile.am @@ -40,8 +40,7 @@ AM_CFLAGS = \ noinst_LTLIBRARIES = \ <a href="http://libdricommon.la" rel="noreferrer" target="_blank">libdricommon.la</a> \ <a href="http://libxmlconfig.la" rel="noreferrer" target="_blank">libxmlconfig.la</a> \ - <a href="http://libmegadriver_stub.la" rel="noreferrer" target="_blank">libmegadriver_stub.la</a> \ - <a href="http://libdri_test_stubs.la" rel="noreferrer" target="_blank">libdri_test_stubs.la</a> + <a href="http://libmegadriver_stub.la" rel="noreferrer" target="_blank">libmegadriver_stub.la</a> libdricommon_la_SOURCES = $(DRI_COMMON_FILES) @@ -49,9 +48,6 @@ libxmlconfig_la_SOURCES = $(XMLCONFIG_FILES) libxmlconfig_la_CFLAGS = $(AM_CFLAGS) $(EXPAT_CFLAGS) libxmlconfig_la_LIBADD = $(EXPAT_LIBS) -lm -libdri_test_stubs_la_SOURCES = $(test_stubs_FILES) -libdri_test_stubs_la_CFLAGS = $(AM_CFLAGS) -DNO_MAIN - libmegadriver_stub_la_SOURCES = $(megadriver_stub_FILES) sysconf_DATA = drirc diff --git a/src/mesa/drivers/dri/common/Makefile.sources b/src/mesa/drivers/dri/common/Makefile.sources index d5d8da8..9d3cdd3 100644 --- a/src/mesa/drivers/dri/common/Makefile.sources +++ b/src/mesa/drivers/dri/common/Makefile.sources @@ -17,8 +17,5 @@ mesa_dri_common_INCLUDES := \ src/mesa \ src/mesa/drivers/dri/common -test_stubs_FILES := \ - dri_test.c - megadriver_stub_FILES := \ megadriver_stub.c diff --git a/src/mesa/drivers/dri/common/dri_test.c b/src/mesa/drivers/dri/common/dri_test.c deleted file mode 100644 index 57bfa5b..0000000 --- a/src/mesa/drivers/dri/common/dri_test.c +++ /dev/null @@ -1,96 +0,0 @@ -#include "main/glheader.h" -#include "main/compiler.h" -#include "glapi/glapi.h" - -/* This is just supposed to make sure we get a reference to - the driver entry symbol that the compiler doesn't optimize away */ - -extern char __driDriverExtensions[]; - -/* provide glapi symbols */ - -#if defined(GLX_USE_TLS) - -PUBLIC __thread struct _glapi_table * _glapi_tls_Dispatch - __attribute__((tls_model("initial-exec"))); - -PUBLIC __thread void * _glapi_tls_Context - __attribute__((tls_model("initial-exec"))); - -PUBLIC const struct _glapi_table *_glapi_Dispatch; -PUBLIC const void *_glapi_Context; - -#else - -PUBLIC struct _glapi_table *_glapi_Dispatch; -PUBLIC void *_glapi_Context; - -#endif - -PUBLIC void -_glapi_check_multithread(void) -{} - -PUBLIC void -_glapi_set_context(void *context) -{} - -PUBLIC void * -_glapi_get_context(void) -{ - return 0; -} - -PUBLIC void -_glapi_set_dispatch(struct _glapi_table *dispatch) -{} - -PUBLIC struct _glapi_table * -_glapi_get_dispatch(void) -{ - return 0; -} - -PUBLIC int -_glapi_add_dispatch( const char * const * function_names, - const char * parameter_signature ) -{ - return 0; -} - -PUBLIC GLint -_glapi_get_proc_offset(const char *funcName) -{ - return 0; -} - -PUBLIC _glapi_proc -_glapi_get_proc_address(const char *funcName) -{ - return 0; -} - -PUBLIC GLuint -_glapi_get_dispatch_table_size(void) -{ - return 0; -} - -PUBLIC void -_glapi_set_nop_handler(_glapi_nop_handler_proc func) -{ -} - -PUBLIC struct _glapi_table * -_glapi_new_nop_table(unsigned num_entries) -{ - return NULL; -} - -#ifndef NO_MAIN -int main(int argc, char** argv) -{ - void* p = __driDriverExtensions; - return (int)(unsigned long)p; -} -#endif -- 2.8.2 _______________________________________________ mesa-dev mailing list <a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a> <a href="https://lists.freedesktop.org/mailman/listinfo/mesa-dev" rel="noreferrer" target="_blank">https://lists.freedesktop.org/mailman/listinfo/mesa-dev</a> </blockquote></div> </div>