brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glsl-fragend: Store the cached variables in global variables

Browse Source 
The variables caching the result of texture lookups and layer
calculations are now stored in global variables so that when a hook
for the layer processing is added the variables can still be accessed
even if the generated code is within a separate function.

Reviewed-by: Robert Bragg <robert@linux.intel.com>
This commit is contained in:
Neil Roberts 2011-11-25 22:00:49 +00:00 committed by Robert Bragg
parent a0903e0cfb
commit 272c6567fa
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cogl/cogl-pipeline-fragend-glsl.c
View File

@ -386,8 +386,12 @@ ensure_texture_lookup_generated (CoglPipelineShaderState *shader_state,
shader_state->unit_state[unit_index].sampled = TRUE; shader_state->unit_state[unit_index].sampled = TRUE;
g_string_append_printf (shader_state->header,
"vec4 cogl_texel%i;\n",
unit_index);
g_string_append_printf (shader_state->source, g_string_append_printf (shader_state->source,
" vec4 texel%i = cogl_texture_lookup%i (", " cogl_texel%i = cogl_texture_lookup%i (",
unit_index, unit_index,
unit_index); unit_index);
@ -534,7 +538,7 @@ add_arg (CoglPipelineShaderState *shader_state,
{ {
case COGL_PIPELINE_COMBINE_SOURCE_TEXTURE: case COGL_PIPELINE_COMBINE_SOURCE_TEXTURE:
g_string_append_printf (shader_source, g_string_append_printf (shader_source,
"texel%i.%s", "cogl_texel%i.%s",
_cogl_pipeline_layer_get_unit_index (layer), _cogl_pipeline_layer_get_unit_index (layer),
swizzle); swizzle);
break; break;
@ -550,7 +554,7 @@ add_arg (CoglPipelineShaderState *shader_state,
if (previous_layer_index >= 0) if (previous_layer_index >= 0)
{ {
g_string_append_printf (shader_source, g_string_append_printf (shader_source,
"layer%i.%s", "cogl_layer%i.%s",
previous_layer_index, previous_layer_index,
swizzle); swizzle);
break; break;
@ -564,7 +568,7 @@ add_arg (CoglPipelineShaderState *shader_state,
if (src >= COGL_PIPELINE_COMBINE_SOURCE_TEXTURE0 && if (src >= COGL_PIPELINE_COMBINE_SOURCE_TEXTURE0 &&
src < COGL_PIPELINE_COMBINE_SOURCE_TEXTURE0 + 32) src < COGL_PIPELINE_COMBINE_SOURCE_TEXTURE0 + 32)
g_string_append_printf (shader_source, g_string_append_printf (shader_source,
"texel%i.%s", "cogl_texel%i.%s",
src - COGL_PIPELINE_COMBINE_SOURCE_TEXTURE0, src - COGL_PIPELINE_COMBINE_SOURCE_TEXTURE0,
swizzle); swizzle);
break; break;
@ -665,7 +669,7 @@ append_masked_combine (CoglPipeline *pipeline,
ensure_arg_generated (pipeline, layer, previous_layer_index, src[i]); ensure_arg_generated (pipeline, layer, previous_layer_index, src[i]);
g_string_append_printf (shader_state->source, g_string_append_printf (shader_state->source,
" layer%i.%s = ", " cogl_layer%i.%s = ",
layer->index, layer->index,
swizzle); swizzle);
@ -788,8 +792,9 @@ ensure_layer_generated (CoglPipeline *pipeline,
COGL_PIPELINE_LAYER_STATE_COMBINE); COGL_PIPELINE_LAYER_STATE_COMBINE);
big_state = combine_authority->big_state; big_state = combine_authority->big_state;
g_string_append_printf (shader_state->source, /* Make a global variable for the result of the layer code */
" vec4 layer%i;\n", g_string_append_printf (shader_state->header,
"vec4 cogl_layer%i;\n",
layer_index); layer_index);
if (!_cogl_pipeline_layer_needs_combine_separate (combine_authority) || if (!_cogl_pipeline_layer_needs_combine_separate (combine_authority) ||
@ -955,7 +960,7 @@ _cogl_pipeline_fragend_glsl_end (CoglPipeline *pipeline,
ensure_layer_generated (pipeline, last_layer->index); ensure_layer_generated (pipeline, last_layer->index);
g_string_append_printf (shader_state->source, g_string_append_printf (shader_state->source,
" cogl_color_out = layer%i;\n", " cogl_color_out = cogl_layer%i;\n",
last_layer->index); last_layer->index);
COGL_LIST_FOREACH_SAFE (layer_data, &shader_state->layers, COGL_LIST_FOREACH_SAFE (layer_data, &shader_state->layers,