[Mesa-dev] [PATCH 1/6] mesa/main: fix indentation in _mesa_get_uniform()
Nicolai Hähnle
nhaehnle at gmail.com
Fri May 12 08:31:53 UTC 2017
On 11.05.2017 13:10, Iago Toral Quiroga wrote:
> ---
> src/mesa/main/uniform_query.cpp | 194 ++++++++++++++++++++--------------------
> 1 file changed, 99 insertions(+), 95 deletions(-)
>
> diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp
> index 0e02a76..bd5b4c4 100644
> --- a/src/mesa/main/uniform_query.cpp
> +++ b/src/mesa/main/uniform_query.cpp
> @@ -333,7 +333,7 @@ _mesa_get_uniform(struct gl_context *ctx, GLuint program, GLint location,
> * account for the size of the user's buffer.
> */
> const union gl_constant_value *const src =
> - &uni->storage[offset * elements * dmul];
> + &uni->storage[offset * elements * dmul];
>
> assert(returnType == GLSL_TYPE_FLOAT || returnType == GLSL_TYPE_INT ||
> returnType == GLSL_TYPE_UINT || returnType == GLSL_TYPE_DOUBLE ||
> @@ -342,10 +342,10 @@ _mesa_get_uniform(struct gl_context *ctx, GLuint program, GLint location,
> /* doubles have a different size than the other 3 types */
> unsigned bytes = sizeof(src[0]) * elements * rmul;
> if (bufSize < 0 || bytes > (unsigned) bufSize) {
> - _mesa_error( ctx, GL_INVALID_OPERATION,
> - "glGetnUniform*vARB(out of bounds: bufSize is %d,"
> - " but %u bytes are required)", bufSize, bytes );
> - return;
> + _mesa_error(ctx, GL_INVALID_OPERATION,
> + "glGetnUniform*vARB(out of bounds: bufSize is %d,"
> + " but %u bytes are required)", bufSize, bytes);
> + return;
> }
>
> /* If the return type and the uniform's native type are "compatible,"
> @@ -353,89 +353,90 @@ _mesa_get_uniform(struct gl_context *ctx, GLuint program, GLint location,
> * slower convert-and-copy process.
> */
> if (returnType == uni->type->base_type
> - || ((returnType == GLSL_TYPE_INT
> - || returnType == GLSL_TYPE_UINT)
> - &&
> - (uni->type->base_type == GLSL_TYPE_INT
> - || uni->type->base_type == GLSL_TYPE_UINT
> + || ((returnType == GLSL_TYPE_INT
> + || returnType == GLSL_TYPE_UINT)
> + &&
> + (uni->type->base_type == GLSL_TYPE_INT
> + || uni->type->base_type == GLSL_TYPE_UINT
> || uni->type->is_sampler()
> || uni->type->is_image()))
> - || ((returnType == GLSL_TYPE_UINT64 ||
> - returnType == GLSL_TYPE_INT64 ) &&
> - (uni->type->base_type == GLSL_TYPE_UINT64 ||
> - uni->type->base_type == GLSL_TYPE_INT64))) {
While we're fixing indentation, could we perhaps change the style in
general to putting the "dangling" operator at the end of the line, as is
done in other parts of the code? I.e. like so:
if (returnType == uni->type->base_type ||
((returnType == GLSL_TYPE_INT ||
returnType == GLSL_TYPE_UINT) &&
(uni->type->base_type == GLSL_TYPE_INT ||
uni->type->base_type == GLSL_TYPE_UINT ||
uni->type->is_sampler() ||
uni->type->is_image())) ||
((returnType == GLSL_TYPE_UINT64 ||
returnType == GLSL_TYPE_INT64 ) &&
(uni->type->base_type == GLSL_TYPE_UINT64 ||
uni->type->base_type == GLSL_TYPE_INT64))) {
At least, that's color of bikeshed I prefer...
Cheers,
Nicolai
> - memcpy(paramsOut, src, bytes);
> + || ((returnType == GLSL_TYPE_UINT64 ||
> + returnType == GLSL_TYPE_INT64) &&
> + (uni->type->base_type == GLSL_TYPE_UINT64 ||
> + uni->type->base_type == GLSL_TYPE_INT64))) {
> + memcpy(paramsOut, src, bytes);
> } else {
> - union gl_constant_value *const dst =
> - (union gl_constant_value *) paramsOut;
> - /* This code could be optimized by putting the loop inside the switch
> - * statements. However, this is not expected to be
> - * performance-critical code.
> - */
> - for (unsigned i = 0; i < elements; i++) {
> - int sidx = i * dmul;
> - int didx = i * rmul;
> -
> - switch (returnType) {
> - case GLSL_TYPE_FLOAT:
> - switch (uni->type->base_type) {
> - case GLSL_TYPE_UINT:
> - dst[didx].f = (float) src[sidx].u;
> - break;
> - case GLSL_TYPE_INT:
> - case GLSL_TYPE_SAMPLER:
> + union gl_constant_value *const dst =
> + (union gl_constant_value *) paramsOut;
> + /* This code could be optimized by putting the loop inside the switch
> + * statements. However, this is not expected to be
> + * performance-critical code.
> + */
> + for (unsigned i = 0; i < elements; i++) {
> + int sidx = i * dmul;
> + int didx = i * rmul;
> +
> + switch (returnType) {
> + case GLSL_TYPE_FLOAT:
> + switch (uni->type->base_type) {
> + case GLSL_TYPE_UINT:
> + dst[didx].f = (float) src[sidx].u;
> + break;
> + case GLSL_TYPE_INT:
> + case GLSL_TYPE_SAMPLER:
> case GLSL_TYPE_IMAGE:
> - dst[didx].f = (float) src[sidx].i;
> - break;
> - case GLSL_TYPE_BOOL:
> - dst[didx].f = src[sidx].i ? 1.0f : 0.0f;
> - break;
> + dst[didx].f = (float) src[sidx].i;
> + break;
> + case GLSL_TYPE_BOOL:
> + dst[didx].f = src[sidx].i ? 1.0f : 0.0f;
> + break;
> case GLSL_TYPE_DOUBLE: {
> double tmp;
> memcpy(&tmp, &src[sidx].f, sizeof(tmp));
> dst[didx].f = tmp;
> - break;
> + break;
> }
> case GLSL_TYPE_UINT64: {
> uint64_t tmp;
> memcpy(&tmp, &src[sidx].u, sizeof(tmp));
> dst[didx].f = tmp;
> break;
> - }
> + }
> case GLSL_TYPE_INT64: {
> uint64_t tmp;
> memcpy(&tmp, &src[sidx].i, sizeof(tmp));
> dst[didx].f = tmp;
> break;
> }
> - default:
> - assert(!"Should not get here.");
> - break;
> - }
> - break;
> - case GLSL_TYPE_DOUBLE:
> - switch (uni->type->base_type) {
> + default:
> + assert(!"Should not get here.");
> + break;
> + }
> + break;
> +
> + case GLSL_TYPE_DOUBLE:
> + switch (uni->type->base_type) {
> case GLSL_TYPE_UINT: {
> double tmp = src[sidx].u;
> memcpy(&dst[didx].f, &tmp, sizeof(tmp));
> - break;
> + break;
> }
> - case GLSL_TYPE_INT:
> - case GLSL_TYPE_SAMPLER:
> + case GLSL_TYPE_INT:
> + case GLSL_TYPE_SAMPLER:
> case GLSL_TYPE_IMAGE: {
> double tmp = src[sidx].i;
> memcpy(&dst[didx].f, &tmp, sizeof(tmp));
> - break;
> + break;
> }
> case GLSL_TYPE_BOOL: {
> double tmp = src[sidx].i ? 1.0 : 0.0;
> memcpy(&dst[didx].f, &tmp, sizeof(tmp));
> - break;
> + break;
> }
> case GLSL_TYPE_FLOAT: {
> double tmp = src[sidx].f;
> memcpy(&dst[didx].f, &tmp, sizeof(tmp));
> - break;
> + break;
> }
> case GLSL_TYPE_UINT64: {
> uint64_t tmpu;
> @@ -453,42 +454,43 @@ _mesa_get_uniform(struct gl_context *ctx, GLuint program, GLint location,
> memcpy(&dst[didx].f, &tmp, sizeof(tmp));
> break;
> }
> - default:
> - assert(!"Should not get here.");
> - break;
> - }
> - break;
> - case GLSL_TYPE_INT:
> - case GLSL_TYPE_UINT:
> - switch (uni->type->base_type) {
> - case GLSL_TYPE_FLOAT:
> - /* While the GL 3.2 core spec doesn't explicitly
> - * state how conversion of float uniforms to integer
> - * values works, in section 6.2 "State Tables" on
> - * page 267 it says:
> - *
> - * "Unless otherwise specified, when floating
> - * point state is returned as integer values or
> - * integer state is returned as floating-point
> - * values it is converted in the fashion
> - * described in section 6.1.2"
> - *
> - * That section, on page 248, says:
> - *
> - * "If GetIntegerv or GetInteger64v are called,
> - * a floating-point value is rounded to the
> - * nearest integer..."
> - */
> - dst[didx].i = IROUND(src[sidx].f);
> - break;
> - case GLSL_TYPE_BOOL:
> - dst[didx].i = src[sidx].i ? 1 : 0;
> - break;
> + default:
> + assert(!"Should not get here.");
> + break;
> + }
> + break;
> +
> + case GLSL_TYPE_INT:
> + case GLSL_TYPE_UINT:
> + switch (uni->type->base_type) {
> + case GLSL_TYPE_FLOAT:
> + /* While the GL 3.2 core spec doesn't explicitly
> + * state how conversion of float uniforms to integer
> + * values works, in section 6.2 "State Tables" on
> + * page 267 it says:
> + *
> + * "Unless otherwise specified, when floating
> + * point state is returned as integer values or
> + * integer state is returned as floating-point
> + * values it is converted in the fashion
> + * described in section 6.1.2"
> + *
> + * That section, on page 248, says:
> + *
> + * "If GetIntegerv or GetInteger64v are called,
> + * a floating-point value is rounded to the
> + * nearest integer..."
> + */
> + dst[didx].i = IROUND(src[sidx].f);
> + break;
> + case GLSL_TYPE_BOOL:
> + dst[didx].i = src[sidx].i ? 1 : 0;
> + break;
> case GLSL_TYPE_DOUBLE: {
> double tmp;
> memcpy(&tmp, &src[sidx].f, sizeof(tmp));
> dst[didx].i = IROUNDD(tmp);
> - break;
> + break;
> }
> case GLSL_TYPE_UINT64: {
> uint64_t tmp;
> @@ -502,11 +504,12 @@ _mesa_get_uniform(struct gl_context *ctx, GLuint program, GLint location,
> dst[didx].i = tmp;
> break;
> }
> - default:
> - assert(!"Should not get here.");
> - break;
> - }
> - break;
> + default:
> + assert(!"Should not get here.");
> + break;
> + }
> + break;
> +
> case GLSL_TYPE_INT64:
> case GLSL_TYPE_UINT64:
> switch (uni->type->base_type) {
> @@ -537,11 +540,12 @@ _mesa_get_uniform(struct gl_context *ctx, GLuint program, GLint location,
> break;
> }
> break;
> - default:
> - assert(!"Should not get here.");
> - break;
> - }
> - }
> +
> + default:
> + assert(!"Should not get here.");
> + break;
> + }
> + }
> }
> }
> }
>
--
Lerne, wie die Welt wirklich ist,
Aber vergiss niemals, wie sie sein sollte.
More information about the mesa-dev
mailing list