fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 17:30:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

program: convert _mesa_init_gl_program() to take struct gl_program *

Browse source 
Rather than accepting a void pointer, only to down and up cast around
it, convert the function to take the base (struct gl_program) pointer.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Emil Velikov 2015-10-13 11:26:09 +01:00
parent 2034bdd46c
commit bcb56c2c69
10 changed files with 68 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/mesa/drivers/dri/i915/i915_fragprog.c
View file

@ -1315,9 +1315,10 @@ static struct gl_program *
i915NewProgram(struct gl_context * ctx, GLenum target, GLuint id)
{
switch (target) {
case GL_VERTEX_PROGRAM_ARB:
return _mesa_init_gl_program(CALLOC_STRUCT(gl_vertex_program),
target, id);
case GL_VERTEX_PROGRAM_ARB: {
struct gl_vertex_program *prog = CALLOC_STRUCT(gl_vertex_program);
return _mesa_init_gl_program(&prog->Base, target, id);
}
case GL_FRAGMENT_PROGRAM_ARB:{
struct i915_fragment_program *prog =
@ -1325,7 +1326,7 @@ i915NewProgram(struct gl_context * ctx, GLenum target, GLuint id)
if (prog) {
i915_init_program(I915_CONTEXT(ctx), prog);
return _mesa_init_gl_program(prog, target, id);
return _mesa_init_gl_program(&prog->FragProg.Base, target, id);
}
else
return NULL;

6
src/mesa/drivers/dri/i965/brw_program.c
View file

@ -69,7 +69,7 @@ static struct gl_program *brwNewProgram( struct gl_context *ctx,
if (prog) {
prog->id = get_new_program_id(brw->intelScreen);
return _mesa_init_gl_program(&prog->program, target, id);
return _mesa_init_gl_program(&prog->program.Base, target, id);
}
else
return NULL;
@ -80,7 +80,7 @@ static struct gl_program *brwNewProgram( struct gl_context *ctx,
if (prog) {
prog->id = get_new_program_id(brw->intelScreen);
return _mesa_init_gl_program(&prog->program, target, id);
return _mesa_init_gl_program(&prog->program.Base, target, id);
}
else
return NULL;
@ -102,7 +102,7 @@ static struct gl_program *brwNewProgram( struct gl_context *ctx,
if (prog) {
prog->id = get_new_program_id(brw->intelScreen);
return _mesa_init_gl_program(&prog->program, target, id);
return _mesa_init_gl_program(&prog->program.Base, target, id);
} else {
return NULL;
}

2
src/mesa/drivers/dri/i965/test_fs_cmod_propagation.cpp
View file

@ -66,7 +66,7 @@ void cmod_propagation_test::SetUp()
v = new cmod_propagation_fs_visitor(compiler, prog_data, shader);
_mesa_init_gl_program(&fp->program, GL_FRAGMENT_SHADER, 0);
_mesa_init_gl_program(&fp->program.Base, GL_FRAGMENT_SHADER, 0);
devinfo->gen = 4;
}

2
src/mesa/drivers/dri/i965/test_fs_saturate_propagation.cpp
View file

@ -66,7 +66,7 @@ void saturate_propagation_test::SetUp()
v = new saturate_propagation_fs_visitor(compiler, prog_data, shader);
_mesa_init_gl_program(&fp->program, GL_FRAGMENT_SHADER, 0);
_mesa_init_gl_program(&fp->program.Base, GL_FRAGMENT_SHADER, 0);
devinfo->gen = 4;
}

2
src/mesa/drivers/dri/i965/test_vec4_copy_propagation.cpp
View file

@ -98,7 +98,7 @@ void copy_propagation_test::SetUp()
v = new copy_propagation_vec4_visitor(compiler, shader);
_mesa_init_gl_program(&vp->program, GL_VERTEX_SHADER, 0);
_mesa_init_gl_program(&vp->program.Base, GL_VERTEX_SHADER, 0);
devinfo->gen = 4;
}

2
src/mesa/drivers/dri/i965/test_vec4_register_coalesce.cpp
View file

@ -101,7 +101,7 @@ void register_coalesce_test::SetUp()
v = new register_coalesce_vec4_visitor(compiler, shader);
_mesa_init_gl_program(&vp->program, GL_VERTEX_SHADER, 0);
_mesa_init_gl_program(&vp->program.Base, GL_VERTEX_SHADER, 0);
devinfo->gen = 4;
}

17
src/mesa/drivers/dri/r200/r200_vertprog.c
View file

@ -1200,18 +1200,19 @@ r200BindProgram(struct gl_context *ctx, GLenum target, struct gl_program *prog)
static struct gl_program *
r200NewProgram(struct gl_context *ctx, GLenum target, GLuint id)
{
struct r200_vertex_program *vp;
switch(target){
case GL_VERTEX_PROGRAM_ARB:
vp = CALLOC_STRUCT(r200_vertex_program);
return _mesa_init_gl_program(&vp->mesa_program, target, id);
case GL_FRAGMENT_PROGRAM_ARB:
return _mesa_init_gl_program(CALLOC_STRUCT(gl_fragment_program), target, id);
case GL_VERTEX_PROGRAM_ARB: {
struct r200_vertex_program *vp = CALLOC_STRUCT(r200_vertex_program);
return _mesa_init_gl_program(&vp->mesa_program.Base, target, id);
}
case GL_FRAGMENT_PROGRAM_ARB: {
struct gl_fragment_program *prog = CALLOC_STRUCT(gl_fragment_program);
return _mesa_init_gl_program(&prog->Base, target, id);
}
default:
_mesa_problem(ctx, "Bad target in r200NewProgram");
return NULL;
}
return NULL;
}

55
src/mesa/program/program.c
View file

@ -176,9 +176,8 @@ _mesa_set_program_error(struct gl_context *ctx, GLint pos, const char *string)
* Initialize a new gl_program object.
*/
struct gl_program *
_mesa_init_gl_program(void *_prog, GLenum target, GLuint id)
_mesa_init_gl_program(struct gl_program *prog, GLenum target, GLuint id)
{
struct gl_program *prog = (struct gl_program*)_prog;
GLuint i;
if (!prog)
@ -214,38 +213,36 @@ _mesa_init_gl_program(void *_prog, GLenum target, GLuint id)
struct gl_program *
_mesa_new_program(struct gl_context *ctx, GLenum target, GLuint id)
{
struct gl_program *prog;
switch (target) {
case GL_VERTEX_PROGRAM_ARB: /* == GL_VERTEX_PROGRAM_NV */
prog = _mesa_init_gl_program(CALLOC_STRUCT(gl_vertex_program),
target, id);
break;
case GL_VERTEX_PROGRAM_ARB: { /* == GL_VERTEX_PROGRAM_NV */
struct gl_vertex_program *prog = CALLOC_STRUCT(gl_vertex_program);
return _mesa_init_gl_program(&prog->Base, target, id);
}
case GL_FRAGMENT_PROGRAM_NV:
case GL_FRAGMENT_PROGRAM_ARB:
prog =_mesa_init_gl_program(CALLOC_STRUCT(gl_fragment_program),
target, id);
break;
case GL_GEOMETRY_PROGRAM_NV:
prog = _mesa_init_gl_program(CALLOC_STRUCT(gl_geometry_program),
target, id);
break;
case GL_TESS_CONTROL_PROGRAM_NV:
prog = _mesa_init_gl_program(CALLOC_STRUCT(gl_tess_ctrl_program),
target, id);
break;
case GL_TESS_EVALUATION_PROGRAM_NV:
prog = _mesa_init_gl_program(CALLOC_STRUCT(gl_tess_eval_program),
target, id);
break;
case GL_COMPUTE_PROGRAM_NV:
prog = _mesa_init_gl_program(CALLOC_STRUCT(gl_compute_program),
target, id);
break;
case GL_FRAGMENT_PROGRAM_ARB: {
struct gl_fragment_program *prog = CALLOC_STRUCT(gl_fragment_program);
return _mesa_init_gl_program(&prog->Base, target, id);
}
case GL_GEOMETRY_PROGRAM_NV: {
struct gl_geometry_program *prog = CALLOC_STRUCT(gl_geometry_program);
return _mesa_init_gl_program(&prog->Base, target, id);
}
case GL_TESS_CONTROL_PROGRAM_NV: {
struct gl_tess_ctrl_program *prog = CALLOC_STRUCT(gl_tess_ctrl_program);
return _mesa_init_gl_program(&prog->Base, target, id);
}
case GL_TESS_EVALUATION_PROGRAM_NV: {
struct gl_tess_eval_program *prog = CALLOC_STRUCT(gl_tess_eval_program);
return _mesa_init_gl_program(&prog->Base, target, id);
}
case GL_COMPUTE_PROGRAM_NV: {
struct gl_compute_program *prog = CALLOC_STRUCT(gl_compute_program);
return _mesa_init_gl_program(&prog->Base, target, id);
}
default:
_mesa_problem(ctx, "bad target in _mesa_new_program");
prog = NULL;
return NULL;
}
return prog;
}

2
src/mesa/program/program.h
View file

@ -64,7 +64,7 @@ extern void
_mesa_set_program_error(struct gl_context *ctx, GLint pos, const char *string);
extern struct gl_program *
_mesa_init_gl_program(void *prog, GLenum target, GLuint id);
_mesa_init_gl_program(struct gl_program *prog, GLenum target, GLuint id);
extern struct gl_program *
_mesa_new_program(struct gl_context *ctx, GLenum target, GLuint id);

38
src/mesa/state_tracker/st_cb_program.c
View file

@ -102,29 +102,31 @@ st_use_program(struct gl_context *ctx, struct gl_shader_program *shProg)
static struct gl_program *
st_new_program(struct gl_context *ctx, GLenum target, GLuint id)
{
struct gl_program *prog;
switch (target) {
case GL_VERTEX_PROGRAM_ARB:
prog = (struct gl_program*)ST_CALLOC_STRUCT(st_vertex_program);
break;
case GL_FRAGMENT_PROGRAM_ARB:
prog = (struct gl_program*)ST_CALLOC_STRUCT(st_fragment_program);
break;
case GL_GEOMETRY_PROGRAM_NV:
prog = (struct gl_program*)ST_CALLOC_STRUCT(st_geometry_program);
break;
case GL_TESS_CONTROL_PROGRAM_NV:
prog = (struct gl_program*)ST_CALLOC_STRUCT(st_tessctrl_program);
break;
case GL_TESS_EVALUATION_PROGRAM_NV:
prog = (struct gl_program*)ST_CALLOC_STRUCT(st_tesseval_program);
break;
case GL_VERTEX_PROGRAM_ARB: {
struct st_vertex_program *prog = ST_CALLOC_STRUCT(st_vertex_program);
return _mesa_init_gl_program(&prog->Base, target, id);
}
case GL_FRAGMENT_PROGRAM_ARB: {
struct st_fragment_program *prog = ST_CALLOC_STRUCT(st_fragment_program);
return _mesa_init_gl_program(&prog->Base, target, id);
}
case GL_GEOMETRY_PROGRAM_NV: {
struct st_geometry_program *prog = ST_CALLOC_STRUCT(st_geometry_program);
return _mesa_init_gl_program(&prog->Base, target, id);
}
case GL_TESS_CONTROL_PROGRAM_NV: {
struct st_tessctrl_program *prog = ST_CALLOC_STRUCT(st_tessctrl_program);
return _mesa_init_gl_program(&prog->Base, target, id);
}
case GL_TESS_EVALUATION_PROGRAM_NV: {
struct st_tesseval_program *prog = ST_CALLOC_STRUCT(st_tesseval_program);
return _mesa_init_gl_program(&prog->Base, target, id);
}
default:
assert(0);
return NULL;
}
return _mesa_init_gl_program(prog, target, id);
}