LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolved conflicts for merge of d8266150 to graphics-dev

Browse Source 
Change-Id: Ie39a5e07ddbfcfe9e8161674f1b0912c9f8f49d1
This commit is contained in:
Jason Sams
2011-11-30 13:54:40 -08:00
parent 8785c24956 d8266150ba
commit edbca34e27
2 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/a3dconvert/SimpleMesh.h
View File

@@ -106,13 +106,18 @@ public:
uint32_t vertexPos = i*vertexSize; uint32_t vertexPos = i*vertexSize;
float *vertexPtr = dataPtr + vertexPos; float *vertexPtr = dataPtr + vertexPos;
uint32_t elemIndex = 0;
for (uint32_t c = 0; c < mChannels.size(); c ++) { for (uint32_t c = 0; c < mChannels.size(); c ++) {
// Skip empty channels // Skip empty channels
if (mChannels[c].mData.size() == 0) { if (mChannels[c].mData.size() == 0) {
continue; continue;
} }
// This will address vector element alignment issues
uint32_t elemlOffset = vertexDataElem->getFieldOffsetBytes(elemIndex)/sizeof(float);
elemIndex ++;
float *channelPtr = vertexPtr + elemlOffset;
for (uint32_t cStride = 0; cStride < mChannels[c].mStride; cStride ++) { for (uint32_t cStride = 0; cStride < mChannels[c].mStride; cStride ++) {
*(vertexPtr++) = mChannels[c].mData[i * mChannels[c].mStride + cStride]; *(channelPtr++) = mChannels[c].mData[i * mChannels[c].mStride + cStride];
} }
} }
} }

20
tools/a3dconvert/a3dconvert.cpp
View File

@@ -42,23 +42,11 @@ void rsdAllocationDestroy(const Context *rsc, Allocation *alloc) {
} }
} }
// We only care to implement allocation memory initialization and destruction static RsdHalFunctions FunctionTable;
// because we need no other renderscript hal features for serialization
static RsdHalFunctions FunctionTable = {
NULL, NULL, NULL, NULL, NULL, NULL, NULL,
{ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,NULL },
{
rsdAllocationInit,
rsdAllocationDestroy,
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
},
{ NULL, NULL, NULL }, { NULL, NULL, NULL }, { NULL, NULL, NULL },
{ NULL, NULL, NULL }, { NULL, NULL, NULL }, { NULL, NULL, NULL, NULL }, { NULL, NULL },
{ NULL, NULL, NULL},
};
// No-op initizlizer for rs context hal since we only
bool rsdHalInit(Context *rsc, uint32_t version_major, uint32_t version_minor) { bool rsdHalInit(Context *rsc, uint32_t version_major, uint32_t version_minor) {
memset(&FunctionTable, 0, sizeof(FunctionTable));
FunctionTable.allocation.init = rsdAllocationInit;
FunctionTable.allocation.destroy = rsdAllocationDestroy;
rsc->mHal.funcs = FunctionTable; rsc->mHal.funcs = FunctionTable;
return true; return true;
} }