LGTM. Nuke it!
Reviewed-by: Jason Ekstrand <ja...@jlekstrand.net>
On Tue, Jun 7, 2016 at 9:33 AM, Emil Velikov <emil.l.veli...@gmail.com>
wrote:
> From: Emil Velikov <emil.veli...@collabora.com>
>
> ... and associated file(s).
>
> No longer needed since commit 057259655e7 ("i965: Don't link libmesa or
> libdri_test_stubs into tests")
>
> Cc: Jason Ekstrand <jason.ekstr...@intel.com>
> Signed-off-by: Emil Velikov <emil.veli...@collabora.com>
> ---
> 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 = \
> libdricommon.la \
> libxmlconfig.la \
> - libmegadriver_stub.la \
> - libdri_test_stubs.la
> + libmegadriver_stub.la
>
> 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
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
