mesa: Remove _mesa_progshader_enum_to_string(), which is no longer used.
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
@@ -329,35 +329,6 @@ _mesa_glsl_parse_state::process_version_directive(YYLTYPE *locp, int version,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
extern "C" {
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Translate a GLenum to a short shader stage name for debug printouts and
|
|
||||||
* error messages.
|
|
||||||
*
|
|
||||||
* It recognizes the PROGRAM variants of the names so it can be used
|
|
||||||
* with a struct gl_program->Target, not just a struct
|
|
||||||
* gl_shader->Type.
|
|
||||||
*/
|
|
||||||
const char *
|
|
||||||
_mesa_progshader_enum_to_string(GLenum type)
|
|
||||||
{
|
|
||||||
switch (type) {
|
|
||||||
case GL_VERTEX_SHADER:
|
|
||||||
case GL_VERTEX_PROGRAM_ARB:
|
|
||||||
return "vertex";
|
|
||||||
case GL_FRAGMENT_SHADER:
|
|
||||||
case GL_FRAGMENT_PROGRAM_ARB:
|
|
||||||
return "fragment";
|
|
||||||
case GL_GEOMETRY_SHADER:
|
|
||||||
return "geometry";
|
|
||||||
default:
|
|
||||||
assert(!"Should not get here.");
|
|
||||||
return "unknown";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
} /* extern "C" */
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Translate a gl_shader_stage to a short shader stage name for debug
|
* Translate a gl_shader_stage to a short shader stage name for debug
|
||||||
|
@@ -440,9 +440,6 @@ extern "C" {
|
|||||||
extern const char *
|
extern const char *
|
||||||
_mesa_shader_stage_to_string(unsigned stage);
|
_mesa_shader_stage_to_string(unsigned stage);
|
||||||
|
|
||||||
extern const char *
|
|
||||||
_mesa_progshader_enum_to_string(GLenum type);
|
|
||||||
|
|
||||||
extern int glcpp_preprocess(void *ctx, const char **shader, char **info_log,
|
extern int glcpp_preprocess(void *ctx, const char **shader, char **info_log,
|
||||||
const struct gl_extensions *extensions, struct gl_context *gl_ctx);
|
const struct gl_extensions *extensions, struct gl_context *gl_ctx);
|
||||||
|
|
||||||
|
@@ -452,7 +452,7 @@ log_program_parameters(const struct gl_shader_program *shProg)
|
|||||||
const struct gl_program *const prog = shProg->_LinkedShaders[i]->Program;
|
const struct gl_program *const prog = shProg->_LinkedShaders[i]->Program;
|
||||||
|
|
||||||
printf("Program %d %s shader parameters:\n",
|
printf("Program %d %s shader parameters:\n",
|
||||||
shProg->Name, _mesa_progshader_enum_to_string(prog->Target));
|
shProg->Name, _mesa_shader_stage_to_string(i));
|
||||||
for (unsigned j = 0; j < prog->Parameters->NumParameters; j++) {
|
for (unsigned j = 0; j < prog->Parameters->NumParameters; j++) {
|
||||||
printf("%s: %p %f %f %f %f\n",
|
printf("%s: %p %f %f %f %f\n",
|
||||||
prog->Parameters->Parameters[j].Name,
|
prog->Parameters->Parameters[j].Name,
|
||||||
|
@@ -5143,7 +5143,7 @@ get_mesa_program(struct gl_context *ctx,
|
|||||||
if (ctx->Shader.Flags & GLSL_DUMP) {
|
if (ctx->Shader.Flags & GLSL_DUMP) {
|
||||||
printf("\n");
|
printf("\n");
|
||||||
printf("GLSL IR for linked %s program %d:\n",
|
printf("GLSL IR for linked %s program %d:\n",
|
||||||
_mesa_progshader_enum_to_string(shader->Type),
|
_mesa_shader_stage_to_string(shader->Stage),
|
||||||
shader_program->Name);
|
shader_program->Name);
|
||||||
_mesa_print_ir(shader->ir, NULL);
|
_mesa_print_ir(shader->ir, NULL);
|
||||||
printf("\n");
|
printf("\n");
|
||||||
|
Reference in New Issue
Block a user