caiyu/gmio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gmio_stl: get rif of gmio_stlb_readwrite_helper

Browse Source
This commit is contained in:
Hugues Delorme 2016-01-26 15:54:06 +01:00
parent fb8f7e0502
commit 8a5f626663
3 changed files with 107 additions and 84 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gmio_stl/internal/stl_rw_common.h
View File

@ -27,13 +27,6 @@ struct gmio_memblock;
struct gmio_rwargs; struct gmio_rwargs;
struct gmio_stl_mesh; struct gmio_stl_mesh;
struct gmio_stlb_readwrite_helper
{
uint32_t facet_count;
uint32_t i_facet_offset;
gmio_stl_triangle_func_fix_endian_t func_fix_endian;
};
gmio_bool_t gmio_check_rwargs(int* error, const struct gmio_rwargs* args); gmio_bool_t gmio_check_rwargs(int* error, const struct gmio_rwargs* args);
gmio_bool_t gmio_check_memblock(int* error, const struct gmio_memblock* mblock); gmio_bool_t gmio_check_memblock(int* error, const struct gmio_memblock* mblock);

93
src/gmio_stl/internal/stlb_write.c
View File

@ -31,53 +31,76 @@
#include <string.h> #include <string.h>
GMIO_INLINE void write_triangle_memcpy( GMIO_INLINE void encode_facet(
const struct gmio_stl_triangle* triangle, uint8_t* mblock) const struct gmio_stl_triangle* triangle, uint8_t* buffer)
{ {
memcpy(mblock, triangle, GMIO_STLB_TRIANGLE_RAWSIZE); memcpy(buffer, triangle, GMIO_STLB_TRIANGLE_RAWSIZE);
} }
static void gmio_stlb_write_facets( typedef void (*func_gmio_stlb_encode_facets_t)(
const struct gmio_stl_mesh*,
uint8_t*, /* buffer */
const uint32_t, /* facet_count */
const uint32_t); /* i_facet_offset */
static void gmio_stlb_encode_facets(
const struct gmio_stl_mesh* mesh, const struct gmio_stl_mesh* mesh,
uint8_t* mblock, uint8_t* buffer,
const struct gmio_stlb_readwrite_helper* wparams) const uint32_t facet_count,
const uint32_t i_facet_offset)
{ {
const uint32_t facet_count = wparams->facet_count;
const uint32_t i_facet_offset = wparams->i_facet_offset;
const gmio_stl_triangle_func_fix_endian_t func_fix_endian =
wparams->func_fix_endian;
const gmio_stl_mesh_func_get_triangle_t func_get_triangle = const gmio_stl_mesh_func_get_triangle_t func_get_triangle =
mesh->func_get_triangle; mesh->func_get_triangle;
const void* cookie = mesh->cookie; const void* cookie = mesh->cookie;
struct gmio_stl_triangle triangle; struct gmio_stl_triangle triangle;
uint32_t mblock_offset = 0; uint32_t i_facet;
uint32_t i_facet = 0;
triangle.attribute_byte_count = 0; triangle.attribute_byte_count = 0;
for (i_facet = 0; i_facet < facet_count; ++i_facet) { for (i_facet = 0; i_facet < facet_count; ++i_facet) {
func_get_triangle(cookie, i_facet_offset + i_facet, &triangle); func_get_triangle(cookie, i_facet_offset + i_facet, &triangle);
encode_facet(&triangle, buffer);
buffer += GMIO_STLB_TRIANGLE_RAWSIZE;
}
}
if (func_fix_endian != NULL) static void gmio_stlb_encode_facets_byteswap(
func_fix_endian(&triangle); const struct gmio_stl_mesh* mesh,
uint8_t* buffer,
const uint32_t facet_count,
const uint32_t i_facet_offset)
{
const gmio_stl_mesh_func_get_triangle_t func_get_triangle =
mesh->func_get_triangle;
const void* cookie = mesh->cookie;
struct gmio_stl_triangle triangle;
uint32_t i_facet;
write_triangle_memcpy(&triangle, mblock + mblock_offset); triangle.attribute_byte_count = 0;
mblock_offset += GMIO_STLB_TRIANGLE_RAWSIZE; for (i_facet = 0; i_facet < facet_count; ++i_facet) {
} /* end for */ func_get_triangle(cookie, i_facet_offset + i_facet, &triangle);
gmio_stl_triangle_bswap(&triangle);
encode_facet(&triangle, buffer);
buffer += GMIO_STLB_TRIANGLE_RAWSIZE;
}
} }
int gmio_stlb_write( int gmio_stlb_write(
struct gmio_stl_write_args* args, enum gmio_endianness byte_order) struct gmio_stl_write_args* args, enum gmio_endianness byte_order)
{ {
/* Constants */ /* Constants */
const uint32_t facet_count = const uint32_t facet_count = args->mesh.triangle_count;
args->mesh.triangle_count; const func_gmio_stlb_encode_facets_t func_encode_facets =
const gmio_bool_t write_triangles_only = byte_order != GMIO_ENDIANNESS_HOST ?
args->options.stl_write_triangles_only; gmio_stlb_encode_facets_byteswap :
gmio_stlb_encode_facets;
/* Variables */ /* Variables */
struct gmio_rwargs* core_args = &args->core; struct gmio_rwargs* core_args = &args->core;
uint32_t i_facet = 0; /* Facet counter */
uint32_t write_facet_count =
gmio_size_to_uint32(
core_args->stream_memblock.size / GMIO_STLB_TRIANGLE_RAWSIZE);
void* mblock_ptr = core_args->stream_memblock.ptr; void* mblock_ptr = core_args->stream_memblock.ptr;
struct gmio_stlb_readwrite_helper wparams = {0};
uint32_t i_facet = 0;
int error = GMIO_ERROR_OK; int error = GMIO_ERROR_OK;
/* Check validity of input parameters */ /* Check validity of input parameters */
@ -87,15 +110,7 @@ int gmio_stlb_write(
return error; return error;
} }
/* Initialize wparams */ if (!args->options.stl_write_triangles_only) {
if (byte_order != GMIO_ENDIANNESS_HOST)
wparams.func_fix_endian = gmio_stl_triangle_bswap;
/* Note: trsf != NULL certified by gmio_stlb_check_params() */
/* coverity[var_deref_op : FALSE] */
wparams.facet_count = gmio_size_to_uint32(
core_args->stream_memblock.size / GMIO_STLB_TRIANGLE_RAWSIZE);
if (!write_triangles_only) {
error = gmio_stlb_write_header( error = gmio_stlb_write_header(
&core_args->stream, &core_args->stream,
byte_order, byte_order,
@ -108,24 +123,22 @@ int gmio_stlb_write(
/* Write triangles */ /* Write triangles */
for (i_facet = 0; for (i_facet = 0;
i_facet < facet_count && gmio_no_error(error); i_facet < facet_count && gmio_no_error(error);
i_facet += wparams.facet_count) i_facet += write_facet_count)
{ {
gmio_rwargs_handle_progress(core_args, i_facet, facet_count); gmio_rwargs_handle_progress(core_args, i_facet, facet_count);
/* Write to memory block */ /* Write to memory block */
wparams.facet_count = GMIO_MIN(wparams.facet_count, write_facet_count = GMIO_MIN(write_facet_count, facet_count - i_facet);
facet_count - wparams.i_facet_offset); func_encode_facets(
&args->mesh, mblock_ptr, write_facet_count, i_facet);
gmio_stlb_write_facets(&args->mesh, mblock_ptr, &wparams);
wparams.i_facet_offset += wparams.facet_count;
/* Write memory block to stream */ /* Write memory block to stream */
if (gmio_stream_write( if (gmio_stream_write(
&core_args->stream, &core_args->stream,
mblock_ptr, mblock_ptr,
GMIO_STLB_TRIANGLE_RAWSIZE, GMIO_STLB_TRIANGLE_RAWSIZE,
wparams.facet_count) write_facet_count)
!= wparams.facet_count) != write_facet_count)
{ {
error = GMIO_ERROR_STREAM; error = GMIO_ERROR_STREAM;
} }

91
src/gmio_stl/stlb_read.c
View File

@ -32,41 +32,59 @@
#include <string.h> #include <string.h>
GMIO_INLINE void read_triangle_memcpy( GMIO_INLINE void decode_facet(
const uint8_t* buffer, struct gmio_stl_triangle* triangle) const uint8_t* buffer, struct gmio_stl_triangle* triangle)
{ {
/* *triangle = *((struct gmio_stl_triangle*)(buffer)); */ /* *triangle = *((struct gmio_stl_triangle*)(buffer)); */
memcpy(triangle, buffer, GMIO_STLB_TRIANGLE_RAWSIZE); memcpy(triangle, buffer, GMIO_STLB_TRIANGLE_RAWSIZE);
} }
static void gmio_stlb_read_facets( typedef void (*func_gmio_stlb_decode_facets_t)(
struct gmio_stl_mesh_creator*,
const uint8_t*, /* buffer */
const uint32_t, /* facet_count */
const uint32_t); /* i_facet_offset */
static void gmio_stlb_decode_facets(
struct gmio_stl_mesh_creator* creator, struct gmio_stl_mesh_creator* creator,
const uint8_t* buffer, const uint8_t* buffer,
const struct gmio_stlb_readwrite_helper* rparams) const uint32_t facet_count,
const uint32_t i_facet_offset)
{ {
const uint32_t facet_count = rparams->facet_count;
const uint32_t i_facet_offset = rparams->i_facet_offset;
const gmio_stl_triangle_func_fix_endian_t func_fix_endian =
rparams->func_fix_endian;
/* coverity[var_deref_op : FALSE] */
const gmio_stl_mesh_creator_func_add_triangle_t func_add_triangle = const gmio_stl_mesh_creator_func_add_triangle_t func_add_triangle =
creator != NULL ? creator->func_add_triangle : NULL; creator->func_add_triangle;
void* cookie = creator->cookie; void* cookie = creator->cookie;
struct gmio_stl_triangle triangle;
uint32_t buffer_offset = 0;
uint32_t i_facet = 0;
if (func_add_triangle == NULL) if (func_add_triangle != NULL) {
return; struct gmio_stl_triangle triangle;
uint32_t i_facet;
for (i_facet = 0; i_facet < facet_count; ++i_facet) {
decode_facet(buffer, &triangle);
buffer += GMIO_STLB_TRIANGLE_RAWSIZE;
func_add_triangle(cookie, i_facet_offset + i_facet, &triangle);
}
}
}
for (i_facet = 0; i_facet < facet_count; ++i_facet) { static void gmio_stlb_decode_facets_byteswap(
read_triangle_memcpy(buffer + buffer_offset, &triangle); struct gmio_stl_mesh_creator* creator,
buffer_offset += GMIO_STLB_TRIANGLE_RAWSIZE; const uint8_t* buffer,
const uint32_t facet_count,
const uint32_t i_facet_offset)
{
const gmio_stl_mesh_creator_func_add_triangle_t func_add_triangle =
creator->func_add_triangle;
void* cookie = creator->cookie;
if (func_fix_endian != NULL) if (func_add_triangle != NULL) {
func_fix_endian(&triangle); struct gmio_stl_triangle triangle;
uint32_t i_facet;
func_add_triangle(cookie, i_facet_offset + i_facet, &triangle); for (i_facet = 0; i_facet < facet_count; ++i_facet) {
decode_facet(buffer, &triangle);
buffer += GMIO_STLB_TRIANGLE_RAWSIZE;
gmio_stl_triangle_bswap(&triangle);
func_add_triangle(cookie, i_facet_offset + i_facet, &triangle);
}
} }
} }
@ -79,11 +97,15 @@ int gmio_stlb_read(
struct gmio_rwargs* core_args = &args->core; struct gmio_rwargs* core_args = &args->core;
struct gmio_stl_mesh_creator* mesh_creator = &args->mesh_creator; struct gmio_stl_mesh_creator* mesh_creator = &args->mesh_creator;
void* mblock_ptr = core_args->stream_memblock.ptr; void* mblock_ptr = core_args->stream_memblock.ptr;
struct gmio_stlb_readwrite_helper rparams = {0};
struct gmio_stlb_header header; struct gmio_stlb_header header;
uint32_t i_facet = 0; /* Facet counter */
uint32_t total_facet_count = 0; /* Facet count, as declared in the stream */ uint32_t total_facet_count = 0; /* Facet count, as declared in the stream */
int error = GMIO_ERROR_OK; /* Helper to store function result error code */ int error = GMIO_ERROR_OK; /* Helper to store function result error code */
/* Constants */ /* Constants */
const func_gmio_stlb_decode_facets_t func_decode_facets =
byte_order != GMIO_ENDIANNESS_HOST ?
gmio_stlb_decode_facets_byteswap :
gmio_stlb_decode_facets;
const uint32_t max_facet_count_per_read = const uint32_t max_facet_count_per_read =
gmio_size_to_uint32( gmio_size_to_uint32(
args->core.stream_memblock.size / GMIO_STLB_TRIANGLE_RAWSIZE); args->core.stream_memblock.size / GMIO_STLB_TRIANGLE_RAWSIZE);
@ -92,10 +114,6 @@ int gmio_stlb_read(
if (!gmio_stlb_check_params(&error, core_args, byte_order)) if (!gmio_stlb_check_params(&error, core_args, byte_order))
goto label_end; goto label_end;
/* Initialize rparams */
if (byte_order != GMIO_ENDIANNESS_HOST)
rparams.func_fix_endian = gmio_stl_triangle_bswap;
/* Read header */ /* Read header */
if (gmio_stream_read(&core_args->stream, &header, GMIO_STLB_HEADER_SIZE, 1) if (gmio_stream_read(&core_args->stream, &header, GMIO_STLB_HEADER_SIZE, 1)
!= 1) != 1)
@ -121,38 +139,37 @@ int gmio_stlb_read(
mesh_creator, total_facet_count, &header); mesh_creator, total_facet_count, &header);
/* Read triangles */ /* Read triangles */
while (gmio_no_error(error) gmio_rwargs_handle_progress(core_args, 0, total_facet_count);
&& rparams.i_facet_offset < total_facet_count) while (gmio_no_error(error) && i_facet < total_facet_count) {
{ const uint32_t read_facet_count =
gmio_rwargs_handle_progress(
core_args, rparams.i_facet_offset, total_facet_count);
rparams.facet_count =
gmio_size_to_uint32( gmio_size_to_uint32(
gmio_stream_read( gmio_stream_read(
&core_args->stream, &core_args->stream,
mblock_ptr, mblock_ptr,
GMIO_STLB_TRIANGLE_RAWSIZE, GMIO_STLB_TRIANGLE_RAWSIZE,
max_facet_count_per_read)); max_facet_count_per_read));
if (gmio_stream_error(&core_args->stream) != 0) if (gmio_stream_error(&core_args->stream) != 0)
error = GMIO_ERROR_STREAM; error = GMIO_ERROR_STREAM;
else if (rparams.facet_count > 0) else if (read_facet_count > 0)
error = GMIO_ERROR_OK; error = GMIO_ERROR_OK;
else else
break; /* Exit if no facet to read */ break; /* Exit if no facet to read */
if (gmio_no_error(error)) { if (gmio_no_error(error)) {
gmio_stlb_read_facets(mesh_creator, mblock_ptr, &rparams); func_decode_facets(
rparams.i_facet_offset += rparams.facet_count; mesh_creator, mblock_ptr, read_facet_count, i_facet);
i_facet += read_facet_count;
if (gmio_rwargs_is_stop_requested(core_args)) if (gmio_rwargs_is_stop_requested(core_args))
error = GMIO_ERROR_TRANSFER_STOPPED; error = GMIO_ERROR_TRANSFER_STOPPED;
} }
gmio_rwargs_handle_progress(core_args, i_facet, total_facet_count);
} /* end while */ } /* end while */
if (gmio_no_error(error)) if (gmio_no_error(error))
gmio_stl_mesh_creator_end_solid(mesh_creator); gmio_stl_mesh_creator_end_solid(mesh_creator);
if (gmio_no_error(error) && rparams.i_facet_offset != total_facet_count) if (gmio_no_error(error) && i_facet != total_facet_count)
error = GMIO_STL_ERROR_FACET_COUNT; error = GMIO_STL_ERROR_FACET_COUNT;
label_end: label_end: