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

mesa: _mesa_program_state_string() returns char *, not const char *.

Browse Source
This commit is contained in:
Michal Krol
2008-09-05 12:25:50 +02:00
parent b8a7eef242
commit ce3cf63251
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mesa/shader/arbprogparse.c
View File

@@ -3354,11 +3354,11 @@ debug_variables (GLcontext * ctx, struct var_cache *vc_head,
fprintf (stderr, "%s\n", fprintf (stderr, "%s\n",
Program->Base.Parameters->Parameters[a + b].Name); Program->Base.Parameters->Parameters[a + b].Name);
if (Program->Base.Parameters->Parameters[a + b].Type == PROGRAM_STATE_VAR) { if (Program->Base.Parameters->Parameters[a + b].Type == PROGRAM_STATE_VAR) {
const char *s; char *s;
s = _mesa_program_state_string(Program->Base.Parameters->Parameters s = _mesa_program_state_string(Program->Base.Parameters->Parameters
[a + b].StateIndexes); [a + b].StateIndexes);
fprintf(stderr, "%s\n", s); fprintf(stderr, "%s\n", s);
_mesa_free((char *) s); _mesa_free(s);
} }
else else
fprintf (stderr, "%f %f %f %f\n", fprintf (stderr, "%f %f %f %f\n",

4
src/mesa/shader/prog_parameter.c
View File

@@ -420,7 +420,7 @@ _mesa_add_state_reference(struct gl_program_parameter_list *paramList,
const gl_state_index stateTokens[STATE_LENGTH]) const gl_state_index stateTokens[STATE_LENGTH])
{ {
const GLuint size = 4; /* XXX fix */ const GLuint size = 4; /* XXX fix */
const char *name; char *name;
GLint index; GLint index;
/* Check if the state reference is already in the list */ /* Check if the state reference is already in the list */
@@ -447,7 +447,7 @@ _mesa_add_state_reference(struct gl_program_parameter_list *paramList,
paramList->StateFlags |= _mesa_program_state_flags(stateTokens); paramList->StateFlags |= _mesa_program_state_flags(stateTokens);
/* free name string here since we duplicated it in add_parameter() */ /* free name string here since we duplicated it in add_parameter() */
_mesa_free((void *) name); _mesa_free(name);
return index; return index;
} }

2
src/mesa/shader/prog_statevars.c
View File

@@ -767,7 +767,7 @@ append_index(char *dst, GLint index)
* For example, return "state.matrix.texture[2].inverse". * For example, return "state.matrix.texture[2].inverse".
* Use _mesa_free() to deallocate the string. * Use _mesa_free() to deallocate the string.
*/ */
const char * char *
_mesa_program_state_string(const gl_state_index state[STATE_LENGTH]) _mesa_program_state_string(const gl_state_index state[STATE_LENGTH])
{ {
char str[1000] = ""; char str[1000] = "";

2
src/mesa/shader/prog_statevars.h
View File

@@ -129,7 +129,7 @@ extern GLbitfield
_mesa_program_state_flags(const gl_state_index state[STATE_LENGTH]); _mesa_program_state_flags(const gl_state_index state[STATE_LENGTH]);
extern const char * extern char *
_mesa_program_state_string(const gl_state_index state[STATE_LENGTH]); _mesa_program_state_string(const gl_state_index state[STATE_LENGTH]);