summaryrefslogtreecommitdiff
path: root/cogl/cogl-context.c
diff options
context:
space:
mode:
authorNeil Roberts <neil@linux.intel.com>2011-11-03 17:20:43 +0000
committerNeil Roberts <neil@linux.intel.com>2011-11-16 16:32:11 +0000
commit4553ca0695a08a08a32925d3621d4269b6c459c7 (patch)
tree1ae861c7b16eaf3a4cf797fad76ab183b8d588a1 /cogl/cogl-context.c
parent4e760d51f108dfcd2ca8033799d441edfb82f041 (diff)
downloadcogl-4553ca0695a08a08a32925d3621d4269b6c459c7.tar.gz
cogl-pipeline: Add support for setting uniform values
This adds the following new public experimental functions to set uniform values on a CoglPipeline: void cogl_pipeline_set_uniform_1f (CoglPipeline *pipeline, int uniform_location, float value); void cogl_pipeline_set_uniform_1i (CoglPipeline *pipeline, int uniform_location, int value); void cogl_pipeline_set_uniform_float (CoglPipeline *pipeline, int uniform_location, int n_components, int count, const float *value); void cogl_pipeline_set_uniform_int (CoglPipeline *pipeline, int uniform_location, int n_components, int count, const int *value); void cogl_pipeline_set_uniform_matrix (CoglPipeline *pipeline, int uniform_location, int dimensions, int count, gboolean transpose, const float *value); These are similar to the old functions used to set uniforms on a CoglProgram. To get a value to pass in as the uniform_location there is also: int cogl_pipeline_get_uniform_location (CoglPipeline *pipeline, const char *uniform_name); Conceptually the uniform locations are tied to the pipeline so that whenever setting a value for a new pipeline the application is expected to call this function. However in practice the uniform locations are global to the CoglContext. The names are stored in a linked list where the position in the list is the uniform location. The global indices are used so that each pipeline can store a mask of which uniforms it overrides. That way it is quicker to detect which uniforms are different from the last pipeline that used the same CoglProgramState so it can avoid flushing uniforms that haven't changed. Currently the values are not actually compared which means that it will only avoid flushing a uniform if there is a common ancestor that sets the value (or if the same pipeline is being flushed again - in which case the pipeline and its common ancestor are the same thing). The uniform values are stored in the big state of the pipeline as a sparse linked list. A bitmask stores which values have been overridden and only overridden values are stored in the linked list. Reviewed-by: Robert Bragg <robert@linux.intel.com>
Diffstat (limited to 'cogl/cogl-context.c')
-rw-r--r--cogl/cogl-context.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/cogl/cogl-context.c b/cogl/cogl-context.c
index b8296ece..58fa44d6 100644
--- a/cogl/cogl-context.c
+++ b/cogl/cogl-context.c
@@ -221,6 +221,9 @@ cogl_context_new (CoglDisplay *display,
g_assert_not_reached ();
}
+ context->uniform_names = NULL;
+ context->n_uniform_names = 0;
+
/* Initialise the driver specific state */
_cogl_init_feature_overrides (context);
@@ -478,8 +481,12 @@ _cogl_context_free (CoglContext *context)
cogl_pipeline_cache_free (context->pipeline_cache);
+
_cogl_destroy_texture_units ();
+ g_slist_foreach (context->uniform_names, (GFunc) g_free, NULL);
+ g_slist_free (context->uniform_names);
+
g_byte_array_free (context->buffer_map_fallback_array, TRUE);
cogl_object_unref (context->display);