brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
c0a024f81d
mutter/cogl/cogl-boxed-value.c

370 lines
9.4 KiB
C
Raw Normal View History

cogl-program: Move the code for CoglBoxedValue to its own file The code for manipulating CoglBoxedValues is now separated from cogl-program.c into its own file. That way when we add support for setting uniform values on a CoglPipeline the code for storing the values can be shared. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-10-27 11:54:50 -04:00
/*
* Cogl
*
* An object oriented GL/GLES Abstraction/Utility Layer
*
* Copyright (C) 2011 Intel Corporation.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*
*
*/
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
#include <string.h>
#include "cogl-boxed-value.h"
#include "cogl-context-private.h"
Switch use of primitive glib types to c99 equivalents The coding style has for a long time said to avoid using redundant glib data types such as gint or gchar etc because we feel that they make the code look unnecessarily foreign to developers coming from outside of the Gnome developer community. Note: When we tried to find the historical rationale for the types we just found that they were apparently only added for consistent syntax highlighting which didn't seem that compelling. Up until now we have been continuing to use some of the platform specific type such as gint{8,16,32,64} and gsize but this patch switches us over to using the standard c99 equivalents instead so we can further ensure that our code looks familiar to the widest range of C developers who might potentially contribute to Cogl. So instead of using the gint{8,16,32,64} and guint{8,16,32,64} types this switches all Cogl code to instead use the int{8,16,32,64}_t and uint{8,16,32,64}_t c99 types instead. Instead of gsize we now use size_t For now we are not going to use the c99 _Bool type and instead we have introduced a new CoglBool type to use instead of gboolean. Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit 5967dad2400d32ca6319cef6cb572e81bf2c15f0)
2012-04-16 16:56:40 -04:00
CoglBool
cogl-program: Move the code for CoglBoxedValue to its own file The code for manipulating CoglBoxedValues is now separated from cogl-program.c into its own file. That way when we add support for setting uniform values on a CoglPipeline the code for storing the values can be shared. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-10-27 11:54:50 -04:00
_cogl_boxed_value_equal (const CoglBoxedValue *bva,
const CoglBoxedValue *bvb)
{
const void *pa, *pb;
if (bva->type != bvb->type)
return FALSE;
switch (bva->type)
{
case COGL_BOXED_NONE:
return TRUE;
case COGL_BOXED_INT:
if (bva->size != bvb->size || bva->count != bvb->count)
return FALSE;
if (bva->count == 1)
{
pa = bva->v.int_value;
pb = bvb->v.int_value;
}
else
{
pa = bva->v.int_array;
pb = bvb->v.int_array;
}
return !memcmp (pa, pb, sizeof (int) * bva->size * bva->count);
case COGL_BOXED_FLOAT:
if (bva->size != bvb->size || bva->count != bvb->count)
return FALSE;
if (bva->count == 1)
{
pa = bva->v.float_value;
pb = bvb->v.float_value;
}
else
{
pa = bva->v.float_array;
pb = bvb->v.float_array;
}
return !memcmp (pa, pb, sizeof (float) * bva->size * bva->count);
case COGL_BOXED_MATRIX:
if (bva->size != bvb->size ||
Don't use the transpose argument of glUniformMatrix* According to the GLES1/2 spec, the transpose argument of glUniformMatrix* should always be FALSE. Cogl directly exposes the transposedness of the uniform value in cogl_pipeline_set_uniform_matrix and we were previously passing this value on to GL. This patch makes it instead just always transpose the matrix in Cogl itself when copying the value to the CoglBoxedValue. It doesn't seem like there could be much advantage to letting GL transpose the uniform value and at least Mesa just does a very similar loop to handle the transpose. Mesa has started being more pedantic about this which was making test_pipeline_uniforms fail. http://cgit.freedesktop.org/mesa/mesa/commit/?id=60e8a4944081b42127b3 Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit f42ee670ff663d03073d6b1038b21a0aa1b3ec2b)
2012-06-20 09:23:50 -04:00
bva->count != bvb->count)
cogl-program: Move the code for CoglBoxedValue to its own file The code for manipulating CoglBoxedValues is now separated from cogl-program.c into its own file. That way when we add support for setting uniform values on a CoglPipeline the code for storing the values can be shared. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-10-27 11:54:50 -04:00
return FALSE;
if (bva->count == 1)
{
pa = bva->v.matrix;
pb = bvb->v.matrix;
}
else
{
pa = bva->v.array;
pb = bvb->v.array;
}
return !memcmp (pa, pb,
sizeof (float) * bva->size * bva->size * bva->count);
}
g_warn_if_reached ();
return FALSE;
}
Don't use the transpose argument of glUniformMatrix* According to the GLES1/2 spec, the transpose argument of glUniformMatrix* should always be FALSE. Cogl directly exposes the transposedness of the uniform value in cogl_pipeline_set_uniform_matrix and we were previously passing this value on to GL. This patch makes it instead just always transpose the matrix in Cogl itself when copying the value to the CoglBoxedValue. It doesn't seem like there could be much advantage to letting GL transpose the uniform value and at least Mesa just does a very similar loop to handle the transpose. Mesa has started being more pedantic about this which was making test_pipeline_uniforms fail. http://cgit.freedesktop.org/mesa/mesa/commit/?id=60e8a4944081b42127b3 Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit f42ee670ff663d03073d6b1038b21a0aa1b3ec2b)
2012-06-20 09:23:50 -04:00
static void
_cogl_boxed_value_tranpose (float *dst,
int size,
const float *src)
{
int y, x;
/* If the value is transposed we'll just transpose it now as it
* is copied into the boxed value instead of passing TRUE to
* glUniformMatrix because that is not supported on GLES and it
* doesn't seem like the GL driver would be able to do anything
* much smarter than this anyway */
for (y = 0; y < size; y++)
for (x = 0; x < size; x++)
*(dst++) = src[y + x * size];
}
cogl-program: Move the code for CoglBoxedValue to its own file The code for manipulating CoglBoxedValues is now separated from cogl-program.c into its own file. That way when we add support for setting uniform values on a CoglPipeline the code for storing the values can be shared. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-10-27 11:54:50 -04:00
static void
_cogl_boxed_value_set_x (CoglBoxedValue *bv,
int size,
int count,
CoglBoxedType type,
Switch use of primitive glib types to c99 equivalents The coding style has for a long time said to avoid using redundant glib data types such as gint or gchar etc because we feel that they make the code look unnecessarily foreign to developers coming from outside of the Gnome developer community. Note: When we tried to find the historical rationale for the types we just found that they were apparently only added for consistent syntax highlighting which didn't seem that compelling. Up until now we have been continuing to use some of the platform specific type such as gint{8,16,32,64} and gsize but this patch switches us over to using the standard c99 equivalents instead so we can further ensure that our code looks familiar to the widest range of C developers who might potentially contribute to Cogl. So instead of using the gint{8,16,32,64} and guint{8,16,32,64} types this switches all Cogl code to instead use the int{8,16,32,64}_t and uint{8,16,32,64}_t c99 types instead. Instead of gsize we now use size_t For now we are not going to use the c99 _Bool type and instead we have introduced a new CoglBool type to use instead of gboolean. Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit 5967dad2400d32ca6319cef6cb572e81bf2c15f0)
2012-04-16 16:56:40 -04:00
size_t value_size,
const void *value,
CoglBool transpose)
cogl-program: Move the code for CoglBoxedValue to its own file The code for manipulating CoglBoxedValues is now separated from cogl-program.c into its own file. That way when we add support for setting uniform values on a CoglPipeline the code for storing the values can be shared. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-10-27 11:54:50 -04:00
{
if (count == 1)
{
if (bv->count > 1)
g_free (bv->v.array);
Don't use the transpose argument of glUniformMatrix* According to the GLES1/2 spec, the transpose argument of glUniformMatrix* should always be FALSE. Cogl directly exposes the transposedness of the uniform value in cogl_pipeline_set_uniform_matrix and we were previously passing this value on to GL. This patch makes it instead just always transpose the matrix in Cogl itself when copying the value to the CoglBoxedValue. It doesn't seem like there could be much advantage to letting GL transpose the uniform value and at least Mesa just does a very similar loop to handle the transpose. Mesa has started being more pedantic about this which was making test_pipeline_uniforms fail. http://cgit.freedesktop.org/mesa/mesa/commit/?id=60e8a4944081b42127b3 Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit f42ee670ff663d03073d6b1038b21a0aa1b3ec2b)
2012-06-20 09:23:50 -04:00
if (transpose)
_cogl_boxed_value_tranpose (bv->v.float_value,
size,
value);
else
memcpy (bv->v.float_value, value, value_size);
cogl-program: Move the code for CoglBoxedValue to its own file The code for manipulating CoglBoxedValues is now separated from cogl-program.c into its own file. That way when we add support for setting uniform values on a CoglPipeline the code for storing the values can be shared. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-10-27 11:54:50 -04:00
}
else
{
if (bv->count > 1)
{
if (bv->count != count ||
bv->size != size ||
bv->type != type)
{
g_free (bv->v.array);
bv->v.array = g_malloc (count * value_size);
}
}
else
bv->v.array = g_malloc (count * value_size);
Don't use the transpose argument of glUniformMatrix* According to the GLES1/2 spec, the transpose argument of glUniformMatrix* should always be FALSE. Cogl directly exposes the transposedness of the uniform value in cogl_pipeline_set_uniform_matrix and we were previously passing this value on to GL. This patch makes it instead just always transpose the matrix in Cogl itself when copying the value to the CoglBoxedValue. It doesn't seem like there could be much advantage to letting GL transpose the uniform value and at least Mesa just does a very similar loop to handle the transpose. Mesa has started being more pedantic about this which was making test_pipeline_uniforms fail. http://cgit.freedesktop.org/mesa/mesa/commit/?id=60e8a4944081b42127b3 Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit f42ee670ff663d03073d6b1038b21a0aa1b3ec2b)
2012-06-20 09:23:50 -04:00
if (transpose)
{
int value_num;
for (value_num = 0; value_num < count; value_num++)
_cogl_boxed_value_tranpose (bv->v.float_array +
value_num * size * size,
size,
(const float *) value +
value_num * size * size);
}
else
memcpy (bv->v.array, value, count * value_size);
cogl-program: Move the code for CoglBoxedValue to its own file The code for manipulating CoglBoxedValues is now separated from cogl-program.c into its own file. That way when we add support for setting uniform values on a CoglPipeline the code for storing the values can be shared. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-10-27 11:54:50 -04:00
}
bv->type = type;
bv->size = size;
bv->count = count;
}
void
_cogl_boxed_value_set_1f (CoglBoxedValue *bv,
float value)
{
_cogl_boxed_value_set_x (bv,
1, 1, COGL_BOXED_FLOAT,
sizeof (float), &value, FALSE);
}
void
_cogl_boxed_value_set_1i (CoglBoxedValue *bv,
int value)
{
_cogl_boxed_value_set_x (bv,
1, 1, COGL_BOXED_INT,
sizeof (int), &value, FALSE);
}
void
_cogl_boxed_value_set_float (CoglBoxedValue *bv,
int n_components,
int count,
const float *value)
{
_cogl_boxed_value_set_x (bv,
n_components, count,
COGL_BOXED_FLOAT,
sizeof (float) * n_components, value, FALSE);
}
void
_cogl_boxed_value_set_int (CoglBoxedValue *bv,
int n_components,
int count,
const int *value)
{
_cogl_boxed_value_set_x (bv,
n_components, count,
COGL_BOXED_INT,
sizeof (int) * n_components, value, FALSE);
}
void
_cogl_boxed_value_set_matrix (CoglBoxedValue *bv,
int dimensions,
int count,
Switch use of primitive glib types to c99 equivalents The coding style has for a long time said to avoid using redundant glib data types such as gint or gchar etc because we feel that they make the code look unnecessarily foreign to developers coming from outside of the Gnome developer community. Note: When we tried to find the historical rationale for the types we just found that they were apparently only added for consistent syntax highlighting which didn't seem that compelling. Up until now we have been continuing to use some of the platform specific type such as gint{8,16,32,64} and gsize but this patch switches us over to using the standard c99 equivalents instead so we can further ensure that our code looks familiar to the widest range of C developers who might potentially contribute to Cogl. So instead of using the gint{8,16,32,64} and guint{8,16,32,64} types this switches all Cogl code to instead use the int{8,16,32,64}_t and uint{8,16,32,64}_t c99 types instead. Instead of gsize we now use size_t For now we are not going to use the c99 _Bool type and instead we have introduced a new CoglBool type to use instead of gboolean. Reviewed-by: Neil Roberts <neil@linux.intel.com> (cherry picked from commit 5967dad2400d32ca6319cef6cb572e81bf2c15f0)
2012-04-16 16:56:40 -04:00
CoglBool transpose,
cogl-program: Move the code for CoglBoxedValue to its own file The code for manipulating CoglBoxedValues is now separated from cogl-program.c into its own file. That way when we add support for setting uniform values on a CoglPipeline the code for storing the values can be shared. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-10-27 11:54:50 -04:00
const float *value)
{
_cogl_boxed_value_set_x (bv,
dimensions, count,
COGL_BOXED_MATRIX,
sizeof (float) * dimensions * dimensions,
value,
transpose);
}
cogl-boxed-value: Add _cogl_boxed_value_copy This adds a function to copy one boxed value to another. It is assumed that the destination boxed value is totally initialised (so it won't try to free any memory in it). Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-04 12:21:28 -04:00
void
_cogl_boxed_value_copy (CoglBoxedValue *dst,
const CoglBoxedValue *src)
{
*dst = *src;
if (src->count > 1)
{
switch (src->type)
{
case COGL_BOXED_NONE:
break;
case COGL_BOXED_INT:
dst->v.int_array = g_memdup (src->v.int_array,
src->size * src->count * sizeof (int));
break;
case COGL_BOXED_FLOAT:
dst->v.float_array = g_memdup (src->v.float_array,
src->size *
src->count *
sizeof (float));
break;
case COGL_BOXED_MATRIX:
dst->v.float_array = g_memdup (src->v.float_array,
src->size * src->size *
src->count * sizeof (float));
break;
}
}
}
cogl-program: Move the code for CoglBoxedValue to its own file The code for manipulating CoglBoxedValues is now separated from cogl-program.c into its own file. That way when we add support for setting uniform values on a CoglPipeline the code for storing the values can be shared. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-10-27 11:54:50 -04:00
void
_cogl_boxed_value_destroy (CoglBoxedValue *bv)
{
if (bv->count > 1)
g_free (bv->v.array);
}
void
_cogl_boxed_value_set_uniform (CoglContext *ctx,
GLint location,
const CoglBoxedValue *value)
{
switch (value->type)
{
case COGL_BOXED_NONE:
break;
case COGL_BOXED_INT:
{
const int *ptr;
if (value->count == 1)
ptr = value->v.int_value;
else
ptr = value->v.int_array;
switch (value->size)
{
cogl-boxed-value: Wrap the GL calls in the GE() macro This wraps all of the calls to glUniform* in the GE() macro so that it will detect GL errors in the right place. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-03 12:42:06 -04:00
case 1:
GE( ctx, glUniform1iv (location, value->count, ptr) );
break;
case 2:
GE( ctx, glUniform2iv (location, value->count, ptr) );
break;
case 3:
GE( ctx, glUniform3iv (location, value->count, ptr) );
break;
case 4:
GE( ctx, glUniform4iv (location, value->count, ptr) );
break;
cogl-program: Move the code for CoglBoxedValue to its own file The code for manipulating CoglBoxedValues is now separated from cogl-program.c into its own file. That way when we add support for setting uniform values on a CoglPipeline the code for storing the values can be shared. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-10-27 11:54:50 -04:00
}
}
break;
case COGL_BOXED_FLOAT:
{
const float *ptr;
if (value->count == 1)
ptr = value->v.float_value;
else
ptr = value->v.float_array;
switch (value->size)
{
cogl-boxed-value: Wrap the GL calls in the GE() macro This wraps all of the calls to glUniform* in the GE() macro so that it will detect GL errors in the right place. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-03 12:42:06 -04:00
case 1:
GE( ctx, glUniform1fv (location, value->count, ptr) );
break;
case 2:
GE( ctx, glUniform2fv (location, value->count, ptr) );
break;
case 3:
GE( ctx, glUniform3fv (location, value->count, ptr) );
break;
case 4:
GE( ctx, glUniform4fv (location, value->count, ptr) );
break;
cogl-program: Move the code for CoglBoxedValue to its own file The code for manipulating CoglBoxedValues is now separated from cogl-program.c into its own file. That way when we add support for setting uniform values on a CoglPipeline the code for storing the values can be shared. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-10-27 11:54:50 -04:00
}
}
break;
case COGL_BOXED_MATRIX:
{
const float *ptr;
if (value->count == 1)
ptr = value->v.matrix;
else
ptr = value->v.float_array;
switch (value->size)
{
case 2:
cogl-boxed-value: Wrap the GL calls in the GE() macro This wraps all of the calls to glUniform* in the GE() macro so that it will detect GL errors in the right place. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-03 12:42:06 -04:00
GE( ctx, glUniformMatrix2fv (location, value->count,
Don't use the transpose argument of glUniformMatrix* According to the GLES1/2 spec, the transpose argument of glUniformMatrix* should always be FALSE. Cogl directly exposes the transposedness of the uniform value in cogl_pipeline_set_uniform_matrix and we were previously passing this value on to GL. This patch makes it instead just always transpose the matrix in Cogl itself when copying the value to the CoglBoxedValue. It doesn't seem like there could be much advantage to letting GL transpose the uniform value and at least Mesa just does a very similar loop to handle the transpose. Mesa has started being more pedantic about this which was making test_pipeline_uniforms fail. http://cgit.freedesktop.org/mesa/mesa/commit/?id=60e8a4944081b42127b3 Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit f42ee670ff663d03073d6b1038b21a0aa1b3ec2b)
2012-06-20 09:23:50 -04:00
FALSE, ptr) );
cogl-program: Move the code for CoglBoxedValue to its own file The code for manipulating CoglBoxedValues is now separated from cogl-program.c into its own file. That way when we add support for setting uniform values on a CoglPipeline the code for storing the values can be shared. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-10-27 11:54:50 -04:00
break;
case 3:
cogl-boxed-value: Wrap the GL calls in the GE() macro This wraps all of the calls to glUniform* in the GE() macro so that it will detect GL errors in the right place. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-03 12:42:06 -04:00
GE( ctx, glUniformMatrix3fv (location, value->count,
Don't use the transpose argument of glUniformMatrix* According to the GLES1/2 spec, the transpose argument of glUniformMatrix* should always be FALSE. Cogl directly exposes the transposedness of the uniform value in cogl_pipeline_set_uniform_matrix and we were previously passing this value on to GL. This patch makes it instead just always transpose the matrix in Cogl itself when copying the value to the CoglBoxedValue. It doesn't seem like there could be much advantage to letting GL transpose the uniform value and at least Mesa just does a very similar loop to handle the transpose. Mesa has started being more pedantic about this which was making test_pipeline_uniforms fail. http://cgit.freedesktop.org/mesa/mesa/commit/?id=60e8a4944081b42127b3 Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit f42ee670ff663d03073d6b1038b21a0aa1b3ec2b)
2012-06-20 09:23:50 -04:00
FALSE, ptr) );
cogl-program: Move the code for CoglBoxedValue to its own file The code for manipulating CoglBoxedValues is now separated from cogl-program.c into its own file. That way when we add support for setting uniform values on a CoglPipeline the code for storing the values can be shared. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-10-27 11:54:50 -04:00
break;
case 4:
cogl-boxed-value: Wrap the GL calls in the GE() macro This wraps all of the calls to glUniform* in the GE() macro so that it will detect GL errors in the right place. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-11-03 12:42:06 -04:00
GE( ctx, glUniformMatrix4fv (location, value->count,
Don't use the transpose argument of glUniformMatrix* According to the GLES1/2 spec, the transpose argument of glUniformMatrix* should always be FALSE. Cogl directly exposes the transposedness of the uniform value in cogl_pipeline_set_uniform_matrix and we were previously passing this value on to GL. This patch makes it instead just always transpose the matrix in Cogl itself when copying the value to the CoglBoxedValue. It doesn't seem like there could be much advantage to letting GL transpose the uniform value and at least Mesa just does a very similar loop to handle the transpose. Mesa has started being more pedantic about this which was making test_pipeline_uniforms fail. http://cgit.freedesktop.org/mesa/mesa/commit/?id=60e8a4944081b42127b3 Reviewed-by: Robert Bragg <robert@linux.intel.com> (cherry picked from commit f42ee670ff663d03073d6b1038b21a0aa1b3ec2b)
2012-06-20 09:23:50 -04:00
FALSE, ptr) );
cogl-program: Move the code for CoglBoxedValue to its own file The code for manipulating CoglBoxedValues is now separated from cogl-program.c into its own file. That way when we add support for setting uniform values on a CoglPipeline the code for storing the values can be shared. Reviewed-by: Robert Bragg <robert@linux.intel.com>
2011-10-27 11:54:50 -04:00
break;
}
}
break;
}
}
Reference in New Issue Copy Permalink