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

Some structure renaming. Prefix vertex/fragment-related structs with

Browse Source 
"gl_" to match other structs.
This commit is contained in:
Brian Paul
2006-07-20 16:49:57 +00:00
parent 459db7bd72
commit 122629f279
35 changed files with 233 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
src/mesa/shader/program.c
View File

@@ -57,7 +57,7 @@ make_state_flags(const GLint state[]);
/* A pointer to this dummy program is put into the hash table when
* glGenPrograms is called.
*/
struct program _mesa_DummyProgram;
struct gl_program _mesa_DummyProgram;
/**
@@ -75,7 +75,7 @@ _mesa_init_program(GLcontext *ctx)
ctx->VertexProgram.Enabled = GL_FALSE;
ctx->VertexProgram.PointSizeEnabled = GL_FALSE;
ctx->VertexProgram.TwoSideEnabled = GL_FALSE;
ctx->VertexProgram.Current = (struct vertex_program *) ctx->Shared->DefaultVertexProgram;
ctx->VertexProgram.Current = (struct gl_vertex_program *) ctx->Shared->DefaultVertexProgram;
assert(ctx->VertexProgram.Current);
ctx->VertexProgram.Current->Base.RefCount++;
for (i = 0; i < MAX_NV_VERTEX_PROGRAM_PARAMS / 4; i++) {
@@ -86,7 +86,7 @@ _mesa_init_program(GLcontext *ctx)
#if FEATURE_NV_fragment_program || FEATURE_ARB_fragment_program
ctx->FragmentProgram.Enabled = GL_FALSE;
ctx->FragmentProgram.Current = (struct fragment_program *) ctx->Shared->DefaultFragmentProgram;
ctx->FragmentProgram.Current = (struct gl_fragment_program *) ctx->Shared->DefaultFragmentProgram;
assert(ctx->FragmentProgram.Current);
ctx->FragmentProgram.Current->Base.RefCount++;
#endif
@@ -197,8 +197,8 @@ _mesa_find_line_column(const GLubyte *string, const GLubyte *pos,
/**
* Initialize a new vertex/fragment program object.
*/
static struct program *
_mesa_init_program_struct( GLcontext *ctx, struct program *prog,
static struct gl_program *
_mesa_init_program_struct( GLcontext *ctx, struct gl_program *prog,
GLenum target, GLuint id)
{
(void) ctx;
@@ -216,8 +216,8 @@ _mesa_init_program_struct( GLcontext *ctx, struct program *prog,
/**
* Initialize a new fragment program object.
*/
struct program *
_mesa_init_fragment_program( GLcontext *ctx, struct fragment_program *prog,
struct gl_program *
_mesa_init_fragment_program( GLcontext *ctx, struct gl_fragment_program *prog,
GLenum target, GLuint id)
{
if (prog)
@@ -230,8 +230,8 @@ _mesa_init_fragment_program( GLcontext *ctx, struct fragment_program *prog,
/**
* Initialize a new vertex program object.
*/
struct program *
_mesa_init_vertex_program( GLcontext *ctx, struct vertex_program *prog,
struct gl_program *
_mesa_init_vertex_program( GLcontext *ctx, struct gl_vertex_program *prog,
GLenum target, GLuint id)
{
if (prog)
@@ -253,17 +253,18 @@ _mesa_init_vertex_program( GLcontext *ctx, struct vertex_program *prog,
* \param target program target/type
* \return pointer to new program object
*/
struct program *
struct gl_program *
_mesa_new_program(GLcontext *ctx, GLenum target, GLuint id)
{
switch (target) {
case GL_VERTEX_PROGRAM_ARB: /* == GL_VERTEX_PROGRAM_NV */
return _mesa_init_vertex_program( ctx, CALLOC_STRUCT(vertex_program),
target, id );
return _mesa_init_vertex_program(ctx, CALLOC_STRUCT(gl_vertex_program),
target, id );
case GL_FRAGMENT_PROGRAM_NV:
case GL_FRAGMENT_PROGRAM_ARB:
return _mesa_init_fragment_program( ctx, CALLOC_STRUCT(fragment_program),
target, id );
return _mesa_init_fragment_program(ctx,
CALLOC_STRUCT(gl_fragment_program),
target, id );
default:
_mesa_problem(ctx, "bad target in _mesa_new_program");
return NULL;
@@ -278,7 +279,7 @@ _mesa_new_program(GLcontext *ctx, GLenum target, GLuint id)
* by a device driver function.
*/
void
_mesa_delete_program(GLcontext *ctx, struct program *prog)
_mesa_delete_program(GLcontext *ctx, struct gl_program *prog)
{
(void) ctx;
ASSERT(prog);
@@ -308,11 +309,11 @@ _mesa_delete_program(GLcontext *ctx, struct program *prog)
/* Program parameter functions */
/**********************************************************************/
struct program_parameter_list *
struct gl_program_parameter_list *
_mesa_new_parameter_list(void)
{
return (struct program_parameter_list *)
_mesa_calloc(sizeof(struct program_parameter_list));
return (struct gl_program_parameter_list *)
_mesa_calloc(sizeof(struct gl_program_parameter_list));
}
@@ -320,7 +321,7 @@ _mesa_new_parameter_list(void)
* Free a parameter list and all its parameters
*/
void
_mesa_free_parameter_list(struct program_parameter_list *paramList)
_mesa_free_parameter_list(struct gl_program_parameter_list *paramList)
{
GLuint i;
for (i = 0; i < paramList->NumParameters; i++) {
@@ -343,7 +344,7 @@ _mesa_free_parameter_list(struct program_parameter_list *paramList)
* \return index of new parameter in the list, or -1 if error (out of mem)
*/
static GLint
add_parameter(struct program_parameter_list *paramList,
add_parameter(struct gl_program_parameter_list *paramList,
const char *name, const GLfloat values[4],
enum register_file type)
{
@@ -357,10 +358,10 @@ add_parameter(struct program_parameter_list *paramList,
paramList->Size *= 2;
/* realloc arrays */
paramList->Parameters = (struct program_parameter *)
paramList->Parameters = (struct gl_program_parameter *)
_mesa_realloc(paramList->Parameters,
n * sizeof(struct program_parameter),
paramList->Size * sizeof(struct program_parameter));
n * sizeof(struct gl_program_parameter),
paramList->Size * sizeof(struct gl_program_parameter));
paramList->ParameterValues = (GLfloat (*)[4])
_mesa_align_realloc(paramList->ParameterValues, /* old buf */
@@ -380,7 +381,7 @@ add_parameter(struct program_parameter_list *paramList,
paramList->NumParameters = n + 1;
_mesa_memset(&paramList->Parameters[n], 0,
sizeof(struct program_parameter));
sizeof(struct gl_program_parameter));
paramList->Parameters[n].Name = name ? _mesa_strdup(name) : NULL;
paramList->Parameters[n].Type = type;
@@ -396,7 +397,7 @@ add_parameter(struct program_parameter_list *paramList,
* \return index of the new entry in the parameter list
*/
GLint
_mesa_add_named_parameter(struct program_parameter_list *paramList,
_mesa_add_named_parameter(struct gl_program_parameter_list *paramList,
const char *name, const GLfloat values[4])
{
return add_parameter(paramList, name, values, PROGRAM_NAMED_PARAM);
@@ -410,7 +411,7 @@ _mesa_add_named_parameter(struct program_parameter_list *paramList,
* \return index of the new parameter.
*/
GLint
_mesa_add_named_constant(struct program_parameter_list *paramList,
_mesa_add_named_constant(struct gl_program_parameter_list *paramList,
const char *name, const GLfloat values[4])
{
return add_parameter(paramList, name, values, PROGRAM_CONSTANT);
@@ -424,7 +425,7 @@ _mesa_add_named_constant(struct program_parameter_list *paramList,
* \return index of the new parameter.
*/
GLint
_mesa_add_unnamed_constant(struct program_parameter_list *paramList,
_mesa_add_unnamed_constant(struct gl_program_parameter_list *paramList,
const GLfloat values[4])
{
return add_parameter(paramList, NULL, values, PROGRAM_CONSTANT);
@@ -439,7 +440,7 @@ _mesa_add_unnamed_constant(struct program_parameter_list *paramList,
* \return index of the new parameter.
*/
GLint
_mesa_add_state_reference(struct program_parameter_list *paramList,
_mesa_add_state_reference(struct gl_program_parameter_list *paramList,
const GLint *stateTokens)
{
/* XXX we should probably search the current parameter list to see if
@@ -471,7 +472,7 @@ _mesa_add_state_reference(struct program_parameter_list *paramList,
* \return pointer to the float[4] values.
*/
GLfloat *
_mesa_lookup_parameter_value(struct program_parameter_list *paramList,
_mesa_lookup_parameter_value(struct gl_program_parameter_list *paramList,
GLsizei nameLen, const char *name)
{
GLuint i;
@@ -505,7 +506,7 @@ _mesa_lookup_parameter_value(struct program_parameter_list *paramList,
* \return index of parameter in the list.
*/
GLint
_mesa_lookup_parameter_index(struct program_parameter_list *paramList,
_mesa_lookup_parameter_index(struct gl_program_parameter_list *paramList,
GLsizei nameLen, const char *name)
{
GLint i;
@@ -811,6 +812,7 @@ _mesa_fetch_state(GLcontext *ctx, const enum state_index state[],
modifier == STATE_MATRIX_INVTRANS) {
/* Be sure inverse is up to date:
*/
_math_matrix_alloc_inv( (GLmatrix *) matrix );
_math_matrix_analyse( (GLmatrix*) matrix );
m = matrix->inv;
}
@@ -1246,7 +1248,7 @@ make_state_string(const GLint state[6])
*/
void
_mesa_load_state_parameters(GLcontext *ctx,
struct program_parameter_list *paramList)
struct gl_program_parameter_list *paramList)
{
GLuint i;
@@ -1631,7 +1633,7 @@ _mesa_print_instruction(const struct prog_instruction *inst)
* XXX this function could be greatly improved.
*/
void
_mesa_print_program(const struct program *prog)
_mesa_print_program(const struct gl_program *prog)
{
GLuint i;
for (i = 0; i < prog->NumInstructions; i++) {
@@ -1645,7 +1647,7 @@ _mesa_print_program(const struct program *prog)
* Print all of a program's parameters.
*/
void
_mesa_print_program_parameters(GLcontext *ctx, const struct program *prog)
_mesa_print_program_parameters(GLcontext *ctx, const struct gl_program *prog)
{
GLint i;
@@ -1666,7 +1668,7 @@ _mesa_print_program_parameters(GLcontext *ctx, const struct program *prog)
#endif
for (i = 0; i < prog->Parameters->NumParameters; i++){
struct program_parameter *param = prog->Parameters->Parameters + i;
struct gl_program_parameter *param = prog->Parameters->Parameters + i;
const GLfloat *v = prog->Parameters->ParameterValues[i];
_mesa_printf("param[%d] %s = {%.3f, %.3f, %.3f, %.3f};\n",
i, param->Name, v[0], v[1], v[2], v[3]);
@@ -1688,7 +1690,7 @@ _mesa_print_program_parameters(GLcontext *ctx, const struct program *prog)
void GLAPIENTRY
_mesa_BindProgram(GLenum target, GLuint id)
{
struct program *prog;
struct gl_program *prog;
GET_CURRENT_CONTEXT(ctx);
ASSERT_OUTSIDE_BEGIN_END(ctx);
@@ -1698,7 +1700,7 @@ _mesa_BindProgram(GLenum target, GLuint id)
(ctx->Extensions.NV_vertex_program ||
ctx->Extensions.ARB_vertex_program)) {
/*** Vertex program binding ***/
struct vertex_program *curProg = ctx->VertexProgram.Current;
struct gl_vertex_program *curProg = ctx->VertexProgram.Current;
if (curProg->Base.Id == id) {
/* binding same program - no change */
return;
@@ -1718,7 +1720,7 @@ _mesa_BindProgram(GLenum target, GLuint id)
(target == GL_FRAGMENT_PROGRAM_ARB
&& ctx->Extensions.ARB_fragment_program)) {
/*** Fragment program binding ***/
struct fragment_program *curProg = ctx->FragmentProgram.Current;
struct gl_fragment_program *curProg = ctx->FragmentProgram.Current;
if (curProg->Base.Id == id) {
/* binding same program - no change */
return;
@@ -1751,7 +1753,7 @@ _mesa_BindProgram(GLenum target, GLuint id)
}
else {
/* Bind user program */
prog = (struct program *) _mesa_HashLookup(ctx->Shared->Programs, id);
prog = (struct gl_program *) _mesa_HashLookup(ctx->Shared->Programs, id);
if (!prog || prog == &_mesa_DummyProgram) {
/* allocate a new program now */
prog = ctx->Driver.NewProgram(ctx, target, id);
@@ -1770,10 +1772,10 @@ _mesa_BindProgram(GLenum target, GLuint id)
/* bind now */
if (target == GL_VERTEX_PROGRAM_ARB) { /* == GL_VERTEX_PROGRAM_NV */
ctx->VertexProgram.Current = (struct vertex_program *) prog;
ctx->VertexProgram.Current = (struct gl_vertex_program *) prog;
}
else if (target == GL_FRAGMENT_PROGRAM_NV || target == GL_FRAGMENT_PROGRAM_ARB) {
ctx->FragmentProgram.Current = (struct fragment_program *) prog;
ctx->FragmentProgram.Current = (struct gl_fragment_program *) prog;
}
/* Never null pointers */
@@ -1807,7 +1809,7 @@ _mesa_DeletePrograms(GLsizei n, const GLuint *ids)
for (i = 0; i < n; i++) {
if (ids[i] != 0) {
struct program *prog = (struct program *)
struct gl_program *prog = (struct gl_program *)
_mesa_HashLookup(ctx->Shared->Programs, ids[i]);
if (prog == &_mesa_DummyProgram) {
_mesa_HashRemove(ctx->Shared->Programs, ids[i]);