swr: fix windows build break

wrap lp_bld_type.h around extern "C".
Windows decorates global variables, so when used from .cpp files, need
to use an undecorated version.

Also, removed related and unneeded code from swr_screen.cpp

Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
This commit is contained in:
George Kyriazis 2017-01-04 13:13:36 -06:00 committed by Tim Rowley
parent 3753dc896d
commit 36ad826548
2 changed files with 7 additions and 4 deletions

View file

@ -41,6 +41,10 @@
#include "pipe/p_compiler.h"
#include "gallivm/lp_bld.h"
#ifdef __cplusplus
extern "C" {
#endif
/**
* Native SIMD architecture width available at runtime.
*
@ -449,5 +453,8 @@ lp_build_context_init(struct lp_build_context *bld,
unsigned
lp_build_count_ir_module(LLVMModuleRef module);
#ifdef __cplusplus
}
#endif
#endif /* !LP_BLD_TYPE_H */

View file

@ -39,10 +39,6 @@
#include "state_tracker/sw_winsys.h"
extern "C" {
#include "gallivm/lp_bld_limits.h"
}
#include "jit_api.h"
#include "memory/TilingFunctions.h"