OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

program: remove _mesa_init_*_program wrappers

Browse Source 
They didn't do anything useful.

Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Marek Olšák
2015-10-05 22:13:34 +02:00
parent 092f0427dc
commit d695c676ea
10 changed files with 50 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/mesa/drivers/dri/i915/i915_fragprog.c
View File

@@ -1316,8 +1316,8 @@ i915NewProgram(struct gl_context * ctx, GLenum target, GLuint id)
{
switch (target) {
case GL_VERTEX_PROGRAM_ARB:
return _mesa_init_vertex_program(ctx, CALLOC_STRUCT(gl_vertex_program),
target, id);
return _mesa_init_gl_program(CALLOC_STRUCT(gl_vertex_program),
target, id);
case GL_FRAGMENT_PROGRAM_ARB:{
struct i915_fragment_program *prog =
@@ -1325,8 +1325,7 @@ i915NewProgram(struct gl_context * ctx, GLenum target, GLuint id)
if (prog) {
i915_init_program(I915_CONTEXT(ctx), prog);
return _mesa_init_fragment_program(ctx, &prog->FragProg,
target, id);
return _mesa_init_gl_program(prog, target, id);
}
else
return NULL;

10
src/mesa/drivers/dri/i965/brw_program.c
View File

@@ -69,8 +69,7 @@ static struct gl_program *brwNewProgram( struct gl_context *ctx,
if (prog) {
prog->id = get_new_program_id(brw->intelScreen);
return _mesa_init_vertex_program( ctx, &prog->program,
target, id );
return _mesa_init_gl_program(&prog->program, target, id);
}
else
return NULL;
@@ -81,8 +80,7 @@ static struct gl_program *brwNewProgram( struct gl_context *ctx,
if (prog) {
prog->id = get_new_program_id(brw->intelScreen);
return _mesa_init_fragment_program( ctx, &prog->program,
target, id );
return _mesa_init_gl_program(&prog->program, target, id);
}
else
return NULL;
@@ -93,7 +91,7 @@ static struct gl_program *brwNewProgram( struct gl_context *ctx,
if (prog) {
prog->id = get_new_program_id(brw->intelScreen);
return _mesa_init_geometry_program(ctx, &prog->program, target, id);
return _mesa_init_gl_program(&prog->program, target, id);
} else {
return NULL;
}
@@ -104,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_compute_program(ctx, &prog->program, target, id);
return _mesa_init_gl_program(&prog->program, 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_fragment_program(ctx, &fp->program, GL_FRAGMENT_SHADER, 0);
_mesa_init_gl_program(&fp->program, 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_fragment_program(ctx, &fp->program, GL_FRAGMENT_SHADER, 0);
_mesa_init_gl_program(&fp->program, 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_vertex_program(ctx, &vp->program, GL_VERTEX_SHADER, 0);
_mesa_init_gl_program(&vp->program, 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_vertex_program(ctx, &vp->program, GL_VERTEX_SHADER, 0);
_mesa_init_gl_program(&vp->program, GL_VERTEX_SHADER, 0);
devinfo->gen = 4;
}

4
src/mesa/drivers/dri/r200/r200_vertprog.c
View File

@@ -1205,9 +1205,9 @@ r200NewProgram(struct gl_context *ctx, GLenum target, GLuint id)
switch(target){
case GL_VERTEX_PROGRAM_ARB:
vp = CALLOC_STRUCT(r200_vertex_program);
return _mesa_init_vertex_program(ctx, &vp->mesa_program, target, id);
return _mesa_init_gl_program(&vp->mesa_program, target, id);
case GL_FRAGMENT_PROGRAM_ARB:
return _mesa_init_fragment_program( ctx, CALLOC_STRUCT(gl_fragment_program), target, id );
return _mesa_init_gl_program(CALLOC_STRUCT(gl_fragment_program), target, id);
default:
_mesa_problem(ctx, "Bad target in r200NewProgram");
}

133
src/mesa/program/program.c
View File

@@ -175,12 +175,14 @@ _mesa_set_program_error(struct gl_context *ctx, GLint pos, const char *string)
/**
* Initialize a new gl_program object.
*/
static void
init_program_struct(struct gl_program *prog, GLenum target, GLuint id)
struct gl_program *
_mesa_init_gl_program(void *_prog, GLenum target, GLuint id)
{
struct gl_program *prog = (struct gl_program*)_prog;
GLuint i;
assert(prog);
if (!prog)
return NULL;
memset(prog, 0, sizeof(*prog));
mtx_init(&prog->Mutex, mtx_plain);
@@ -192,102 +194,8 @@ init_program_struct(struct gl_program *prog, GLenum target, GLuint id)
/* default mapping from samplers to texture units */
for (i = 0; i < MAX_SAMPLERS; i++)
prog->SamplerUnits[i] = i;
}
/**
* Initialize a new fragment program object.
*/
struct gl_program *
_mesa_init_fragment_program(struct gl_context *ctx,
struct gl_fragment_program *prog,
GLenum target, GLuint id)
{
if (prog) {
init_program_struct(&prog->Base, target, id);
return &prog->Base;
}
return NULL;
}
/**
* Initialize a new vertex program object.
*/
struct gl_program *
_mesa_init_vertex_program(struct gl_context *ctx,
struct gl_vertex_program *prog,
GLenum target, GLuint id)
{
if (prog) {
init_program_struct(&prog->Base, target, id);
return &prog->Base;
}
return NULL;
}
/**
* Initialize a new compute program object.
*/
struct gl_program *
_mesa_init_compute_program(struct gl_context *ctx,
struct gl_compute_program *prog,
GLenum target, GLuint id)
{
if (prog) {
init_program_struct(&prog->Base, target, id);
return &prog->Base;
}
return NULL;
}
/**
* Initialize a new tessellation control program object.
*/
struct gl_program *
_mesa_init_tess_ctrl_program(struct gl_context *ctx,
struct gl_tess_ctrl_program *prog,
GLenum target, GLuint id)
{
if (prog) {
init_program_struct(&prog->Base, target, id);
return &prog->Base;
}
return NULL;
}
/**
* Initialize a new tessellation evaluation program object.
*/
struct gl_program *
_mesa_init_tess_eval_program(struct gl_context *ctx,
struct gl_tess_eval_program *prog,
GLenum target, GLuint id)
{
if (prog) {
init_program_struct(&prog->Base, target, id);
return &prog->Base;
}
return NULL;
}
/**
* Initialize a new geometry program object.
*/
struct gl_program *
_mesa_init_geometry_program(struct gl_context *ctx,
struct gl_geometry_program *prog,
GLenum target, GLuint id)
{
if (prog) {
init_program_struct(&prog->Base, target, id);
return &prog->Base;
}
return NULL;
return prog;
}
@@ -309,34 +217,29 @@ _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_vertex_program(ctx, CALLOC_STRUCT(gl_vertex_program),
target, id );
prog = _mesa_init_gl_program(CALLOC_STRUCT(gl_vertex_program),
target, id);
break;
case GL_FRAGMENT_PROGRAM_NV:
case GL_FRAGMENT_PROGRAM_ARB:
prog =_mesa_init_fragment_program(ctx,
CALLOC_STRUCT(gl_fragment_program),
target, id );
prog =_mesa_init_gl_program(CALLOC_STRUCT(gl_fragment_program),
target, id);
break;
case GL_GEOMETRY_PROGRAM_NV:
prog = _mesa_init_geometry_program(ctx,
CALLOC_STRUCT(gl_geometry_program),
target, id);
prog = _mesa_init_gl_program(CALLOC_STRUCT(gl_geometry_program),
target, id);
break;
case GL_TESS_CONTROL_PROGRAM_NV:
prog = _mesa_init_tess_ctrl_program(ctx,
CALLOC_STRUCT(gl_tess_ctrl_program),
target, id);
prog = _mesa_init_gl_program(CALLOC_STRUCT(gl_tess_ctrl_program),
target, id);
break;
case GL_TESS_EVALUATION_PROGRAM_NV:
prog = _mesa_init_tess_eval_program(ctx,
CALLOC_STRUCT(gl_tess_eval_program),
target, id);
prog = _mesa_init_gl_program(CALLOC_STRUCT(gl_tess_eval_program),
target, id);
break;
case GL_COMPUTE_PROGRAM_NV:
prog = _mesa_init_compute_program(ctx,
CALLOC_STRUCT(gl_compute_program),
target, id);
prog = _mesa_init_gl_program(CALLOC_STRUCT(gl_compute_program),
target, id);
break;
default:
_mesa_problem(ctx, "bad target in _mesa_new_program");

29
src/mesa/program/program.h
View File

@@ -64,34 +64,7 @@ extern void
_mesa_set_program_error(struct gl_context *ctx, GLint pos, const char *string);
extern struct gl_program *
_mesa_init_vertex_program(struct gl_context *ctx,
struct gl_vertex_program *prog,
GLenum target, GLuint id);
extern struct gl_program *
_mesa_init_fragment_program(struct gl_context *ctx,
struct gl_fragment_program *prog,
GLenum target, GLuint id);
extern struct gl_program *
_mesa_init_tess_ctrl_program(struct gl_context *ctx,
struct gl_tess_ctrl_program *prog,
GLenum target, GLuint id);
extern struct gl_program *
_mesa_init_tess_eval_program(struct gl_context *ctx,
struct gl_tess_eval_program *prog,
GLenum target, GLuint id);
extern struct gl_program *
_mesa_init_geometry_program(struct gl_context *ctx,
struct gl_geometry_program *prog,
GLenum target, GLuint id);
extern struct gl_program *
_mesa_init_compute_program(struct gl_context *ctx,
struct gl_compute_program *prog,
GLenum target, GLuint id);
_mesa_init_gl_program(void *prog, GLenum target, GLuint id);
extern struct gl_program *
_mesa_new_program(struct gl_context *ctx, GLenum target, GLuint id);

43
src/mesa/state_tracker/st_cb_program.c
View File

@@ -102,36 +102,29 @@ 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: {
struct st_vertex_program *prog = ST_CALLOC_STRUCT(st_vertex_program);
return _mesa_init_vertex_program(ctx, &prog->Base, target, id);
}
case GL_FRAGMENT_PROGRAM_ARB: {
struct st_fragment_program *prog = ST_CALLOC_STRUCT(st_fragment_program);
return _mesa_init_fragment_program(ctx, &prog->Base, target, id);
}
case GL_GEOMETRY_PROGRAM_NV: {
struct st_geometry_program *prog = ST_CALLOC_STRUCT(st_geometry_program);
return _mesa_init_geometry_program(ctx, &prog->Base, target, id);
}
case GL_TESS_CONTROL_PROGRAM_NV: {
struct st_tessctrl_program *prog = ST_CALLOC_STRUCT(st_tessctrl_program);
return _mesa_init_tess_ctrl_program(ctx, &prog->Base, target, id);
}
case GL_TESS_EVALUATION_PROGRAM_NV: {
struct st_tesseval_program *prog = ST_CALLOC_STRUCT(st_tesseval_program);
return _mesa_init_tess_eval_program(ctx, &prog->Base, target, id);
}
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;
default:
assert(0);
return NULL;
}
return _mesa_init_gl_program(prog, target, id);
}