fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-25 00:00:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r600g/sb: Fix Android build v2

Browse source 
Add the sb CXX files to the Android Makefile and also stop using some
c++11 features.

v2 (Vadim Girlin): use &bc[0] instead of bc.begin()
This commit is contained in:
Chih-Wei Huang 2013-06-27 14:31:05 -07:00 • committed by Vadim Girlin
parent 758ac6f918
commit 1d9271a95c
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/gallium/drivers/r600/Android.mk
View file

@ -28,11 +28,12 @@ include $(LOCAL_PATH)/Makefile.sources
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(C_SOURCES)
LOCAL_SRC_FILES := $(C_SOURCES) $(CXX_SOURCES)
LOCAL_C_INCLUDES :=
LOCAL_C_INCLUDES := $(DRM_TOP)
LOCAL_MODULE := libmesa_pipe_r600
include external/stlport/libstlport.mk
include $(GALLIUM_COMMON_MK)
include $(BUILD_STATIC_LIBRARY)

4
src/gallium/drivers/r600/sb/sb_bc.h
View file

@ -847,7 +847,7 @@ public:
unsigned ndw() { return bc.size(); }
void write_data(uint32_t* dst) {
memcpy(dst, bc.data(), 4 * bc.size());
std::copy(bc.begin(), bc.end(), dst);
}
void align(unsigned a) {
@ -871,7 +871,7 @@ public:
}
unsigned get_pos() { return pos; }
uint32_t *data() { return bc.data(); }
uint32_t *data() { return &bc[0]; }
bytecode & operator <<(uint32_t v) {
if (pos == ndw()) {

2
src/gallium/drivers/r600/sb/sb_ra_init.cpp
View file

@ -680,7 +680,7 @@ void ra_split::split_vec(vvec &vv, vvec &v1, vvec &v2, bool allow_swz) {
value *t;
vvec::iterator F =
allow_swz ? find(v2.begin(), v2.end(), o) : v2.end();
allow_swz ? std::find(v2.begin(), v2.end(), o) : v2.end();
if (F != v2.end()) {
t = *(v1.begin() + (F - v2.begin()));

4
src/gallium/drivers/r600/sb/sb_valtable.cpp
View file

@ -207,7 +207,7 @@ void value_table::get_values(vvec& v) {
for(vt_table::iterator I = hashtable.begin(), E = hashtable.end();
I != E; ++I) {
T = copy(I->begin(), I->end(), T);
T = std::copy(I->begin(), I->end(), T);
}
}
@ -368,7 +368,7 @@ inline bool sb_bitset::set_chk(unsigned id, bool bit) {
}
void sb_bitset::clear() {
memset(data.data(), 0, sizeof(basetype) * data.size());
std::fill(data.begin(), data.end(), 0);
}
void sb_bitset::resize(unsigned size) {