From eb6e770889536e44da0947b64955e9a923ba98f6 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Wed, 15 Apr 2015 02:04:17 -0700 Subject: [PATCH] i965: Delete some unnecessary code in brw_report_shader_time(). It is true that a gl_shader_program with ID 0 will be a fixed-function fragment program; a gl_program with ID 0 but NULL gl_shader_program means that it's a fixed-function vertex shader. But that's not terribly interesting or relevant to what we're doing. We just need to know that ID 0 means "fixed function". Signed-off-by: Kenneth Graunke Reviewed-by: Jason Ekstrand Reviewed-by: Anuj Phogat --- src/mesa/drivers/dri/i965/brw_program.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_program.c b/src/mesa/drivers/dri/i965/brw_program.c index 0ca63de0cf9..7ea08e61473 100644 --- a/src/mesa/drivers/dri/i965/brw_program.c +++ b/src/mesa/drivers/dri/i965/brw_program.c @@ -447,14 +447,9 @@ brw_report_shader_time(struct brw_context *brw) if (prog) { shader_num = prog->Name; - /* The fixed function fragment shader generates GLSL IR with a Name - * of 0, and nothing else does. - */ if (prog->Label) { shader_name = prog->Label; - } else if (shader_num == 0 && - (brw->shader_time.types[i] == ST_FS8 || - brw->shader_time.types[i] == ST_FS16)) { + } else if (shader_num == 0) { shader_name = "ff"; } else { shader_name = "glsl"; -- 2.30.2