[Mesa-dev] [PATCH] st/mesa: convert programs to gl_program *

[Brian Paul]

On 10/16/2015 01:16 AM, Boyan Ding wrote:
> Fixes following warnings:
> state_tracker/st_cb_program.c: In function ‘st_new_program’:
> state_tracker/st_cb_program.c:108:36: warning: passing argument 1 of
> ‘_mesa_init_gl_program’ from incompatible pointer type
> [-Wincompatible-pointer-types]
>         return _mesa_init_gl_program(&prog->Base, target, id);
>                                      ^
> In file included from state_tracker/st_cb_program.c:38:0:
> ./program/program.h:67:1: note: expected ‘struct gl_program *’ but
> argument is of type ‘struct gl_vertex_program *’
>   _mesa_init_gl_program(struct gl_program *prog, GLenum target, GLuint
> id);
>   ^
> state_tracker/st_cb_program.c:112:36: warning: passing argument 1 of
> ‘_mesa_init_gl_program’ from incompatible pointer type
> [-Wincompatible-pointer-types]
>         return _mesa_init_gl_program(&prog->Base, target, id);
>                                      ^
> In file included from state_tracker/st_cb_program.c:38:0:
> ./program/program.h:67:1: note: expected ‘struct gl_program *’ but
> argument is of type ‘struct gl_fragment_program *’
>   _mesa_init_gl_program(struct gl_program *prog, GLenum target, GLuint
> id);
>   ^
> state_tracker/st_cb_program.c:116:36: warning: passing argument 1 of
> ‘_mesa_init_gl_program’ from incompatible pointer type
> [-Wincompatible-pointer-types]
>         return _mesa_init_gl_program(&prog->Base, target, id);
>                                      ^
> In file included from state_tracker/st_cb_program.c:38:0:
> ./program/program.h:67:1: note: expected ‘struct gl_program *’ but
> argument is of type ‘struct gl_geometry_program *’
>   _mesa_init_gl_program(struct gl_program *prog, GLenum target, GLuint
> id);
>   ^
> state_tracker/st_cb_program.c:120:36: warning: passing argument 1 of
> ‘_mesa_init_gl_program’ from incompatible pointer type
> [-Wincompatible-pointer-types]
>         return _mesa_init_gl_program(&prog->Base, target, id);
>                                      ^
> In file included from state_tracker/st_cb_program.c:38:0:
> ./program/program.h:67:1: note: expected ‘struct gl_program *’ but
> argument is of type ‘struct gl_tess_ctrl_program *’
>   _mesa_init_gl_program(struct gl_program *prog, GLenum target, GLuint
> id);
>   ^
> state_tracker/st_cb_program.c:124:36: warning: passing argument 1 of
> ‘_mesa_init_gl_program’ from incompatible pointer type
> [-Wincompatible-pointer-types]
>         return _mesa_init_gl_program(&prog->Base, target, id);
>                                      ^
> In file included from state_tracker/st_cb_program.c:38:0:
> ./program/program.h:67:1: note: expected ‘struct gl_program *’ but
> argument is of type ‘struct gl_tess_eval_program *’
>   _mesa_init_gl_program(struct gl_program *prog, GLenum target, GLuint
> id);
>   ^
> Fixes: bcb56c2c6 (program: convert _mesa_init_gl_program to take struct
> gl_program *)
>
> Signed-off-by: Boyan Ding <boyan.j.ding at gmail.com>
> ---
>   src/mesa/state_tracker/st_cb_program.c | 10 +++++-----
>   1 file changed, 5 insertions(+), 5 deletions(-)
>

I already fixed this but forgot to push the patch yesterday.  I'll do so 
now...

-Brian