summaryrefslogtreecommitdiff
path: root/cogl/cogl-pipeline-opengl.c
diff options
context:
space:
mode:
authorNeil Roberts <neil@linux.intel.com>2010-12-02 16:30:55 +0000
committerNeil Roberts <neil@linux.intel.com>2010-12-02 16:36:00 +0000
commitf54cc7abd43b8f6919daf36f096f4f89520a6046 (patch)
tree828510e867d9bd958cd090e5e9369994bf986584 /cogl/cogl-pipeline-opengl.c
parent6607306a2de23245ed7d36cdefc2dfc7883e61f2 (diff)
downloadcogl-f54cc7abd43b8f6919daf36f096f4f89520a6046.tar.gz
cogl-pipeline-glsl: Fix reusing shaders for shared ancestors
The check for whether we can reuse a program we've already generated was only being done if the pipeline already had a glsl_program_state. When there is no glsl_program_state it then looks for the nearest ancestor it can share the program with. It then wasn't checking whether that ancestor already had a GL program so it would start generating the source again. It wouldn't however compile that source again because _cogl_pipeline_backend_glsl_end does check whether there is already a program. This patch moves the check until after it has found the glsl_program_state, whether or not it was found from an ancestor or as its own state.
Diffstat (limited to 'cogl/cogl-pipeline-opengl.c')
0 files changed, 0 insertions, 0 deletions