diff options
| author | Neil Roberts <neil@linux.intel.com> | 2010-12-02 21:08:30 +0000 |
|---|---|---|
| committer | Neil Roberts <neil@linux.intel.com> | 2010-12-03 15:27:17 +0000 |
| commit | f8449582c8dc974bd9adb33fd3dc00d2d1217c95 (patch) | |
| tree | 861d93797a251003d5a18a416908f6aea6ae4b03 /cogl/cogl-pipeline-opengl.c | |
| parent | f54cc7abd43b8f6919daf36f096f4f89520a6046 (diff) | |
| download | cogl-f8449582c8dc974bd9adb33fd3dc00d2d1217c95.tar.gz | |
Revert "cogl: Remove the generated array size for cogl_tex_coord_in"
This reverts commit 4cfe90bde275dbb952645397aa2ba2d6f6e2f3ba.
GLSL 1.00 on GLES doesn't support unsized arrays so the whole idea
can't work.
Conflicts:
clutter/cogl/cogl/cogl-pipeline-glsl.c
Diffstat (limited to 'cogl/cogl-pipeline-opengl.c')
| -rw-r--r-- | cogl/cogl-pipeline-opengl.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cogl/cogl-pipeline-opengl.c b/cogl/cogl-pipeline-opengl.c index 48b74e8e..049d0f79 100644 --- a/cogl/cogl-pipeline-opengl.c +++ b/cogl/cogl-pipeline-opengl.c @@ -1031,7 +1031,8 @@ backend_add_layer_cb (CoglPipelineLayer *layer, */ void _cogl_pipeline_flush_gl_state (CoglPipeline *pipeline, - gboolean skip_gl_color) + gboolean skip_gl_color, + int n_tex_coord_attribs) { unsigned long pipelines_difference; int n_layers; @@ -1134,7 +1135,8 @@ _cogl_pipeline_flush_gl_state (CoglPipeline *pipeline, * scratch buffers here... */ if (G_UNLIKELY (!backend->start (pipeline, n_layers, - pipelines_difference))) + pipelines_difference, + n_tex_coord_attribs))) continue; state.backend = backend; |