Re: [clutter] Clutter 0.9 broken for GLES

[Koen Kooi]

Op 8 jun 2009, om 12:27 heeft Robert Bragg het volgende geschreven:

On Mon, 2009-06-01 at 20:37 +0200, Koen Kooi wrote:

Op 1 jun 2009, om 20:05 heeft Robert Bragg het volgende geschreven:

On Mon, 2009-06-01 at 19:01 +0200, Koen Kooi wrote:

Hi,

This broke the gles backend:

author  Robert Bragg <rob...@linux.intel.com>     2009-05-12 13:15:18
commit  36cfb6030784791a4420a1e52a8c18d56b1d0c69 (patch)
[cogl] Remove the COGL{enum,int,uint} typedefs

Fixing it seems to be trivial:

   for i in clutter/cogl/gles/* ; do
       sed -i -e s:CGL_NEAREST:COGL_TEXTURE_FILTER_NEAREST:g \
              -e s:CGL_LINEAR:iCOGL_TEXTURE_FILTER_LINEAR:g \
              -e s:CGL_VERTEX_SHADER:COGL_SHADER_TYPE_VERTEX:g \
              -e s:CGL_FRAGMENT_SHADER:COGL_SHADER_TYPE_FRAGMENT:g
$i
   done

With that I can build revision
36cfb6030784791a4420a1e52a8c18d56b1d0c69
against the SGX530 SDK again, but more recent revisions introduced
even
more GLES breakage....

Same goes for clutter-gst and mutter, btw.


would fix GLES support before 1.0 :)

It would be great if someone with some actual knowledge about clutter

I think I fixed this in the 1.0 integration branch last week, but
didn't
back port to master so far.

I was also testing GLES 1 and GLES 2 and they were both working for
me.


you that would be good to know.

If you could test the 1.0 integration branch and confirm it works for

the integration branch gives me:

  CC    cogl-current-matrix.o
  CC    cogl-bitmap-pixbuf.o
  CC    cogl-primitives.o
  CC    cogl-clip-stack.o
cc1: warnings being treated as errors
cogl-primitives.c: In function '_cogl_journal_flush':
cogl-primitives.c:213: error: cast increases required alignment of
target type
cogl-primitives.c:214: error: cast increases required alignment of
target type
cogl-primitives.c: In function '_cogl_texture_sliced_polygon':
cogl-primitives.c:960: error: cast increases required alignment of
target type
cogl-primitives.c:995: error: cast increases required alignment of
target type
cogl-primitives.c: In function '_cogl_multitexture_unsliced_polygon':
cogl-primitives.c:1064: error: cast increases required alignment of
target type
cogl-primitives.c: In function 'cogl_polygon':
cogl-primitives.c:1236: error: cast increases required alignment of
target type
make[7]: *** [libclutter_cogl_common_la-cogl-primitives.lo] Error 1
make[7]: *** Waiting for unfinished jobs....
  CC    cogl-color.o
  CC    cogl-fixed.o
cc1: warnings being treated as errors
cogl-fixed.c: In function 'cogl_fixed_sqrt':
cogl-fixed.c:616: error: unused variable 'mask'
make[7]: *** [libclutter_cogl_common_la-cogl-fixed.lo] Error 1
make[6]: *** [all] Error 2
make[5]: *** [all-recursive] Error 1

After turning off -Werror I get:

  CC    cogl-context.o
  CC    cogl-program.o
  CC    cogl-shader.o
  CC    cogl-gles2-wrapper.o
cogl-texture.c: In function '_cogl_texture_slices_create':
cogl-texture.c:1064: warning: cast increases required alignment of
target type
cogl-texture.c: In function '_cogl_texture_slices_free':
cogl-texture.c:1125: warning: cast increases required alignment of
target type
cogl-shader.c: In function 'cogl_shader_get_info_log':
cogl-shader.c:107: error: expected '=', ',', ';', 'asm' or
'__attribute__' before 'int'
cogl-shader.c:115: error: 'buffer' undeclared (first use in this
function)

once
cogl-shader.c:115: error: for each function it appears in.)
make[6]: *** [libclutter_cogl_gles_la-cogl-shader.lo] Error 1
make[6]: *** Waiting for unfinished jobs....

file or directory
cogl-gles2-wrapper.c:40:40: error: cogl-fixed-fragment-shader.h: No
such file or directory
cogl-gles2-wrapper.c: In function 'cogl_gles2_get_vertex_shader':
cogl-gles2-wrapper.c:222: error:

this function)
cogl-gles2-wrapper.c:222: error: (Each undeclared identifier is
reported only once
cogl-gles2-wrapper.c:222: error: for each function it appears in.)
cogl-gles2-wrapper.c:235: error:

this function)
cogl-gles2-wrapper.c:236: error:
'cogl_fixed_vertex_shader_output_variables' undeclared (first use in
this function)
cogl-gles2-wrapper.c:249: error:
'cogl_fixed_vertex_shader_fogging_options' undeclared (first use in
this function)

undeclared (first use in this function)
cogl-gles2-wrapper.c:266: error:
'cogl_fixed_vertex_shader_frag_color_start' undeclared (first use in
this function)
cogl-gles2-wrapper.c:270: error: 'cogl_fixed_vertex_shader_fog_start'
undeclared (first use in this function)
cogl-gles2-wrapper.c:275: error: 'cogl_fixed_vertex_shader_fog_exp'
undeclared (first use in this function)
cogl-gles2-wrapper.c:279: error: 'cogl_fixed_vertex_shader_fog_exp2'
undeclared (first use in this function)

undeclared (first use in this function)
cogl-gles2-wrapper.c:287: error: 'cogl_fixed_vertex_shader_fog_end'
undeclared (first use in this function)
cogl-gles2-wrapper.c:290: error: 'cogl_fixed_vertex_shader_end'
undeclared (first use in this function)
cogl-gles2-wrapper.c: In function 'cogl_gles2_get_fragment_shader':
cogl-gles2-wrapper.c:331: error:
'cogl_fixed_fragment_shader_variables_start' undeclared (first use in
this function)
cogl-gles2-wrapper.c:338: error: 'cogl_fixed_fragment_shader_inputs'
undeclared (first use in this function)
cogl-gles2-wrapper.c:346: error:
'cogl_fixed_fragment_shader_texturing_options' undeclared (first use
in this function)
cogl-gles2-wrapper.c:352: error:
'cogl_fixed_fragment_shader_fogging_options' undeclared (first use in
this function)
cogl-gles2-wrapper.c:354: error:
'cogl_fixed_fragment_shader_main_declare' undeclared (first use in
this function)
cogl-gles2-wrapper.c:356: error:
'cogl_fixed_fragment_shader_main_start' undeclared (first use in this
function)
cogl-gles2-wrapper.c:387: error: 'cogl_fixed_fragment_shader_fog'
undeclared (first use in this function)
cogl-gles2-wrapper.c:394: error:

function)
cogl-gles2-wrapper.c:398: error:
'cogl_fixed_fragment_shader_alpha_less' undeclared (first use in this
function)
cogl-gles2-wrapper.c:402: error:

function)
cogl-gles2-wrapper.c:406: error:
'cogl_fixed_fragment_shader_alpha_lequal' undeclared (first use in
this function)
cogl-gles2-wrapper.c:410: error:
'cogl_fixed_fragment_shader_alpha_greater' undeclared (first use in
this function)
cogl-gles2-wrapper.c:414: error:
'cogl_fixed_fragment_shader_alpha_notequal' undeclared (first use in
this function)
cogl-gles2-wrapper.c:418: error:
'cogl_fixed_fragment_shader_alpha_gequal' undeclared (first use in
this function)
cogl-gles2-wrapper.c:421: error: 'cogl_fixed_fragment_shader_end'
undeclared (first use in this function)
make[6]: *** [libclutter_cogl_gles_la-cogl-gles2-wrapper.lo] Error 1
make[5]: *** [all-recursive] Error 1
make[4]: *** [all] Error 2
make[3]: *** [all-recursive] Error 1
make[2]: *** [all] Error 2
make[1]: *** [all-recursive] Error 1
make: *** [all] Error 2

cogl-shader.c:115: error: (Each undeclared identifier is reported only cogl-gles2-wrapper.c:39:38: error: cogl-fixed-vertex-shader.h: No such 'cogl_fixed_vertex_shader_per_vertex_attribs' undeclared (first use in 'cogl_fixed_vertex_shader_transform_matrices' undeclared (first use in cogl-gles2-wrapper.c:250: error: 'cogl_fixed_vertex_shader_main_start' cogl-gles2-wrapper.c:283: error: 'cogl_fixed_vertex_shader_fog_linear' 'cogl_fixed_fragment_shader_alpha_never' undeclared (first use in this 'cogl_fixed_fragment_shader_alpha_equal' undeclared (first use in this

1 and 2 backends are building and running for me with master. I'm not

so if you depend on the GLES 1 or 2 backends it would be great if you
could supply a patch that fixes the build for you.

Apparently you have a stricter compiler than me :-/ I always build with --enable-maintainer-flags but I don't see any warnings at all. The GLES sure when I will have a chance to look at your compiler warnings though,

It's a makefile issue, the .h files weren't getting generated from the .glsl files. I do want to bring http://bugzilla.openedhand.com/show_bug.cgi?id=1628 to your attention.

regards,

Koen

PGP.sig
Description: Dit deel van het bericht is digitaal ondertekend