Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix alignment issue in a unit test

Browse Source
This commit is contained in:
Erwin Coumans
2014-02-03 19:44:41 -08:00
parent 23ace43ca0
commit e4e2cb0d39
1 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Bullet3OpenCL/ParallelPrimitives/b3LauncherCL.cpp
View File

@@ -96,7 +96,24 @@ void b3LauncherCL::setBuffers( b3BufferInfoCL* buffInfo, int n )
b3Assert( status == CL_SUCCESS ); b3Assert( status == CL_SUCCESS );
} }
} }
struct b3KernelArgDataUnaligned
{
int m_isBuffer;
int m_argIndex;
int m_argSizeInBytes;
int m_unusedPadding;
union
{
cl_mem m_clBuffer;
unsigned char m_argData[B3_CL_MAX_ARG_SIZE];
};
};
#include <string.h>
int b3LauncherCL::deserializeArgs(unsigned char* buf, int bufSize, cl_context ctx) int b3LauncherCL::deserializeArgs(unsigned char* buf, int bufSize, cl_context ctx)
{ {
int index=0; int index=0;
@@ -106,7 +123,7 @@ int b3LauncherCL::deserializeArgs(unsigned char* buf, int bufSize, cl_context ct
for (int i=0;i<numArguments;i++) for (int i=0;i<numArguments;i++)
{ {
b3KernelArgData* arg = (b3KernelArgData*)&buf[index]; b3KernelArgDataUnaligned* arg = (b3KernelArgDataUnaligned*)&buf[index];
index+=sizeof(b3KernelArgData); index+=sizeof(b3KernelArgData);
if (arg->m_isBuffer) if (arg->m_isBuffer)
@@ -128,7 +145,9 @@ int b3LauncherCL::deserializeArgs(unsigned char* buf, int bufSize, cl_context ct
cl_int status = clSetKernelArg( m_kernel, m_idx++, arg->m_argSizeInBytes, &arg->m_argData); cl_int status = clSetKernelArg( m_kernel, m_idx++, arg->m_argSizeInBytes, &arg->m_argData);
b3Assert( status == CL_SUCCESS ); b3Assert( status == CL_SUCCESS );
} }
m_kernelArguments.push_back(*arg); b3KernelArgData b;
memcpy(&b,arg,sizeof(b3KernelArgDataUnaligned));
m_kernelArguments.push_back(b);
} }
m_serializationSizeInBytes = index; m_serializationSizeInBytes = index;
return index; return index;